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

Short description/name field for recurring invoices #1314

Browse Source
This commit is contained in:
Hillel Coren 2017-05-16 21:37:26 +03:00
parent b2a2ac6630
commit 8a4889a441
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ class RecurringInvoiceDatatable extends EntityDatatable
$frequency = strtolower($model->frequency); $frequency = strtolower($model->frequency);
$frequency = preg_replace('/\s/', '_', $frequency); $frequency = preg_replace('/\s/', '_', $frequency);
return link_to("invoices/{$model->public_id}", trans('texts.freq_'.$frequency))->toHtml(); return link_to("recurring_invoices/{$model->public_id}/edit", trans('texts.freq_'.$frequency))->toHtml();
}, },
], ],
[ [
@ -42,18 +42,26 @@ class RecurringInvoiceDatatable extends EntityDatatable
return Utils::fromSqlDate($model->last_sent_date_sql); return Utils::fromSqlDate($model->last_sent_date_sql);
}, },
], ],
/*
[ [
'end_date', 'end_date',
function ($model) { function ($model) {
return Utils::fromSqlDate($model->end_date_sql); return Utils::fromSqlDate($model->end_date_sql);
}, },
], ],
*/
[ [
'amount', 'amount',
function ($model) { function ($model) {
return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id);
}, },
], ],
[
'private_notes',
function ($model) {
return $model->private_notes;
},
],
[ [
'status', 'status',
function ($model) { function ($model) {

3
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -177,7 +177,8 @@ class InvoiceRepository extends BaseRepository
'invoices.due_date', 'invoices.due_date',
'invoices.due_date as due_date_sql', 'invoices.due_date as due_date_sql',
'invoices.is_recurring', 'invoices.is_recurring',
'invoices.quote_invoice_id' 'invoices.quote_invoice_id',
'invoices.private_notes'
); );
if ($clientPublicId) { if ($clientPublicId) {