Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

allow total columns to be customized in PDF

Browse Source
This commit is contained in:
David Bomba 2020-08-14 13:59:14 +10:00
parent 07e8ded6a7
commit 5daeab3895
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/DataMapper/CompanySettings.php
View File

@ -593,6 +593,19 @@ class CompanySettings extends BaseSettings
'$task.tax', '$task.tax',
'$task.line_total', '$task.line_total',
], ],
'total_columns' => [
'$total_taxes',
'$line_taxes',
'$subtotal',
'$total',
'$discount',
'$custom_surcharge1',
'$custom_surcharge2',
'$custom_surcharge3',
'$custom_surcharge4',
'$paid_to_date',
'$client.balance'
],
]; ];
return json_decode(json_encode($variables)); return json_decode(json_encode($variables));

1
app/Jobs/Util/UpdateExchangeRates.php
View File

@ -53,6 +53,7 @@ class UpdateExchangeRates implements ShouldQueue
private function updateCurrencies() private function updateCurrencies()
{ {
info("updating currencies");
if(empty(config('ninja.currency_converter_api_key'))) if(empty(config('ninja.currency_converter_api_key')))
return; return;