mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 08:17:32 -05:00 
			
		
		
		
	Merge pull request #6621 from turbo124/v5-develop
Fixes for login refresh queries
This commit is contained in:
		
						commit
						8cfbf1085c
					
				@ -316,7 +316,7 @@ class BaseController extends Controller
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            'company.tax_rates'=> function ($query) use ($updated_at, $user) {
 | 
					            'company.tax_rates'=> function ($query) use ($updated_at, $user) {
 | 
				
			||||||
                $query->where('updated_at', '>=', $updated_at);
 | 
					                $query->whereNotNull('updated_at');
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            'company.vendors'=> function ($query) use ($updated_at, $user) {
 | 
					            'company.vendors'=> function ($query) use ($updated_at, $user) {
 | 
				
			||||||
                $query->where('updated_at', '>=', $updated_at)->with('contacts', 'documents');
 | 
					                $query->where('updated_at', '>=', $updated_at)->with('contacts', 'documents');
 | 
				
			||||||
@ -329,7 +329,7 @@ class BaseController extends Controller
 | 
				
			|||||||
                $query->where('updated_at', '>=', $updated_at);
 | 
					                $query->where('updated_at', '>=', $updated_at);
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            'company.task_statuses'=> function ($query) use ($updated_at, $user) {
 | 
					            'company.task_statuses'=> function ($query) use ($updated_at, $user) {
 | 
				
			||||||
                $query->where('updated_at', '>=', $updated_at);
 | 
					                $query->whereNotNull('updated_at');
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            'company.activities'=> function ($query) use($user) {
 | 
					            'company.activities'=> function ($query) use($user) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -391,7 +391,7 @@ class BaseController extends Controller
 | 
				
			|||||||
            'company.documents'=> function ($query) use ($created_at, $user) {
 | 
					            'company.documents'=> function ($query) use ($created_at, $user) {
 | 
				
			||||||
                $query->where('created_at', '>=', $created_at);
 | 
					                $query->where('created_at', '>=', $created_at);
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            'company.groups' => function ($query) use ($created_at, $user) {
 | 
					            'company.groups'=> function ($query) use ($created_at, $user) {
 | 
				
			||||||
                $query->where('created_at', '>=', $created_at)->with('documents');
 | 
					                $query->where('created_at', '>=', $created_at)->with('documents');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
@ -399,7 +399,7 @@ class BaseController extends Controller
 | 
				
			|||||||
                $query->where('created_at', '>=', $created_at);
 | 
					                $query->where('created_at', '>=', $created_at);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            'company.tax_rates' => function ($query) use ($created_at, $user) {
 | 
					            'company.tax_rates'=> function ($query) use ($created_at, $user) {
 | 
				
			||||||
                $query->where('created_at', '>=', $created_at);
 | 
					                $query->where('created_at', '>=', $created_at);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user