diff --git a/app/Ninja/Datatables/RecurringInvoiceDatatable.php b/app/Ninja/Datatables/RecurringInvoiceDatatable.php index b40378310200..074986d4eb59 100644 --- a/app/Ninja/Datatables/RecurringInvoiceDatatable.php +++ b/app/Ninja/Datatables/RecurringInvoiceDatatable.php @@ -20,7 +20,7 @@ class RecurringInvoiceDatatable extends EntityDatatable $frequency = strtolower($model->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); }, ], + /* [ 'end_date', function ($model) { return Utils::fromSqlDate($model->end_date_sql); }, ], + */ [ 'amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); }, ], + [ + 'private_notes', + function ($model) { + return $model->private_notes; + }, + ], [ 'status', function ($model) { diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index fa568f3c8516..505eecadfdb7 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -177,7 +177,8 @@ class InvoiceRepository extends BaseRepository 'invoices.due_date', 'invoices.due_date as due_date_sql', 'invoices.is_recurring', - 'invoices.quote_invoice_id' + 'invoices.quote_invoice_id', + 'invoices.private_notes' ); if ($clientPublicId) {