diff --git a/app/Events/Contact/ContactLoggedIn.php b/app/Events/Contact/ContactLoggedIn.php index e2c76d5b62d4..577ebed0cde3 100644 --- a/app/Events/Contact/ContactLoggedIn.php +++ b/app/Events/Contact/ContactLoggedIn.php @@ -55,6 +55,6 @@ class ContactLoggedIn */ public function broadcastOn() { -return []; + return []; } } diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php index 746b2d366335..19bd722a651f 100644 --- a/app/Jobs/Util/ReminderJob.php +++ b/app/Jobs/Util/ReminderJob.php @@ -182,7 +182,7 @@ class ReminderJob implements ShouldQueue } $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->due_date = now()->format('Y-m-d'); @@ -206,9 +206,9 @@ class ReminderJob implements ShouldQueue ->markSent() ->save(); - nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.$invoice->balance); - $invoice->client->service()->updateBalance($invoice->balance); - $invoice->ledger()->updateInvoiceBalance($invoice->balance, "Late Fee Adjustment for invoice {$invoice->number}"); + // nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.$invoice->balance); + // $invoice->client->service()->updateBalance($invoice->balance); + // $invoice->ledger()->updateInvoiceBalance($invoice->balance, "Late Fee Adjustment for invoice {$invoice->number}"); $invoice->service()->touchPdf(true); diff --git a/tests/Unit/LateFeeTest.php b/tests/Unit/LateFeeTest.php index 739829af6c32..b99bfac50398 100644 --- a/tests/Unit/LateFeeTest.php +++ b/tests/Unit/LateFeeTest.php @@ -34,6 +34,12 @@ class LateFeeTest extends TestCase public $faker; + public $account; + + public $company; + + public $client; + protected function setUp() :void { parent::setUp(); @@ -153,7 +159,7 @@ class LateFeeTest extends TestCase $settings->num_days_reminder1 = 10; $settings->schedule_reminder1 = 'after_due_date'; - $client = $this->buildData($settings); + $client = $this->buildData($settings); $i = Invoice::factory()->create([ 'client_id' => $client->id, @@ -161,7 +167,7 @@ class LateFeeTest extends TestCase 'company_id' => $this->company->id, 'amount' => 0, 'balance' => 0, - 'status_id' => 2, + 'status_id' => Invoice::STATUS_DRAFT, 'total_taxes' => 1, 'date' => now()->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->service()->applyNumber()->createInvitations()->save(); + $i->service()->applyNumber()->createInvitations()->markSent()->save(); $this->assertEquals(10, $i->amount); + $this->assertEquals(10, $i->balance); + $this->assertEquals(10, $client->fresh()->balance); $reflectionMethod = new \ReflectionMethod(ReminderJob::class, 'sendReminderForInvoice'); $reflectionMethod->setAccessible(true); @@ -189,7 +197,7 @@ class LateFeeTest extends TestCase $i->fresh(); $this->assertEquals(10, $i->balance); - + $this->assertEquals(20, $client->fresh()->balance); }