diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 52cfa0e5a655..762be28a2852 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -68,7 +68,7 @@ class AccountController extends \BaseController { if ($section == ACCOUNT_DETAILS) { $account = Account::with('users')->findOrFail(Auth::user()->account_id); - $countries = Country::orderBy('name')->get(); + $countries = Country::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(); return View::make('accounts.details', array('account'=>$account, 'countries'=>$countries)); } @@ -88,11 +88,11 @@ class AccountController extends \BaseController { 'account' => $account, 'accountGateway' => $accountGateway, 'config' => json_decode($config), - 'gateways' => Gateway::all(), - 'timezones' => Timezone::orderBy('location')->get(), - 'dateFormats' => DateFormat::all(), - 'datetimeFormats' => DatetimeFormat::all(), - 'currencies' => Currency::orderBy('name')->get(), + 'gateways' => Gateway::remember(DEFAULT_QUERY_CACHE)->get(), + 'timezones' => Timezone::remember(DEFAULT_QUERY_CACHE)->orderBy('location')->get(), + 'dateFormats' => DateFormat::remember(DEFAULT_QUERY_CACHE)->get(), + 'datetimeFormats' => DatetimeFormat::remember(DEFAULT_QUERY_CACHE)->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), ]; foreach ($data['gateways'] as $gateway) diff --git a/app/controllers/ClientController.php b/app/controllers/ClientController.php index 8deb38eb2406..563c274085d6 100755 --- a/app/controllers/ClientController.php +++ b/app/controllers/ClientController.php @@ -86,10 +86,10 @@ class ClientController extends \BaseController { 'method' => 'POST', 'url' => 'clients', 'title' => '- New Client', - 'clientSizes' => ClientSize::orderBy('id')->get(), - 'clientIndustries' => ClientIndustry::orderBy('name')->get(), - 'currencies' => Currency::orderBy('name')->get(), - 'countries' => Country::orderBy('name')->get()); + 'clientSizes' => ClientSize::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(), + 'clientIndustries' => ClientIndustry::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), + 'countries' => Country::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get()); return View::make('clients.edit', $data); } @@ -138,10 +138,10 @@ class ClientController extends \BaseController { 'method' => 'PUT', 'url' => 'clients/' . $publicId, 'title' => '- ' . $client->name, - 'clientSizes' => ClientSize::orderBy('id')->get(), - 'clientIndustries' => ClientIndustry::orderBy('name')->get(), - 'currencies' => Currency::orderBy('name')->get(), - 'countries' => Country::orderBy('name')->get()); + 'clientSizes' => ClientSize::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(), + 'clientIndustries' => ClientIndustry::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), + 'countries' => Country::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get()); return View::make('clients.edit', $data); } diff --git a/app/controllers/CreditController.php b/app/controllers/CreditController.php index e435f606f746..27aa916136fe 100755 --- a/app/controllers/CreditController.php +++ b/app/controllers/CreditController.php @@ -76,7 +76,7 @@ class CreditController extends \BaseController { 'method' => 'POST', 'url' => 'credits', 'title' => '- New Credit', - 'currencies' => Currency::orderBy('name')->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), 'clients' => Client::scope()->with('contacts')->orderBy('name')->get()); return View::make('credits.edit', $data); @@ -91,7 +91,7 @@ class CreditController extends \BaseController { 'method' => 'PUT', 'url' => 'credits/' . $publicId, 'title' => '- Edit Credit', - 'currencies' => Currency::orderBy('name')->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), 'clients' => Client::scope()->with('contacts')->orderBy('name')->get()); return View::make('credit.edit', $data); } diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index b45e4b6cd97c..3f4572ec634b 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -310,8 +310,6 @@ class InvoiceController extends \BaseController { 'invoice' => $invoice, 'method' => 'PUT', 'invitationContactIds' => $contactIds, - 'clientSizes' => ClientSize::orderBy('id')->get(), - 'clientIndustries' => ClientIndustry::orderBy('name')->get(), 'url' => 'invoices/' . $publicId, 'title' => '- ' . $invoice->invoice_number, 'client' => $invoice->client); @@ -335,8 +333,6 @@ class InvoiceController extends \BaseController { 'invoiceNumber' => $invoiceNumber, 'method' => 'POST', 'url' => 'invoices', - 'clientSizes' => ClientSize::orderBy('id')->get(), - 'clientIndustries' => ClientIndustry::orderBy('name')->get(), 'title' => '- New Invoice', 'client' => $client, 'items' => json_decode(Input::old('items'))); @@ -349,10 +345,12 @@ class InvoiceController extends \BaseController { return [ 'account' => Auth::user()->account, 'products' => Product::scope()->get(array('product_key','notes','cost','qty')), - 'countries' => Country::orderBy('name')->get(), + 'countries' => Country::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), 'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), 'taxRates' => TaxRate::scope()->orderBy('name')->get(), - 'currencies' => Currency::orderBy('name')->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), + 'clientSizes' => ClientSize::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(), + 'clientIndustries' => ClientIndustry::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), 'frequencies' => array( 1 => 'Weekly', 2 => 'Two weeks', diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php index 300419d9ae86..915f5677b84a 100755 --- a/app/controllers/PaymentController.php +++ b/app/controllers/PaymentController.php @@ -80,7 +80,7 @@ class PaymentController extends \BaseController 'method' => 'POST', 'url' => 'payments', 'title' => '- New Payment', - 'currencies' => Currency::orderBy('name')->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), 'clients' => Client::scope()->with('contacts')->orderBy('name')->get()); return View::make('payments.edit', $data); @@ -97,7 +97,7 @@ class PaymentController extends \BaseController 'method' => 'PUT', 'url' => 'payments/' . $publicId, 'title' => '- Edit Payment', - 'currencies' => Currency::orderBy('name')->get(), + 'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(), 'clients' => Client::scope()->with('contacts')->orderBy('name')->get()); return View::make('payments.edit', $data); } diff --git a/app/models/Client.php b/app/models/Client.php index 5372a7b5f112..f97fb5b7c5bc 100755 --- a/app/models/Client.php +++ b/app/models/Client.php @@ -54,6 +54,18 @@ class Client extends EntityModel return $this->name; } + public function getDisplayName() + { + if ($this->name) + { + return $this->name; + } + + $contact = $this->contacts()->first(); + + return $contact->getFullName(); + } + public function getEntityType() { return ENTITY_CLIENT; diff --git a/app/routes.php b/app/routes.php index a5cc2c5aef88..91bbc3e01993 100755 --- a/app/routes.php +++ b/app/routes.php @@ -180,3 +180,5 @@ define('DEFAULT_CURRENCY', 1); // US Dollar define('DEFAULT_DATE_FORMAT', 'M j, Y'); define('DEFAULT_DATE_PICKER_FORMAT', 'yyyy-mm-dd'); define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a'); + +define('DEFAULT_QUERY_CACHE', 120); \ No newline at end of file diff --git a/app/views/header.blade.php b/app/views/header.blade.php index 1fb9d10f5d21..8c38327bcaf7 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -151,7 +151,7 @@
-
+
{{ Former::open('user/setTheme')->addClass('themeForm') }}
@@ -160,11 +160,11 @@
@@ -172,7 +172,7 @@ {{ Former::close() }}
- Powered by {{ link_to('https://github.com/hillelcoren/invoice-ninja', 'InvoiceNinja', array('target'=>'_blank')) }} + Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice-ninja', 'open source', array('target'=>'_blank')) }}, email us at {{ link_to('mailto:contact@invoiceninja.com', 'contact@invoiceninja.com') }}.

This is a demo site, the data is erased.

diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index 0d84baa795c2..d26d591c5935 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -19,6 +19,17 @@
+ + @if ($invoice && $invoice->isSent()) +
+ +
+ {{ $client->getDisplayName() }} +
+
+
+ @endif + {{ Former::select('client')->addOption('', '')->data_bind("dropdown: client") ->addGroupClass('client_select closer-row') }} @@ -28,12 +39,16 @@
+ @if ($invoice && $invoice->isSent()) +
+ @endif +
@@ -111,13 +126,13 @@ - + - + @@ -187,7 +202,7 @@ - + @@ -196,7 +211,7 @@
- +
@@ -321,8 +336,6 @@ $(function() { - //$('form').change(refreshPDF); - $('#country_id').combobox(); $('[rel=tooltip]').tooltip(); @@ -365,7 +378,7 @@ @if ($client) $('#invoice_number').focus(); @else - //$('[name="client_combobox"]').focus(); + $('.client_select input.form-control').focus(); @endif $('#clientModal').on('shown.bs.modal', function () { @@ -392,7 +405,6 @@ $('label.radio').addClass('radio-inline'); applyComboboxListeners(); - refreshPDF(); }); function applyComboboxListeners() { @@ -437,28 +449,28 @@ console.log("refreshPDF"); var invoice = createInvoiceModel(); var doc = generatePDF(invoice); - - /* - var string = doc.output('dataurlstring'); - var pdfAsArray = convertDataURIToBinary(string); - PDFJS.getDocument(pdfAsArray).then(function getPdfHelloWorld(pdf) { - - pdf.getPage(1).then(function getPageHelloWorld(page) { - var scale = 1.5; - var viewport = page.getViewport(scale); - - var canvas = document.getElementById('theCanvas'); - var context = canvas.getContext('2d'); - canvas.height = viewport.height; - canvas.width = viewport.width; - - page.render({canvasContext: context, viewport: viewport}); - }); - }); - */ - var string = doc.output('datauristring'); - $('#theIFrame').attr('src', string); + + if (isFirefox || isChrome) { + $('#theFrame').attr('src', string).show(); + } else { + var pdfAsArray = convertDataURIToBinary(string); + PDFJS.getDocument(pdfAsArray).then(function getPdfHelloWorld(pdf) { + + pdf.getPage(1).then(function getPageHelloWorld(page) { + var scale = 1.5; + var viewport = page.getViewport(scale); + + var canvas = document.getElementById('theCanvas'); + var context = canvas.getContext('2d'); + canvas.height = viewport.height; + canvas.width = viewport.width; + + page.render({canvasContext: context, viewport: viewport}); + $('#theCanvas').show(); + }); + }); + } } function onDownloadClick() { @@ -496,11 +508,12 @@ } function formEnterClick(event) { + console.log('form enter click'); + if (event.keyCode === 13){ if (event.target.type == 'textarea') { return; } - event.preventDefault(); $('.main_form').submit(); return false; @@ -508,6 +521,7 @@ } function clientModalEnterClick(event) { + console.log('client form enter click'); if (event.keyCode === 13){ event.preventDefault(); model.clientFormComplete(); @@ -516,6 +530,7 @@ } function taxModalEnterClick(event) { + console.log('tax form enter click'); if (event.keyCode === 13){ event.preventDefault(); model.taxFormComplete(); @@ -777,8 +792,8 @@ ko.mapping.fromJS(data, {}, this); } - self.fullName = ko.computed(function() { - return self.first_name() + ' ' + self.last_name(); + self.displayName = ko.computed(function() { + return self.first_name() + ' ' + self.last_name() + ' - ' + self.email(); }); } @@ -828,8 +843,8 @@ var self = this; this.product_key = ko.observable(''); this.notes = ko.observable(''); - this.cost = ko.observable(); - this.qty = ko.observable(); + this.cost = ko.observable(0); + this.qty = ko.observable(0); this.tax = ko.observable(); this.actionsVisible = ko.observable(false); @@ -843,6 +858,16 @@ owner: this }); + this.prettyCost = ko.computed({ + read: function () { + return this.cost() ? this.cost() : ''; + }, + write: function (value) { + this.cost(value); + }, + owner: this + }); + if (data) { ko.mapping.fromJS(data, {}, this); if (this.cost()) this.cost(formatMoney(this.cost(), model.currency_id(), true)); diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php index 9426a927d32f..c446212b67cb 100755 --- a/app/views/invoices/view.blade.php +++ b/app/views/invoices/view.blade.php @@ -17,8 +17,8 @@

 

- - + +