Bug fixes

app/controllers/AccountController.php

@@ -295,7 +295,8 @@ class AccountController extends \BaseController {
 				$invoice->invoice_items = [$invoiceItem];			
 				
 				$data['invoice'] = $invoice;
-				$data['invoiceDesigns'] = InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache')->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get();
+				$data['invoiceDesigns'] = InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache_'.Auth::user()->maxInvoiceDesignId())
+					->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get();
 			}
 
 			return View::make("accounts.{$subSection}", $data);	

app/controllers/InvoiceController.php

@@ -243,7 +243,8 @@ class InvoiceController extends \BaseController {
 			'sizes' => Size::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(),
 			'paymentTerms' => PaymentTerm::remember(DEFAULT_QUERY_CACHE)->orderBy('num_days')->get(['name', 'num_days']),
 			'industries' => Industry::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),				
-      'invoiceDesigns' => InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache')->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get(),
+      'invoiceDesigns' => InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache_'.Auth::user()->maxInvoiceDesignId())
+      	->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get(),
 			'frequencies' => array(
 				1 => 'Weekly',
 				2 => 'Two weeks',

app/controllers/QuoteController.php

@@ -95,7 +95,8 @@ class QuoteController extends \BaseController {
       'sizes' => Size::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(),
       'paymentTerms' => PaymentTerm::remember(DEFAULT_QUERY_CACHE)->orderBy('num_days')->get(['name', 'num_days']),
       'industries' => Industry::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),        
-      'invoiceDesigns' => InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache')->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get(),
+      'invoiceDesigns' => InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache_'.Auth::user()->maxInvoiceDesignId())
+        ->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get(),
       'invoiceLabels' => Auth::user()->account->getInvoiceLabels()
     ];
   }

app/filters.php

@@ -100,7 +100,6 @@ App::before(function($request)
           $design->save();
         }
 
-        Cache::forget('invoice_designs_cache');
         Session::flash('message', trans('texts.bought_designs'));
       }
     }

app/views/accounts/invoice_design.blade.php

@@ -72,7 +72,7 @@
       {{ Former::legend('invoice_design') }}
 
 
-      @if (InvoiceDesign::count() == COUNT_FREE_DESIGNS)
+      @if (!Utils::isPro() || InvoiceDesign::count() == COUNT_FREE_DESIGNS)      
         {{ Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id')->addOption(trans('texts.more_designs') . '...', '-1') }}        
       @else 
         {{ Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id') }}

app/views/invoices/edit.blade.php

@@ -265,7 +265,7 @@
 		</div>
 
 
-		@if (InvoiceDesign::count() == COUNT_FREE_DESIGNS)
+		@if (!Utils::isPro() || InvoiceDesign::count() == COUNT_FREE_DESIGNS)
 			{{ Former::select('invoice_design_id')->style('display:inline;width:150px')->raw()->fromQuery($invoiceDesigns, 'name', 'id')->data_bind("value: invoice_design_id")->addOption(trans('texts.more_designs') . '...', '-1') }}
 		@else 
 			{{ Former::select('invoice_design_id')->style('display:inline;width:150px')->raw()->fromQuery($invoiceDesigns, 'name', 'id')->data_bind("value: invoice_design_id") }}

app/views/invoices/view.blade.php

@@ -5,7 +5,7 @@
 
 		@include('script')		
 		
-		<link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>
+		<link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>
 
 		<script src="{{ asset('js/pdf_viewer.js') }}" type="text/javascript"></script>
 		<script src="{{ asset('js/compatibility.js') }}" type="text/javascript"></script>
@@ -36,6 +36,30 @@
 		
 		<div class="clearfix"></div><p>&nbsp;</p>
 
+		<script type="text/javascript">
+
+			window.invoice = {{ $invoice->toJson() }};
+			invoice.is_pro = {{ $invoice->client->account->isPro() ? 'true' : 'false' }};
+			invoice.is_quote = {{ $invoice->is_quote ? 'true' : 'false' }};
+
+			function getPDFString() {
+	  	  var doc = generatePDF(invoice, invoice.invoice_design.javascript);
+				if (!doc) return;
+				return doc.output('datauristring');
+			}
+
+			$(function() {
+				refreshPDF();
+			});
+			
+			function onDownloadClick() {			
+				var doc = generatePDF(invoice, invoice.invoice_design.javascript, true);
+				doc.save('Invoice-' + invoice.invoice_number + '.pdf');
+			}
+
+
+		</script>
+
 		@include('invoices.pdf', ['account' => $invoice->client->account])
 
 		<p>&nbsp;</p>
@@ -43,28 +67,4 @@
 
 	</div>	
 
-	<script type="text/javascript">
-
-		window.invoice = {{ $invoice->toJson() }};
-		invoice.is_pro = {{ $invoice->client->account->isPro() ? 'true' : 'false' }};
-		invoice.is_quote = {{ $invoice->is_quote ? 'true' : 'false' }};
-
-		function getPDFString() {
-  	  var doc = generatePDF(invoice, invoice.invoice_design.javascript);
-			if (!doc) return;
-			return doc.output('datauristring');
-		}
-
-		$(function() {
-			refreshPDF();
-		});
-		
-		function onDownloadClick() {
-			var doc = generatePDF(invoice, true);
-			doc.save('Invoice-' + invoice.invoice_number + '.pdf');
-		}
-
-
-	</script>
-
 @stop

app/views/users/forgot_password.blade.php

@@ -2,7 +2,7 @@
 
 @section('head')	
 
-	  <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+	  <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
 
     <style type="text/css">
 		body {

app/views/users/login.blade.php

@@ -2,7 +2,7 @@
 
 @section('head')	
 
-  <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+  <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
   <link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>    
 
   <style type="text/css">

app/views/users/reset_password.blade.php

@@ -2,7 +2,7 @@
 
 @section('head')	
 
-	  <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+	  <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
 
     <style type="text/css">
 		body {