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

Fixes for test

Browse Source
This commit is contained in:
David Bomba 2024-04-04 13:07:07 +11:00
parent faa1e2e7f8
commit e42a469d1a
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientController.php
View File

@ -237,7 +237,7 @@ class ClientController extends BaseController
$hash_or_response = $request->boolean('send_email') ? 'email sent' : \Illuminate\Support\Str::uuid(); $hash_or_response = $request->boolean('send_email') ? 'email sent' : \Illuminate\Support\Str::uuid();
TemplateAction::dispatch( TemplateAction::dispatch(
$clients->pluck('id')->toArray(), $clients->pluck('hashed_id')->toArray(),
$request->template_id, $request->template_id,
Client::class, Client::class,
$user->id, $user->id,

7
app/Services/Template/TemplateAction.php
View File

@ -110,10 +110,11 @@ class TemplateAction implements ShouldQueue
/** Set a global currency_code */ /** Set a global currency_code */
$first_entity = $result->first(); $first_entity = $result->first();
if($first_entity->client)
$currency_code = $first_entity->client->currency()->code; if($first_entity instanceof Client)
elseif($first_entity instanceof Client)
$currency_code = $first_entity->currency()->code; $currency_code = $first_entity->currency()->code;
elseif($first_entity->client)
$currency_code = $first_entity->client->currency()->code;
else else
$currency_code = $this->company->currency()->code; $currency_code = $this->company->currency()->code;

4
app/Services/Template/TemplateMock.php
View File

File diff suppressed because one or more lines are too long

6
tests/Unit/SubscriptionsCalcTest.php
View File

@ -79,13 +79,13 @@ class SubscriptionsCalcTest extends TestCase
$this->assertEquals(10, $invoice->amount); $this->assertEquals(10, $invoice->amount);
$this->assertEquals(10, $invoice->balance); $this->assertEquals(10, $invoice->balance);
$sub_calculator = new SubscriptionCalculator($target->fresh(), $invoice->fresh()); $sub_calculator = $target->calc();
$this->assertFalse($sub_calculator->isPaidUp()); $this->assertFalse($sub_calculator->isPaidUp($invoice));
$invoice = $invoice->service()->markPaid()->save(); $invoice = $invoice->service()->markPaid()->save();
$this->assertTrue($sub_calculator->isPaidUp()); $this->assertTrue($sub_calculator->isPaidUp($invoice));
$this->assertEquals(10, $invoice->amount); $this->assertEquals(10, $invoice->amount);
$this->assertEquals(0, $invoice->balance); $this->assertEquals(0, $invoice->balance);