From 65369399bb7eddb481f7f35dee1434c8843ec6c0 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 4 Dec 2017 23:21:59 +0200 Subject: [PATCH] Fix late fee translation --- app/Console/Commands/SendReminders.php | 2 ++ app/Ninja/Repositories/InvoiceRepository.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/SendReminders.php b/app/Console/Commands/SendReminders.php index 0f5c6ca7b272..cd691a768243 100644 --- a/app/Console/Commands/SendReminders.php +++ b/app/Console/Commands/SendReminders.php @@ -101,7 +101,9 @@ class SendReminders extends Command foreach ($invoices as $invoice) { if ($reminder = $account->getInvoiceReminder($invoice, false)) { $this->info('Charge fee: ' . $invoice->id); + $account->loadLocalizationSettings($invoice->client); // support trans to add fee line item $number = preg_replace('/[^0-9]/', '', $reminder); + $amount = $account->account_email_settings->{"late_fee{$number}_amount"}; $percent = $account->account_email_settings->{"late_fee{$number}_percent"}; $this->invoiceRepo->setLateFee($invoice, $amount, $percent); diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index c7e69a9f816b..aa421b463536 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -1171,7 +1171,7 @@ class InvoiceRepository extends BaseRepository $sql = implode(' OR ', $dates); $invoices = Invoice::invoiceType(INVOICE_TYPE_STANDARD) - ->with('invoice_items') + ->with('client', 'invoice_items') ->whereHas('client', function ($query) { $query->whereSendReminders(true); })