Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6713 from beganovich/v5-2409-statements

Browse Source 
Fixes for statements
This commit is contained in:
David Bomba 2021-09-24 20:30:14 +10:00 committed by GitHub
commit df5754a4c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -693,13 +693,13 @@ class CompanySettings extends BaseSettings
'$invoice.date', '$invoice.date',
'$due_date', '$due_date',
'$total', '$total',
'$amount', '$balance',
], ],
'statement_payment_columns' => [ 'statement_payment_columns' => [
'$invoice.number', '$invoice.number',
'$payment.date', '$payment.date',
'$method', '$method',
'$amount', '$statement_amount',
], ],
]; ];

2
app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
View File

@ -71,6 +71,8 @@ trait DesignHelpers
$variables[$property] = $value; $variables[$property] = $value;
} }
$this->context['pdf_variables'] = $variables;
} }
/** /**

2
app/Utils/HtmlEngine.php
View File

@ -457,7 +457,7 @@ class HtmlEngine
$data['$payment.date'] = ['value' => ' ', 'label' => ctrans('texts.payment_date')]; $data['$payment.date'] = ['value' => ' ', 'label' => ctrans('texts.payment_date')];
$data['$method'] = ['value' => ' ', 'label' => ctrans('texts.method')]; $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')]; $data['$statement'] = ['value' => '', 'label' => ctrans('texts.statement')];
$arrKeysLength = array_map('strlen', array_keys($data)); $arrKeysLength = array_map('strlen', array_keys($data));