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

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-05-25 16:55:47 +03:00
parent f515d57669
commit af5f659d24
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/InvoiceController.php
View File

@ -112,7 +112,7 @@ class InvoiceController extends \BaseController {
$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);
$invoice->is_pro = $client->account->isPro(); $invoice->is_pro = $client->account->isPro();
$data = array( $data = array(
'hideHeader' => true, 'hideHeader' => true,

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

@ -49,7 +49,7 @@
$(function() { $(function() {
window.invoice = {{ $invoice->toJson() }}; window.invoice = {{ $invoice->toJson() }};
window.logoImages = {}; window.logoImages = {};
logoImages.imageLogo1 = "{{ HTML::image_data('images/report_logo1.jpg') }}"; logoImages.imageLogo1 = "{{ HTML::image_data('images/report_logo1.jpg') }}";
logoImages.imageLogoWidth1 =120; logoImages.imageLogoWidth1 =120;
logoImages.imageLogoHeight1 = 40 logoImages.imageLogoHeight1 = 40
@ -68,6 +68,8 @@
invoice.imageHeight = {{ $invoice->client->account->getLogoHeight() }}; invoice.imageHeight = {{ $invoice->client->account->getLogoHeight() }};
@endif @endif
invoice.is_quote = {{ $invoice->is_quote ? 'true' : 'false' }};
var NINJA = NINJA || {}; var NINJA = NINJA || {};
NINJA.primaryColor = "{{ $invoice->client->account->primary_color }}"; NINJA.primaryColor = "{{ $invoice->client->account->primary_color }}";
NINJA.secondaryColor = "{{ $invoice->client->account->secondary_color }}"; NINJA.secondaryColor = "{{ $invoice->client->account->secondary_color }}";