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

Place checks on quote 'isConvertable()'

Browse Source
This commit is contained in:
David Bomba 2020-05-27 14:54:47 +10:00
parent c72d38ca4f
commit 41b19c20c1
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,7 +534,7 @@ class QuoteController extends BaseController
$this->entity_transformer = InvoiceTransformer::class; $this->entity_transformer = InvoiceTransformer::class;
$invoices = $quotes->map(function ($quote, $key) use ($action) { $invoices = $quotes->map(function ($quote, $key) use ($action) {
if (auth()->user()->can('edit', $quote)) { if (auth()->user()->can('edit', $quote) && $quote->service()->isConvertable()) {
$invoice = $quote->service()->convertToInvoice(); $invoice = $quote->service()->convertToInvoice();
return $invoice->id; return $invoice->id;
} }

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

@ -55,6 +55,7 @@ class QuoteService
return $this; return $this;
$convert_quote = new ConvertQuote($this->quote->client); $convert_quote = new ConvertQuote($this->quote->client);
$this->invoice = $convert_quote->run($this->quote); $this->invoice = $convert_quote->run($this->quote);
$this->quote->fresh(); $this->quote->fresh();
@ -125,7 +126,7 @@ class QuoteService
return $this; return $this;
} }
public function convertToInvoice() :Invoice public function convertToInvoice()
{ {
//to prevent circular references we need to explicit call this here. //to prevent circular references we need to explicit call this here.
@ -137,6 +138,17 @@ class QuoteService
return $this->invoice; return $this->invoice;
} }
public function isConvertable() :bool
{
if($this->quote->invoice_id)
return false;
if($this->quote->status_id == Quote::STATUS_EXPIRED)
return false;
return true;
}
/** /**
* Saves the quote * Saves the quote
* @return Quote|null * @return Quote|null