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

Working on cloning

Browse Source
This commit is contained in:
Hillel Coren 2017-08-22 23:32:48 +03:00
parent aefed1f11e
commit b48919c264
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/InvoiceController.php
View File

@ -101,6 +101,7 @@ class InvoiceController extends BaseController
$entityType = $clone == INVOICE_TYPE_STANDARD ? ENTITY_INVOICE : ENTITY_QUOTE; $entityType = $clone == INVOICE_TYPE_STANDARD ? ENTITY_INVOICE : ENTITY_QUOTE;
$invoice->id = $invoice->public_id = null; $invoice->id = $invoice->public_id = null;
$invoice->is_public = false; $invoice->is_public = false;
$invoice->is_recurring = $invoice->is_recurring && $clone == INVOICE_TYPE_STANDARD;
$invoice->invoice_type_id = $clone; $invoice->invoice_type_id = $clone;
$invoice->invoice_number = $account->getNextNumber($invoice); $invoice->invoice_number = $account->getNextNumber($invoice);
$invoice->due_date = null; $invoice->due_date = null;

11
app/Ninja/Datatables/RecurringInvoiceDatatable.php
View File

@ -105,7 +105,7 @@ class RecurringInvoiceDatatable extends EntityDatatable
}, },
], ],
[ [
trans('texts.clone_invoice'), trans("texts.clone_invoice"),
function ($model) { function ($model) {
return URL::to("invoices/{$model->public_id}/clone"); return URL::to("invoices/{$model->public_id}/clone");
}, },
@ -113,6 +113,15 @@ class RecurringInvoiceDatatable extends EntityDatatable
return Auth::user()->can('create', ENTITY_INVOICE); return Auth::user()->can('create', ENTITY_INVOICE);
}, },
], ],
[
trans("texts.clone_quote"),
function ($model) {
return URL::to("quotes/{$model->public_id}/clone");
},
function ($model) {
return Auth::user()->can('create', ENTITY_QUOTE);
},
],
]; ];
} }