Skip to content
Snippets Groups Projects
Unverified Commit 55e77e84 authored by Eileen McNaughton's avatar Eileen McNaughton Committed by GitHub
Browse files

Merge pull request #16943 from jitendrapurohit/core-1682

#1682 - Invalid currency  on sending offline membership receipt.
parents 566b10b0 9d3a6f9f
No related branches found
No related tags found
No related merge requests found
......@@ -392,7 +392,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
public function buildQuickForm() {
$this->buildQuickEntityForm();
$this->assign('currency', CRM_Core_BAO_Country::defaultCurrencySymbol());
$this->assign('currency_symbol', CRM_Core_BAO_Country::defaultCurrencySymbol());
$isUpdateToExistingRecurringMembership = $this->isUpdateToExistingRecurringMembership();
// build price set form.
$buildPriceSet = FALSE;
......@@ -1617,8 +1617,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
}
if (!empty($lineItem[$this->_priceSetId])) {
$invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
$invoicing = $invoiceSettings['invoicing'] ?? NULL;
$invoicing = Civi::settings()->get('invoicing');
$taxAmount = FALSE;
$totalTaxAmount = 0;
foreach ($lineItem[$this->_priceSetId] as & $priceFieldOp) {
......
......@@ -301,7 +301,7 @@
var taxRates = {/literal}{$taxRates}{literal};
var taxTerm = {/literal}{$taxTerm|@json_encode}{literal};
var taxRate = taxRates[allMemberships[memType]['financial_type_id']];
var currency = {/literal}{$currency|@json_encode}{literal};
var currency = {/literal}{$currency_symbol|@json_encode}{literal};
var taxAmount = (taxRate/100)*allMemberships[memType]['total_amount_numeric'];
taxAmount = isNaN (taxAmount) ? 0:taxAmount;
if (term) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment