From 4c535a5be1bfbb9a2af409b66a66925f0df84bc4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 15 Mar 2024 11:01:44 +1100 Subject: [PATCH] Fixes for template engine --- app/Filters/DesignFilters.php | 5 ++++- app/Services/Client/Statement.php | 1 + app/Services/Template/TemplateService.php | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Filters/DesignFilters.php b/app/Filters/DesignFilters.php index 69c6cf60df55..45071226a161 100644 --- a/app/Filters/DesignFilters.php +++ b/app/Filters/DesignFilters.php @@ -58,7 +58,10 @@ class DesignFilters extends QueryFilters public function entities(string $entities = ''): Builder { - + + if(stripos($entities, 'statement') !== false) + $entities = 'client'; + if (strlen($entities) == 0 || str_contains($entities, ',')) { return $this->builder; } diff --git a/app/Services/Client/Statement.php b/app/Services/Client/Statement.php index bedcacb34af4..163718ea6dbf 100644 --- a/app/Services/Client/Statement.php +++ b/app/Services/Client/Statement.php @@ -162,6 +162,7 @@ class Statement $ts->addGlobal(['show_credits' => $this->options['show_credits_table']]); $ts->addGlobal(['show_aging' => $this->options['show_aging_table']]); $ts->addGlobal(['show_payments' => $this->options['show_payments_table']]); + $ts->addGlobal(['currency_code' => $this->client->company->currency()->code]); $ts->build([ 'variables' => collect([$variables]), diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php index e9fcced20a5e..d3710ba722b0 100644 --- a/app/Services/Template/TemplateService.php +++ b/app/Services/Template/TemplateService.php @@ -613,8 +613,6 @@ class TemplateService $this->payment = $payment; - $this->addGlobal(['currency_code' => $payment->currency->code ?? $this->company->currency()->code]); - $credits = $payment->credits->map(function ($credit) use ($payment) { return [ 'credit' => $credit->number,