From 05e92f54e095797f90465740fa745db41596f644 Mon Sep 17 00:00:00 2001 From: dpradeep Date: Fri, 8 Aug 2014 18:44:10 +0530 Subject: [PATCH] Removed notice and added images for invoice pdf. --- CRM/Contribute/BAO/Contribution.php | 2 +- CRM/Contribute/Form/Task/Invoice.php | 2 +- .../contribution_invoice_receipt_html.tpl | 8 ++++---- i/contribute/cut_line.png | Bin 0 -> 5352 bytes .../contribution_invoice_receipt_html.tpl | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 i/contribute/cut_line.png diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index a2f59e936d..4535010750 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -2964,6 +2964,7 @@ WHERE contribution_id = %1 "; if ($params['contribution']->currency) { $currency = $params['contribution']->currency; } + $diff = 1; if (!empty($params['is_quick_config'])) { $amount = $itemAmount; if (!$amount) { @@ -2971,7 +2972,6 @@ WHERE contribution_id = %1 "; } } else { - $diff = 1; if ($context == 'changeFinancialType' || $params['contribution']->contribution_status_id == array_search('Cancelled', $contributionStatus) || $params['contribution']->contribution_status_id == array_search('Refunded', $contributionStatus)) { $diff = -1; diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php index 8f554ff1eb..ac583ef230 100644 --- a/CRM/Contribute/Form/Task/Invoice.php +++ b/CRM/Contribute/Form/Task/Invoice.php @@ -424,7 +424,7 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task { 'id' => $contribution->id, 'source' => $source, 'invoice_id' => $invoiceId, - 'imageUploadURL' => $config->imageUploadURL, + 'resourceBase' => $config->resourceBase, 'defaultCurrency' => $config->defaultCurrency, 'amount' => $contribution->total_amount, 'amountDue' => $amountDue, diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl index c7f70bdb4b..421c123589 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl @@ -7,7 +7,7 @@ - +

@@ -170,7 +170,7 @@ - +

@@ -228,7 +228,7 @@ {if $contribution_status_id == $refundedStatusId}

- +

@@ -398,7 +398,7 @@ - +

diff --git a/i/contribute/cut_line.png b/i/contribute/cut_line.png new file mode 100644 index 0000000000000000000000000000000000000000..6202e71f3e26570a4fa2aba937297a5eec64368e GIT binary patch literal 5352 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 - +

@@ -170,7 +170,7 @@ - +

@@ -228,7 +228,7 @@ {if $contribution_status_id == $refundedStatusId}

- +

@@ -398,7 +398,7 @@ - +

-- 2.25.1