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

Allow late fee invoicves for locked invoice regions

Browse Source
This commit is contained in:
David Bomba 2023-04-27 10:56:30 +10:00
parent 172a563535
commit 1ada503031
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Events/Contact/ContactLoggedIn.php
View File

@ -55,6 +55,6 @@ class ContactLoggedIn
*/ */
public function broadcastOn() public function broadcastOn()
{ {
return []; return [];
} }
} }

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

@ -182,7 +182,7 @@ class ReminderJob implements ShouldQueue
} }
$invoice = InvoiceFactory::create($over_due_invoice->company_id, $over_due_invoice->user_id); $invoice = InvoiceFactory::create($over_due_invoice->company_id, $over_due_invoice->user_id);
$invoice->client_id = $invoice->client_id; $invoice->client_id = $over_due_invoice->client_id;
$invoice->date = now()->format('Y-m-d'); $invoice->date = now()->format('Y-m-d');
$invoice->due_date = now()->format('Y-m-d'); $invoice->due_date = now()->format('Y-m-d');
@ -206,9 +206,9 @@ class ReminderJob implements ShouldQueue
->markSent() ->markSent()
->save(); ->save();
nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.$invoice->balance); // nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.$invoice->balance);
$invoice->client->service()->updateBalance($invoice->balance); // $invoice->client->service()->updateBalance($invoice->balance);
$invoice->ledger()->updateInvoiceBalance($invoice->balance, "Late Fee Adjustment for invoice {$invoice->number}"); // $invoice->ledger()->updateInvoiceBalance($invoice->balance, "Late Fee Adjustment for invoice {$invoice->number}");
$invoice->service()->touchPdf(true); $invoice->service()->touchPdf(true);

16
tests/Unit/LateFeeTest.php
View File

@ -34,6 +34,12 @@ class LateFeeTest extends TestCase
public $faker; public $faker;
public $account;
public $company;
public $client;
protected function setUp() :void protected function setUp() :void
{ {
parent::setUp(); parent::setUp();
@ -153,7 +159,7 @@ class LateFeeTest extends TestCase
$settings->num_days_reminder1 = 10; $settings->num_days_reminder1 = 10;
$settings->schedule_reminder1 = 'after_due_date'; $settings->schedule_reminder1 = 'after_due_date';
$client = $this->buildData($settings); $client = $this->buildData($settings);
$i = Invoice::factory()->create([ $i = Invoice::factory()->create([
'client_id' => $client->id, 'client_id' => $client->id,
@ -161,7 +167,7 @@ class LateFeeTest extends TestCase
'company_id' => $this->company->id, 'company_id' => $this->company->id,
'amount' => 0, 'amount' => 0,
'balance' => 0, 'balance' => 0,
'status_id' => 2, 'status_id' => Invoice::STATUS_DRAFT,
'total_taxes' => 1, 'total_taxes' => 1,
'date' => now()->format('Y-m-d'), 'date' => now()->format('Y-m-d'),
'due_date' => now()->subDays(10)->format('Y-m-d'), 'due_date' => now()->subDays(10)->format('Y-m-d'),
@ -178,9 +184,11 @@ class LateFeeTest extends TestCase
]); ]);
$i = $i->calc()->getInvoice(); $i = $i->calc()->getInvoice();
$i->service()->applyNumber()->createInvitations()->save(); $i->service()->applyNumber()->createInvitations()->markSent()->save();
$this->assertEquals(10, $i->amount); $this->assertEquals(10, $i->amount);
$this->assertEquals(10, $i->balance);
$this->assertEquals(10, $client->fresh()->balance);
$reflectionMethod = new \ReflectionMethod(ReminderJob::class, 'sendReminderForInvoice'); $reflectionMethod = new \ReflectionMethod(ReminderJob::class, 'sendReminderForInvoice');
$reflectionMethod->setAccessible(true); $reflectionMethod->setAccessible(true);
@ -189,7 +197,7 @@ class LateFeeTest extends TestCase
$i->fresh(); $i->fresh();
$this->assertEquals(10, $i->balance); $this->assertEquals(10, $i->balance);
$this->assertEquals(20, $client->fresh()->balance);
} }