Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 17:01:33 +02:00
Code Issues Releases Activity

Merge pull request #7030 from turbo124/v5-develop

Browse Source 
Fixes for quote approval event
This commit is contained in:
David Bomba 2021-12-12 19:02:45 +11:00 committed by GitHub
commit 98e940b53f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +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', '=', ''); //->orWhere('due_date', '=', '');
}) })
->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc') ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
->withTrashed() ->withTrashed()

2
app/Services/Quote/QuoteService.php
View File

@ -110,7 +110,7 @@ class QuoteService
$contact = $this->quote->invitations->first()->contact; $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')) { if ($this->quote->client->getSetting('auto_convert_quote')) {
$this->convert(); $this->convert();