From 4b3c9df885a8c959e4b86ec93edd7f8f4bf70fb8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 28 May 2023 16:50:45 +1000 Subject: [PATCH 1/2] Minor fixes --- app/Jobs/Company/CreateCompany.php | 2 +- app/Models/User.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php index f288b1b9f52f..ee5a42644d32 100644 --- a/app/Jobs/Company/CreateCompany.php +++ b/app/Jobs/Company/CreateCompany.php @@ -202,7 +202,7 @@ class CreateCompany } catch(\Exception $e){ - nlog("SETUP: could not complete setup for Spanish Locale"); + nlog("SETUP: could not complete setup for Australian Locale"); } $company->save(); diff --git a/app/Models/User.php b/app/Models/User.php index aa578900d31d..da37482dbb94 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -178,7 +178,7 @@ class User extends Authenticatable implements MustVerifyEmail protected $dateFormat = 'Y-m-d H:i:s.u'; - public Company $company; + public ?Company $company = null; protected $appends = [ 'hashed_id', From 9a080ab90e3103b2f9b957d7c82509a889df485b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 28 May 2023 17:23:32 +1000 Subject: [PATCH 2/2] update auto creation logic --- app/Jobs/Company/CreateCompany.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php index ee5a42644d32..90bddda49244 100644 --- a/app/Jobs/Company/CreateCompany.php +++ b/app/Jobs/Company/CreateCompany.php @@ -152,12 +152,14 @@ class CreateCompany $company->save(); - $user = $this->account->users()->orderBy('id','asc')->first(); + //user does not exist yet. + // MultiDB::setDb($company->db); + // $user = \App\Models\User::where('account_id', $company->account_id)->first(); - $tax_rate = TaxRateFactory::create($company->id, $user->id); - $tax_rate->name = $company->tax_data->regions->EU->subregions->ES->tax_name; - $tax_rate->rate = $company->tax_data->regions->EU->subregions->ES->tax_rate; - $tax_rate->save(); + // $tax_rate = TaxRateFactory::create($company->id, $user->id); + // $tax_rate->name = $company->tax_data->regions->EU->subregions->ES->tax_name; + // $tax_rate->rate = $company->tax_data->regions->EU->subregions->ES->tax_rate; + // $tax_rate->save(); return $company; @@ -191,17 +193,22 @@ class CreateCompany $company->save(); - $user = $company->account->users()->first(); + //$user = $company->account->users()->first(); + //user does not exist yet. + // MultiDB::setDb($company->db); + // $user = \App\Models\User::where('account_id', $company->account_id)->first(); - $tax_rate = TaxRateFactory::create($company->id, $user->id); - $tax_rate->name = $company->tax_data->regions->AU->subregions->AU->tax_name; - $tax_rate->rate = $company->tax_data->regions->AU->subregions->AU->tax_rate; - $tax_rate->save(); + + // $tax_rate = TaxRateFactory::create($company->id, $user->id); + // $tax_rate->name = $company->tax_data->regions->AU->subregions->AU->tax_name; + // $tax_rate->rate = $company->tax_data->regions->AU->subregions->AU->tax_rate; + // $tax_rate->save(); return $company; } catch(\Exception $e){ + nlog($e->getMessage()); nlog("SETUP: could not complete setup for Australian Locale"); }