From b8f670d592ad40395f30de254647fa3cbbeba757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 24 Sep 2021 11:34:03 +0200 Subject: [PATCH 1/3] Replace `pdf_variables` with updated --- app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php index 34f21fe8422f..d268457d2b63 100644 --- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php +++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php @@ -71,6 +71,8 @@ trait DesignHelpers $variables[$property] = $value; } + + $this->context['pdf_variables'] = $variables; } /** From 9f5e3ea454dccded773bf5ad871a707f3c440267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 24 Sep 2021 11:56:10 +0200 Subject: [PATCH 2/3] Add `statement_amount` variable --- app/Utils/HtmlEngine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 60f3eb25c2cf..5860984be543 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -457,7 +457,7 @@ class HtmlEngine $data['$payment.date'] = ['value' => ' ', 'label' => ctrans('texts.payment_date')]; $data['$method'] = ['value' => ' ', 'label' => ctrans('texts.method')]; - // $data['$amount'] = ['value' => '', 'label' => ctrans('texts.amount')]; + $data['$statement_amount'] = ['value' => '', 'label' => ctrans('texts.amount')]; $data['$statement'] = ['value' => '', 'label' => ctrans('texts.statement')]; $arrKeysLength = array_map('strlen', array_keys($data)); From f53cb98302a80c525692c42f0dc801d1b7e17bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 24 Sep 2021 11:56:16 +0200 Subject: [PATCH 3/3] Update statement columns --- app/DataMapper/CompanySettings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index a8db721b733d..2c2d6487bc2c 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -693,13 +693,13 @@ class CompanySettings extends BaseSettings '$invoice.date', '$due_date', '$total', - '$amount', + '$balance', ], 'statement_payment_columns' => [ '$invoice.number', '$payment.date', '$method', - '$amount', + '$statement_amount', ], ];