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

Merge pull request #3937 from turbo124/v2

Browse Source 
Formatting for refresh query
This commit is contained in:
David Bomba 2020-07-28 07:45:11 +10:00 committed by GitHub
commit 0b20bef518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,61 +185,60 @@ class BaseController extends Controller
} }
$transformer = new $this->entity_transformer($this->serializer); $transformer = new $this->entity_transformer($this->serializer);
$updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0; $updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0;
$updated_at = date('Y-m-d H:i:s', $updated_at); $updated_at = date('Y-m-d H:i:s', $updated_at);
$query->with( $query->with(
[ [
'company' => function ($query) use($updated_at){ 'company' => function ($query) use($updated_at){
$query->whereNotNull('updated_at'); $query->whereNotNull('updated_at');
}, },
'company.clients'=>function ($query) use($updated_at){ 'company.clients' => function ($query) use($updated_at){
$query->where('clients.updated_at', '>=', $updated_at)->with('contacts'); $query->where('clients.updated_at', '>=', $updated_at)->with('contacts');
}, },
'company.tax_rates'=>function ($query) use($updated_at){ 'company.tax_rates' => function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
'company.groups'=>function ($query) use($updated_at){ 'company.groups' => function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
'company.company_gateways'=>function ($query) use($updated_at){ 'company.company_gateways' => function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at)->with('gateway'); $query->where('updated_at', '>=', $updated_at)->with('gateway');
}, },
'company.products'=>function ($query) use($updated_at){ 'company.products' => function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
'company.invoices'=>function ($query) use($updated_at){ 'company.invoices'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at)->with('invitations','company','documents'); $query->where('updated_at', '>=', $updated_at)->with('invitations','company','documents');
}, },
'company.payments'=>function ($query) use($updated_at){ 'company.payments'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at)->with('paymentables'); $query->where('updated_at', '>=', $updated_at)->with('paymentables');
}, },
'company.quotes'=>function ($query) use($updated_at){ 'company.quotes'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at)->with('invitations','documents'); $query->where('updated_at', '>=', $updated_at)->with('invitations','documents');
}, },
'company.credits'=>function ($query) use($updated_at){ 'company.credits'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at)->with('invitations','documents'); $query->where('updated_at', '>=', $updated_at)->with('invitations','documents');
}, },
'company.payment_terms'=>function ($query) use($updated_at){ 'company.payment_terms'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
'company.vendors'=>function ($query) use($updated_at){ 'company.vendors'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at)->with('contacts'); $query->where('updated_at', '>=', $updated_at)->with('contacts');
}, },
'company.expenses'=>function ($query) use($updated_at){ 'company.expenses'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
'company.tasks'=>function ($query) use($updated_at){ 'company.tasks'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
'company.projects'=>function ($query) use($updated_at){ 'company.projects'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
'company.designs'=>function ($query) use($updated_at){ 'company.designs'=> function ($query) use($updated_at){
$query->where('updated_at', '>=', $updated_at); $query->where('updated_at', '>=', $updated_at);
}, },
] ]
); );

2
app/Http/Middleware/QueryLogging.php
View File

@ -51,7 +51,7 @@ class QueryLogging
Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time); Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
// if($count > 700) // if($count > 700)
Log::info($queries); // Log::info($queries);
} }
} }

2
app/Repositories/BaseRepository.php
View File

@ -312,7 +312,7 @@ class BaseRepository
$model = $model->calc()->getInvoice(); $model = $model->calc()->getInvoice();
$state['finished_amount'] = $model->amount; $state['finished_amount'] = $model->amount;
$model = $model->service()->applyNumber()->save(); $model = $model->service()->applyNumber()->save();
if ($model->company->update_products !== false) { if ($model->company->update_products !== false) {

2
app/Repositories/InvoiceRepository.php
View File

@ -35,7 +35,7 @@ class InvoiceRepository extends BaseRepository
*/ */
public function getClassName() public function getClassName()
{ {
return Invoice::class ; return Invoice::class;
} }
/** /**