diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index b806f69675cd..5a191d928eae 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -201,6 +201,14 @@ class LoginController extends BaseController ->header('X-Api-Version', config('ninja.minimum_client_version')); } + /* If for some reason we lose state on the default company ie. a company is deleted - always make sure we can default to a company*/ + if(!$user->account->default_company){ + $account = $user->account; + $account->default_company_id = $user->companies->first()->id; + $account->save(); + $user = $user->fresh(); + } + $user->setCompany($user->account->default_company); $this->setLoginCache($user); diff --git a/database/migrations/2021_06_24_095942_payments_table_currency_nullable.php b/database/migrations/2021_06_24_095942_payments_table_currency_nullable.php new file mode 100644 index 000000000000..02381a29c181 --- /dev/null +++ b/database/migrations/2021_06_24_095942_payments_table_currency_nullable.php @@ -0,0 +1,32 @@ +unsignedInteger('exchange_currency_id')->nullable()->change(); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}