Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for translations for late fees

Browse Source
This commit is contained in:
David Bomba 2021-12-14 20:54:23 +11:00
parent ab114e2587
commit 54d8ff21ac
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Jobs/Ninja/SendReminders.php
View File

@ -28,6 +28,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\App;
//@DEPRECATED //@DEPRECATED
class SendReminders implements ShouldQueue class SendReminders implements ShouldQueue
@ -284,6 +285,11 @@ class SendReminders implements ShouldQueue
*/ */
private function setLateFee($invoice, $amount, $percent) :Invoice private function setLateFee($invoice, $amount, $percent) :Invoice
{ {
App::forgetInstance('translator');
$t = app('translator');
$t->replace(Ninja::transformTranslations($invoice->client->getMergedSettings()));
App::setLocale($invoice->client->locale());
$temp_invoice_balance = $invoice->balance; $temp_invoice_balance = $invoice->balance;
if ($amount <= 0 && $percent <= 0) { if ($amount <= 0 && $percent <= 0) {
@ -313,8 +319,8 @@ class SendReminders implements ShouldQueue
/**Refresh Invoice values*/ /**Refresh Invoice values*/
$invoice = $invoice->calc()->getInvoice(); $invoice = $invoice->calc()->getInvoice();
$this->invoice->client->service()->updateBalance($this->invoice->balance - $temp_invoice_balance)->save(); $invoice->client->service()->updateBalance($invoice->balance - $temp_invoice_balance)->save();
$this->invoice->ledger()->updateInvoiceBalance($this->invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$this->invoice->number}"); $invoice->ledger()->updateInvoiceBalance($invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$invoice->number}");
return $invoice; return $invoice;
} }

2
app/Jobs/Util/ReminderJob.php
View File

@ -152,9 +152,11 @@ class ReminderJob implements ShouldQueue
*/ */
private function setLateFee($invoice, $amount, $percent) :Invoice private function setLateFee($invoice, $amount, $percent) :Invoice
{ {
App::forgetInstance('translator'); App::forgetInstance('translator');
$t = app('translator'); $t = app('translator');
$t->replace(Ninja::transformTranslations($invoice->client->getMergedSettings())); $t->replace(Ninja::transformTranslations($invoice->client->getMergedSettings()));
App::setLocale($invoice->client->locale());
$temp_invoice_balance = $invoice->balance; $temp_invoice_balance = $invoice->balance;