mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 22:27:31 -05:00 
			
		
		
		
	Fixes for company token resolution
This commit is contained in:
		
							parent
							
								
									b9073c4276
								
							
						
					
					
						commit
						a0b22f5339
					
				@ -16,7 +16,6 @@ use App\Models\Company;
 | 
				
			|||||||
use App\Models\CompanyToken;
 | 
					use App\Models\CompanyToken;
 | 
				
			||||||
use App\Models\CompanyUser;
 | 
					use App\Models\CompanyUser;
 | 
				
			||||||
use App\Models\User;
 | 
					use App\Models\User;
 | 
				
			||||||
use App\Utils\TruthSource;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
class CompanyUserTransformer extends EntityTransformer
 | 
					class CompanyUserTransformer extends EntityTransformer
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -80,11 +79,6 @@ class CompanyUserTransformer extends EntityTransformer
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    public function includeToken(CompanyUser $company_user)
 | 
					    public function includeToken(CompanyUser $company_user)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $truth = app()->make(TruthSource::class);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        if($truth->getCompanyToken())
 | 
					 | 
				
			||||||
            $token = $truth->getCompanyToken();
 | 
					 | 
				
			||||||
        else
 | 
					 | 
				
			||||||
        $token = $company_user->tokens->where('company_id', $company_user->company_id)->where('user_id', $company_user->user_id)->first();
 | 
					        $token = $company_user->tokens->where('company_id', $company_user->company_id)->where('user_id', $company_user->user_id)->first();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $transformer = new CompanyTokenTransformer($this->serializer);
 | 
					        $transformer = new CompanyTokenTransformer($this->serializer);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user