diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 37b3b45feecc..4c8eabd9f252 100755
--- a/app/controllers/AccountController.php
+++ b/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);
diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php
index fda9f643b84d..d4219b17007a 100755
--- a/app/controllers/InvoiceController.php
+++ b/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',
diff --git a/app/controllers/QuoteController.php b/app/controllers/QuoteController.php
index 497e7cc74ab4..fd8d09439e87 100644
--- a/app/controllers/QuoteController.php
+++ b/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()
];
}
diff --git a/app/filters.php b/app/filters.php
index dd667f960059..259bf2160740 100755
--- a/app/filters.php
+++ b/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'));
}
}
diff --git a/app/views/accounts/invoice_design.blade.php b/app/views/accounts/invoice_design.blade.php
index de76b6db2438..8124fb13bd53 100644
--- a/app/views/accounts/invoice_design.blade.php
+++ b/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') }}
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index f3b2711b4570..7364d790662b 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -265,7 +265,7 @@
- @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") }}
diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php
index fc752a581305..9c8d1b69f580 100755
--- a/app/views/invoices/view.blade.php
+++ b/app/views/invoices/view.blade.php
@@ -5,7 +5,7 @@
@include('script')
-
+
@@ -36,6 +36,30 @@
+
+
@include('invoices.pdf', ['account' => $invoice->client->account])
@@ -43,28 +67,4 @@
-
-
@stop
\ No newline at end of file
diff --git a/app/views/users/forgot_password.blade.php b/app/views/users/forgot_password.blade.php
index a36be7f4c88d..2a87498096dd 100755
--- a/app/views/users/forgot_password.blade.php
+++ b/app/views/users/forgot_password.blade.php
@@ -2,7 +2,7 @@
@section('head')
-
+