Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Document date on export #1784

Browse Source
This commit is contained in:
Hillel Coren 2018-01-02 22:54:10 +02:00
parent 60935cb85d
commit 8ea29ea0ad
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Reports/DocumentReport.php
View File

@ -50,7 +50,7 @@ class DocumentReport extends AbstractReport
$zip = Archive::instance_by_useragent(date('Y-m-d') . '_' . str_replace(' ', '_', trans('texts.documents')));
foreach ($records as $record) {
foreach ($record->documents as $document) {
$name = sprintf('%s_%s_%s', date('Y-m-d'), $record->present()->titledName, $document->name);
$name = sprintf('%s_%s_%s', $document->created_at->format('Y-m-d'), $record->present()->titledName, $document->name);
$name = str_replace(' ', '_', $name);
$name = str_replace('#', '', $name);
$zip->add_file($name, $document->getRaw());

2
app/Ninja/Reports/ExpenseReport.php
View File

@ -39,7 +39,7 @@ class ExpenseReport extends AbstractReport
foreach ($expenses->get() as $expense) {
foreach ($expense->documents as $document) {
$expenseId = str_pad($expense->public_id, $account->invoice_number_padding, '0', STR_PAD_LEFT);
$name = sprintf('%s_%s_%s_%s', date('Y-m-d'), trans('texts.expense'), $expenseId, $document->name);
$name = sprintf('%s_%s_%s_%s', $expense->expense_date ?: date('Y-m-d'), trans('texts.expense'), $expenseId, $document->name);
$name = str_replace(' ', '_', $name);
$zip->add_file($name, $document->getRaw());
}

2
app/Ninja/Reports/InvoiceReport.php
View File

@ -48,7 +48,7 @@ class InvoiceReport extends AbstractReport
foreach ($clients->get() as $client) {
foreach ($client->invoices as $invoice) {
foreach ($invoice->documents as $document) {
$name = sprintf('%s_%s_%s', date('Y-m-d'), $invoice->present()->titledName, $document->name);
$name = sprintf('%s_%s_%s', $invoice->invoice_date ?: date('Y-m-d'), $invoice->present()->titledName, $document->name);
$zip->add_file($name, $document->getRaw());
}
}

2
app/Ninja/Reports/QuoteReport.php
View File

@ -42,7 +42,7 @@ class QuoteReport extends AbstractReport
foreach ($clients->get() as $client) {
foreach ($client->invoices as $invoice) {
foreach ($invoice->documents as $document) {
$name = sprintf('%s_%s_%s', date('Y-m-d'), $invoice->present()->titledName, $document->name);
$name = sprintf('%s_%s_%s', $invoice->invoice_date ?: date('Y-m-d'), $invoice->present()->titledName, $document->name);
$name = str_replace(' ', '_', $name);
$zip->add_file($name, $document->getRaw());
}