From af5f659d24d086f650bbc6dd3e04abebac61047b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 25 May 2014 16:55:47 +0300 Subject: [PATCH] Bug fixes --- app/controllers/InvoiceController.php | 2 +- app/views/invoices/view.blade.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 8ce11e20ec05..1797102a04f4 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -112,7 +112,7 @@ class InvoiceController extends \BaseController { $invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date); $invoice->due_date = Utils::fromSqlDate($invoice->due_date); - $invoice->is_pro = $client->account->isPro(); + $invoice->is_pro = $client->account->isPro(); $data = array( 'hideHeader' => true, diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php index ff2813abee03..bc1d809fa283 100755 --- a/app/views/invoices/view.blade.php +++ b/app/views/invoices/view.blade.php @@ -49,7 +49,7 @@ $(function() { window.invoice = {{ $invoice->toJson() }}; window.logoImages = {}; - + logoImages.imageLogo1 = "{{ HTML::image_data('images/report_logo1.jpg') }}"; logoImages.imageLogoWidth1 =120; logoImages.imageLogoHeight1 = 40 @@ -68,6 +68,8 @@ invoice.imageHeight = {{ $invoice->client->account->getLogoHeight() }}; @endif + invoice.is_quote = {{ $invoice->is_quote ? 'true' : 'false' }}; + var NINJA = NINJA || {}; NINJA.primaryColor = "{{ $invoice->client->account->primary_color }}"; NINJA.secondaryColor = "{{ $invoice->client->account->secondary_color }}";