Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 08:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6229 from turbo124/v5-develop

Browse Source 
Autoarchive quotes on convert
This commit is contained in:
David Bomba 2021-07-08 11:52:25 +10:00 committed by GitHub
commit a875aea736
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Exceptions/Handler.php
View File

@ -120,7 +120,6 @@ class Handler extends ExceptionHandler
} }
} }
// if(config('ninja.expanded_logging'))
parent::report($exception); parent::report($exception);
} }

3
app/Jobs/Util/Import.php
View File

@ -190,6 +190,9 @@ class Import implements ShouldQueue
{ {
set_time_limit(0); set_time_limit(0);
nlog("Starting Migration");
nlog($this->user->email);
auth()->login($this->user, false); auth()->login($this->user, false);
auth()->user()->setCompany($this->company); auth()->user()->setCompany($this->company);

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

@ -51,6 +51,11 @@ class QuoteService
$this->quote->fresh(); $this->quote->fresh();
if ($this->quote->client->getSetting('auto_archive_quote')) {
$quote_repo = new QuoteRepository();
$quote_repo->archive($this->quote);
}
return $this; return $this;
} }
@ -129,10 +134,6 @@ class QuoteService
public function convertToInvoice() public function convertToInvoice()
{ {
//to prevent circular references we need to explicit call this here.
// $mark_approved = new MarkApproved($this->quote->client);
// $this->quote = $mark_approved->run($this->quote);
$this->convert(); $this->convert();
$this->invoice->service()->createInvitations(); $this->invoice->service()->createInvitations();