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

Fixes to invoice history

Browse Source
This commit is contained in:
Hillel Coren 2015-01-25 23:28:49 +02:00
parent b60d36f066
commit eb6b4c1386
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/InvoiceController.php
View File

@ -519,6 +519,7 @@ class InvoiceController extends \BaseController
$backup->due_date = Utils::fromSqlDate($backup->due_date); $backup->due_date = Utils::fromSqlDate($backup->due_date);
$backup->is_pro = Auth::user()->isPro(); $backup->is_pro = Auth::user()->isPro();
$backup->is_quote = intval($backup->is_quote); $backup->is_quote = intval($backup->is_quote);
$backup->account = $invoice->account->toArray();
$versionsJson[$activity->id] = $backup; $versionsJson[$activity->id] = $backup;
@ -528,8 +529,6 @@ class InvoiceController extends \BaseController
} }
$versionsSelect[$lastId] = Utils::timestampToDateTimeString(strtotime($invoice->created_at)) . ' - ' . $invoice->user->getDisplayName(); $versionsSelect[$lastId] = Utils::timestampToDateTimeString(strtotime($invoice->created_at)) . ' - ' . $invoice->user->getDisplayName();
//dd($versionsSelect);
//dd($activities);
$data = [ $data = [
'invoice' => $invoice, 'invoice' => $invoice,

2
app/views/invoices/history.blade.php
View File

@ -24,6 +24,8 @@
invoice = currentInvoice; invoice = currentInvoice;
} }
invoice.image = window.accountLogo;
var invoiceDesignId = parseInt(invoice.invoice_design_id); var invoiceDesignId = parseInt(invoice.invoice_design_id);
var invoiceDesign = _.findWhere(invoiceDesigns, {id: invoiceDesignId}); var invoiceDesign = _.findWhere(invoiceDesigns, {id: invoiceDesignId});
if (!invoiceDesign) { if (!invoiceDesign) {

4
app/views/invoices/pdf.blade.php
View File

@ -65,7 +65,9 @@
if (window.invoice) { if (window.invoice) {
invoice.image = "{{ HTML::image_data($account->getLogoPath()) }}"; invoice.image = "{{ HTML::image_data($account->getLogoPath()) }}";
invoice.imageWidth = {{ $account->getLogoWidth() }}; invoice.imageWidth = {{ $account->getLogoWidth() }};
invoice.imageHeight = {{ $account->getLogoHeight() }}; invoice.imageHeight = {{ $account->getLogoHeight() }};
} else {
window.accountLogo = "{{ HTML::image_data($account->getLogoPath()) }}";
} }
@endif @endif