Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 07:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Credits fix

Browse Source
This commit is contained in:
David Bomba 2021-10-05 13:49:15 +11:00
parent 980f538e28
commit 8ce94012fb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Livewire/CreditsTable.php
View File

@ -42,7 +42,8 @@ class CreditsTable extends Component
->where('is_deleted', 0) ->where('is_deleted', 0)
->where(function ($query){ ->where(function ($query){
$query->whereDate('due_date', '>=', now()) $query->whereDate('due_date', '>=', now())
->orWhereNull('due_date'); ->orWhereNull('due_date')
->orWhere('due_date', '=', '');
}) })
->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc') ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
->withTrashed() ->withTrashed()

16
tests/Feature/ClientPortal/CreditsTest.php
View File

@ -93,9 +93,9 @@ class CreditsTest extends TestCase
$this->actingAs($client->contacts->first(), 'contact'); $this->actingAs($client->contacts->first(), 'contact');
Livewire::test(CreditsTable::class, ['company' => $company]) Livewire::test(CreditsTable::class, ['company' => $company])
->assertSee('testing-number-01') ->assertDontSee('testing-number-01')
->assertSee('testing-number-02') ->assertSee('testing-number-02')
->assertDontSee('testing-number-03'); ->assertSee('testing-number-03');
} }
public function testShowingCreditsWithNullDueDate() public function testShowingCreditsWithNullDueDate()
@ -122,6 +122,7 @@ class CreditsTest extends TestCase
'client_id' => $client->id, 'client_id' => $client->id,
'number' => 'testing-number-01', 'number' => 'testing-number-01',
'status_id' => Credit::STATUS_SENT, 'status_id' => Credit::STATUS_SENT,
'due_date' => null,
]); ]);
Credit::factory()->create([ Credit::factory()->create([
@ -142,12 +143,21 @@ class CreditsTest extends TestCase
'status_id' => Credit::STATUS_SENT, 'status_id' => Credit::STATUS_SENT,
]); ]);
Credit::factory()->create([
'user_id' => $user->id,
'company_id' => $company->id,
'client_id' => $client->id,
'number' => 'testing-number-04',
'due_date' => '',
'status_id' => Credit::STATUS_SENT,
]);
$this->actingAs($client->contacts->first(), 'contact'); $this->actingAs($client->contacts->first(), 'contact');
Livewire::test(CreditsTable::class, ['company' => $company]) Livewire::test(CreditsTable::class, ['company' => $company])
->assertSee('testing-number-01') ->assertSee('testing-number-01')
->assertSee('testing-number-02') ->assertSee('testing-number-02')
->assertDontSee('testing-number-03'); ->assertSee('testing-number-03');
} }
} }