From d26e5f05c3e31f50e1cd7005af8413e029b6ab76 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Nov 2023 10:34:10 +1100 Subject: [PATCH] Minor fixes --- app/Jobs/Company/CompanyExport.php | 2 +- app/Services/Template/TemplateService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index a6e8f1a988d7..03dfcff32e2e 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -288,7 +288,7 @@ class CompanyExport implements ShouldQueue $this->export_data['recurring_expenses'] = $this->company->recurring_expenses()->orderBy('number', 'DESC')->cursor()->map(function ($expense) { $expense = $this->transformBasicEntities($expense); $expense = $this->transformArrayOfKeys($expense, ['vendor_id', 'invoice_id', 'client_id', 'category_id', 'project_id']); - + return $expense->makeVisible(['id']); })->all(); diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php index 637653300177..e263ca11172b 100644 --- a/app/Services/Template/TemplateService.php +++ b/app/Services/Template/TemplateService.php @@ -522,7 +522,7 @@ class TemplateService 'balance_raw' => ($payment->amount - $payment->refunded - $payment->applied), 'date' => $this->translateDate($payment->date, $payment->client->date_format(), $payment->client->locale()), 'method' => $payment->translatedType(), - 'currency' => $payment->currency->code, + 'currency' => $payment->currency->code ?? $this->company->currency()->code, 'exchange_rate' => $payment->exchange_rate, 'transaction_reference' => $payment->transaction_reference, 'is_manual' => $payment->is_manual,