Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2021-03-24 09:28:47 +11:00
commit a6e529f658
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -532,7 +532,7 @@ class QuoteController extends BaseController
return response()->json(['message' => ctrans('texts.sent_message')], 200); return response()->json(['message' => ctrans('texts.sent_message')], 200);
} }
if ($action == 'convert') { if ($action == 'convert' || $action == 'convert_to_invoice') {
$this->entity_type = Quote::class; $this->entity_type = Quote::class;
$this->entity_transformer = QuoteTransformer::class; $this->entity_transformer = QuoteTransformer::class;

1
app/Services/BillingSubscription/BillingSubscriptionService.php
View File

@ -192,6 +192,7 @@ class BillingSubscriptionService
throw new \Exception("Could not match an invoice for payment of billing subscription"); throw new \Exception("Could not match an invoice for payment of billing subscription");
//todo - need to remove the promo code - if it exists //todo - need to remove the promo code - if it exists
return InvoiceToRecurringInvoiceFactory::create($invoice); return InvoiceToRecurringInvoiceFactory::create($invoice);
} }