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

Minor fixes for invoice export

Browse Source
This commit is contained in:
Hillel Coren 2016-05-22 20:01:37 +03:00
parent ac09d86f68
commit 371f224c24
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ExportController.php
View File

@ -84,13 +84,14 @@ class ExportController extends BaseController
if ($key === 'account' || $key === 'title' || $key === 'multiUser') { if ($key === 'account' || $key === 'title' || $key === 'multiUser') {
continue; continue;
} }
if ($key === 'recurringInvoices') {
$key = 'recurring_invoices';
}
$label = trans("texts.{$key}"); $label = trans("texts.{$key}");
$excel->sheet($label, function($sheet) use ($key, $data) { $excel->sheet($label, function($sheet) use ($key, $data) {
if ($key === 'quotes') { if ($key === 'quotes') {
$key = 'invoices'; $key = 'invoices';
$data['entityType'] = ENTITY_QUOTE; $data['entityType'] = ENTITY_QUOTE;
} elseif ($key === 'recurringInvoices') {
$key = 'recurring_invoices';
} }
$sheet->loadView("export.{$key}", $data); $sheet->loadView("export.{$key}", $data);
}); });

2
app/Ninja/Presenters/InvoicePresenter.php
View File

@ -45,6 +45,8 @@ class InvoicePresenter extends Presenter {
return trans('texts.deleted'); return trans('texts.deleted');
} elseif ($this->entity->trashed()) { } elseif ($this->entity->trashed()) {
return trans('texts.archived'); return trans('texts.archived');
} elseif ($this->entity->is_recurring) {
return trans('texts.active');
} else { } else {
$status = $this->entity->invoice_status ? $this->entity->invoice_status->name : 'draft'; $status = $this->entity->invoice_status ? $this->entity->invoice_status->name : 'draft';
$status = strtolower($status); $status = strtolower($status);