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

Use 1st invoice (if it exists) on invoice design/customize page

Browse Source
This commit is contained in:
Hillel Coren 2018-04-17 21:45:57 +03:00
parent 1a95ada2bc
commit e1210cb960
1 changed files with 69 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/AccountController.php
View File

@ -552,7 +552,12 @@ class AccountController extends BaseController
private function showInvoiceDesign($section) private function showInvoiceDesign($section)
{ {
$account = Auth::user()->account->load('country'); $account = Auth::user()->account->load('country');
$invoice = new stdClass();
if ($invoice = Invoice::scope()->invoices()->orderBy('id')->first()) {
$invoice->load('account', 'client.contacts', 'invoice_items');
$invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
$invoice->due_date = Utils::fromSqlDate($invoice->due_date);
} else {
$client = new stdClass(); $client = new stdClass();
$contact = new stdClass(); $contact = new stdClass();
$invoiceItem = new stdClass(); $invoiceItem = new stdClass();
@ -576,6 +581,7 @@ class AccountController extends BaseController
$client->custom_value2 = '0000'; $client->custom_value2 = '0000';
} }
$invoice = new stdClass();
$invoice->invoice_number = '0000'; $invoice->invoice_number = '0000';
$invoice->invoice_date = Utils::fromSqlDate(date('Y-m-d')); $invoice->invoice_date = Utils::fromSqlDate(date('Y-m-d'));
$invoice->account = json_decode($account->toJson()); $invoice->account = json_decode($account->toJson());
@ -617,6 +623,7 @@ class AccountController extends BaseController
$invoice->invoice_items = [$invoiceItem]; $invoice->invoice_items = [$invoiceItem];
//$invoice->documents = $account->hasFeature(FEATURE_DOCUMENTS) ? [$document] : []; //$invoice->documents = $account->hasFeature(FEATURE_DOCUMENTS) ? [$document] : [];
$invoice->documents = []; $invoice->documents = [];
}
$data['account'] = $account; $data['account'] = $account;
$data['invoice'] = $invoice; $data['invoice'] = $invoice;