Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:27:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updates for logging and also new variables

Browse Source
This commit is contained in:
David Bomba 2023-03-21 08:02:33 +11:00
parent 5e2a8d38f8
commit 0a28b677df
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Utils/HtmlEngine.php
View File

@ -638,6 +638,10 @@ class HtmlEngine
$data['$entity_images'] = ['value' => $this->generateEntityImagesMarkup(), 'label' => '']; $data['$entity_images'] = ['value' => $this->generateEntityImagesMarkup(), 'label' => ''];
$data['$payments'] = ['value' => '', 'label' => ctrans('texts.payments')]; $data['$payments'] = ['value' => '', 'label' => ctrans('texts.payments')];
$data['$payment.custom1'] = ['value' => '', 'label' => ctrans('texts.payment')];
$data['$payment.custom2'] = ['value' => '', 'label' => ctrans('texts.payment')];
$data['$payment.custom3'] = ['value' => '', 'label' => ctrans('texts.payment')];
$data['$payment.custom4'] = ['value' => '', 'label' => ctrans('texts.payment')];
if ($this->entity_string == 'invoice' && $this->entity->payments()->exists()) { if ($this->entity_string == 'invoice' && $this->entity->payments()->exists()) {
$payment_list = '<br><br>'; $payment_list = '<br><br>';
@ -647,6 +651,15 @@ class HtmlEngine
} }
$data['$payments'] = ['value' => $payment_list, 'label' => ctrans('texts.payments')]; $data['$payments'] = ['value' => $payment_list, 'label' => ctrans('texts.payments')];
$payment = $this->entity->payments()->first();
$data['$payment.custom1'] = ['value' => $payment->custom_value1, 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'payment1')];
$data['$payment.custom2'] = ['value' => $payment->custom_value2, 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'payment2')];
$data['$payment.custom3'] = ['value' => $payment->custom_value3, 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'payment3')];
$data['$payment.custom4'] = ['value' => $payment->custom_value4, 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'payment4')];
} }
if (($this->entity_string == 'invoice' || $this->entity_string == 'recurring_invoice') && isset($this->company?->custom_fields?->company1)) { if (($this->entity_string == 'invoice' || $this->entity_string == 'recurring_invoice') && isset($this->company?->custom_fields?->company1)) {

2
config/logging.php
View File

@ -56,12 +56,14 @@ return [
'driver' => 'single', 'driver' => 'single',
'path' => storage_path('logs/invoiceninja.log'), 'path' => storage_path('logs/invoiceninja.log'),
'level' => env('LOG_LEVEL', 'debug'), 'level' => env('LOG_LEVEL', 'debug'),
'days' => 7,
], ],
'stack' => [ 'stack' => [
'driver' => 'stack', 'driver' => 'stack',
'channels' => ['single'], 'channels' => ['single'],
'ignore_exceptions' => false, 'ignore_exceptions' => false,
'days' => 7,
], ],
'single' => [ 'single' => [