X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FPrice%2FBAO%2FLineItem.php;h=9c5b9bd58c0c5de7b6d4311742f958b0ea749742;hb=6b409353d19be6058cbd47fcc5916c8564aed6ff;hp=029c7edd7f5b484756bf6e9b53dd6eb08fc531e3;hpb=34549323dc186f2fb67e4933a26c1de946a99700;p=civicrm-core.git diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php index 029c7edd7f..9c5b9bd58c 100644 --- a/CRM/Price/BAO/LineItem.php +++ b/CRM/Price/BAO/LineItem.php @@ -342,21 +342,21 @@ WHERE li.contribution_id = %1"; $values[$oid] = [ 'price_field_id' => $fid, 'price_field_value_id' => $oid, - 'label' => CRM_Utils_Array::value('label', $options[$oid]), + 'label' => $options[$oid]['label'] ?? NULL, 'field_title' => $fieldTitle, - 'description' => CRM_Utils_Array::value('description', $options[$oid]), + 'description' => $options[$oid]['description'] ?? NULL, 'qty' => $qty, 'unit_price' => $price, 'line_total' => $qty * $price, 'participant_count' => $qty * $participantsPerField, - 'max_value' => CRM_Utils_Array::value('max_value', $options[$oid]), - 'membership_type_id' => CRM_Utils_Array::value('membership_type_id', $options[$oid]), - 'membership_num_terms' => CRM_Utils_Array::value('membership_num_terms', $options[$oid]), - 'auto_renew' => CRM_Utils_Array::value('auto_renew', $options[$oid]), + 'max_value' => $options[$oid]['max_value'] ?? NULL, + 'membership_type_id' => $options[$oid]['membership_type_id'] ?? NULL, + 'membership_num_terms' => $options[$oid]['membership_num_terms'] ?? NULL, + 'auto_renew' => $options[$oid]['auto_renew'] ?? NULL, 'html_type' => $fields['html_type'], - 'financial_type_id' => CRM_Utils_Array::value('financial_type_id', $options[$oid]), + 'financial_type_id' => $options[$oid]['financial_type_id'] ?? NULL, 'tax_amount' => CRM_Utils_Array::value('tax_amount', $options[$oid], 0), - 'non_deductible_amount' => CRM_Utils_Array::value('non_deductible_amount', $options[$oid]), + 'non_deductible_amount' => $options[$oid]['non_deductible_amount'] ?? NULL, ]; if ($values[$oid]['membership_type_id'] && empty($values[$oid]['auto_renew'])) { @@ -593,7 +593,7 @@ WHERE li.contribution_id = %1"; * These are per the way the form processes them - ie * ['price_1' => 1, 'price_2' => 8] * This would mean price field id 1, option 1 (or 1 unit if using is_enter_qty). - * @param float|NULL $overrideAmount + * @param float|null $overrideAmount * Optional override of the amount. * * @param int|null $financialTypeID