From 86fb3af56bfebdb7c46cc31e25c4b08947d5abff Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 11 Dec 2021 21:45:07 +1100 Subject: [PATCH 1/2] fixes for approval event --- app/Services/Quote/QuoteService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Quote/QuoteService.php b/app/Services/Quote/QuoteService.php index f830ba6bc7..b5b2088579 100644 --- a/app/Services/Quote/QuoteService.php +++ b/app/Services/Quote/QuoteService.php @@ -110,7 +110,7 @@ class QuoteService $contact = $this->quote->invitations->first()->contact; } - // event(new QuoteWasApproved($contact, $this->quote, $this->quote->company, Ninja::eventVars())); + event(new QuoteWasApproved($contact, $this->quote, $this->quote->company, Ninja::eventVars())); if ($this->quote->client->getSetting('auto_convert_quote')) { $this->convert(); From 95f092673445cd00976f5d0151929745f1e5f500 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 12 Dec 2021 07:55:35 +1100 Subject: [PATCH 2/2] Fixes for credit table filtering --- app/Http/Livewire/CreditsTable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Livewire/CreditsTable.php b/app/Http/Livewire/CreditsTable.php index e756de8d4f..fe7f1f1487 100644 --- a/app/Http/Livewire/CreditsTable.php +++ b/app/Http/Livewire/CreditsTable.php @@ -42,8 +42,8 @@ class CreditsTable extends Component ->where('is_deleted', 0) ->where(function ($query){ $query->whereDate('due_date', '>=', now()) - ->orWhereNull('due_date') - ->orWhere('due_date', '=', ''); + ->orWhereNull('due_date'); + //->orWhere('due_date', '=', ''); }) ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc') ->withTrashed()