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-10-26 10:42:02 +02:00
parent 8d623db294
commit 8cae66c2ff
11 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/AccountController.php
View File

@ -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);

3
app/controllers/InvoiceController.php
View File

@ -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',

3
app/controllers/QuoteController.php
View File

@ -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()
];
}

1
app/filters.php
View File

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

2
app/views/accounts/invoice_design.blade.php
View File

@ -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') }}

2
app/views/invoices/edit.blade.php
View File

@ -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") }}

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

@ -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,13 +36,6 @@
<div class="clearfix"></div><p>&nbsp;</p>
@include('invoices.pdf', ['account' => $invoice->client->account])
<p>&nbsp;</p>
<p>&nbsp;</p>
</div>
<script type="text/javascript">
window.invoice = {{ $invoice->toJson() }};
@ -60,11 +53,18 @@
});
function onDownloadClick() {
var doc = generatePDF(invoice, true);
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>
<p>&nbsp;</p>
</div>
@stop

2
app/views/users/forgot_password.blade.php
View File

@ -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 {

2
app/views/users/login.blade.php
View File

@ -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">

2
app/views/users/reset_password.blade.php
View File

@ -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 {

7
public/css/bootstrap.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long