Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Fixes for invoice save (#3295)

Browse Source 
* Working on Invoice Designs

* Fixes for invoice save

* Threshold changes for sending large accounts on ?first_load=true
This commit is contained in:
David Bomba 2020-02-07 08:09:15 +11:00 committed by GitHub
parent 82720f1801
commit e8f19f9b63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BaseController.php
View File

@ -283,7 +283,7 @@ class BaseController extends Controller
if (request()->has('first_load') && request()->input('first_load') == 'true') if (request()->has('first_load') && request()->input('first_load') == 'true')
{ {
if (auth()->user()->getCompany()->clients->count() > 1000) if (auth()->user()->getCompany()->invoices->count() > 1000)
{ {
$data = $mini_load; $data = $mini_load;

2
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -150,7 +150,7 @@ trait MakesInvoiceValues
$data['$'.$label . '_label'] = ctrans('texts.'.$label); $data['$'.$label . '_label'] = ctrans('texts.'.$label);
} }
if(property_exists($custom_fields,'invoice_text1')) if($custom_fields && property_exists($custom_fields,'invoice_text1'))
$data['$invoice_text1'] = $custom_fields->invoice_text1; $data['$invoice_text1'] = $custom_fields->invoice_text1;
return $data; return $data;