Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 23:14:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for default country

Browse Source
This commit is contained in:
David Bomba 2022-03-30 08:05:42 +11:00
parent dd2f9cf545
commit ed75514646
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Livewire/BillingPortalPurchase.php
View File

@ -238,7 +238,8 @@ class BillingPortalPurchase extends Component
{ {
$company = $this->subscription->company; $company = $this->subscription->company;
$user = $this->subscription->user; $user = $this->subscription->user;
$user->setCompany($company);
$client_repo = new ClientRepository(new ClientContactRepository()); $client_repo = new ClientRepository(new ClientContactRepository());
$data = [ $data = [

7
app/Repositories/ClientRepository.php
View File

@ -13,6 +13,7 @@ namespace App\Repositories;
use App\Factory\ClientFactory; use App\Factory\ClientFactory;
use App\Models\Client; use App\Models\Client;
use App\Models\Company;
use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\GeneratesCounter;
use App\Utils\Traits\SavesDocuments; use App\Utils\Traits\SavesDocuments;
@ -59,10 +60,10 @@ class ClientRepository extends BaseRepository
} }
$client->fill($data); $client->fill($data);
if(auth()->user() && !$client->country_id){ if(!$client->country_id){
$client->country_id = auth()->user()->company()->settings->country_id; $company = Company::find($client->company_id);
$client->country_id = $company->settings->country_id;
} }