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

Fixed issue with invoice history

Browse Source
This commit is contained in:
Hillel Coren 2016-05-09 20:35:50 +03:00
parent 786b6567b6
commit 7317bfc8c9
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,9 +556,9 @@ class InvoiceController extends BaseController
return self::edit($request, $publicId, true); return self::edit($request, $publicId, true);
} }
public function invoiceHistory($publicId) public function invoiceHistory(InvoiceRequest $request)
{ {
$invoice = Invoice::withTrashed()->scope($publicId)->firstOrFail(); $invoice = $request->entity();
$invoice->load('user', 'invoice_items', 'documents', 'expenses', 'expenses.documents', 'account.country', 'client.contacts', 'client.country'); $invoice->load('user', 'invoice_items', 'documents', 'expenses', 'expenses.documents', 'account.country', 'client.contacts', 'client.country');
$invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date); $invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
$invoice->due_date = Utils::fromSqlDate($invoice->due_date); $invoice->due_date = Utils::fromSqlDate($invoice->due_date);
@ -584,7 +584,7 @@ class InvoiceController extends BaseController
$backup = json_decode($activity->json_backup); $backup = json_decode($activity->json_backup);
$backup->invoice_date = Utils::fromSqlDate($backup->invoice_date); $backup->invoice_date = Utils::fromSqlDate($backup->invoice_date);
$backup->due_date = Utils::fromSqlDate($backup->due_date); $backup->due_date = Utils::fromSqlDate($backup->due_date);
$invoice->features = [ $backup->features = [
'customize_invoice_design' => Auth::user()->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN), 'customize_invoice_design' => Auth::user()->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN),
'remove_created_by' => Auth::user()->hasFeature(FEATURE_REMOVE_CREATED_BY), 'remove_created_by' => Auth::user()->hasFeature(FEATURE_REMOVE_CREATED_BY),
'invoice_settings' => Auth::user()->hasFeature(FEATURE_INVOICE_SETTINGS), 'invoice_settings' => Auth::user()->hasFeature(FEATURE_INVOICE_SETTINGS),

14
app/Http/Requests/EntityRequest.php
View File

@ -15,9 +15,17 @@ class EntityRequest extends Request {
return $this->entity; return $this->entity;
} }
$paramName = $this->entityType . 's'; // The entity id can appear as invoices, invoice_id, public_id or id
$publicId = $this->$paramName ?: (Input::get('public_id') ?: Input::get('id')); $publicId = false;
foreach (['_id', 's'] as $suffix) {
$field = $this->entityType . $suffix;
if ($this->$field) {
$publicId= $this->$field;
}
}
if ( ! $publicId) {
$publicId = Input::get('public_id') ?: Input::get('id');
}
if ( ! $publicId) { if ( ! $publicId) {
return null; return null;
} }