diff --git a/app/Models/Company.php b/app/Models/Company.php index 15c9b94336e7..bf98f6b418ab 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -405,15 +405,21 @@ class Company extends BaseModel { $languages = Cache::get('languages'); + //build cache and reinit if (! $languages) { $this->buildCache(true); + $languages = Cache::get('languages'); } + //if the cache is still dead, get from DB + if(!$languages && property_exists($this->settings, 'language_id')) + return Language::find($this->settings->language_id); + return $languages->filter(function ($item) { return $item->id == $this->settings->language_id; })->first(); - // return Language::find($this->settings->language_id); + } public function getLocale() diff --git a/app/PaymentDrivers/GoCardless/DirectDebit.php b/app/PaymentDrivers/GoCardless/DirectDebit.php index 9204100b87a2..14ecbcc3e831 100644 --- a/app/PaymentDrivers/GoCardless/DirectDebit.php +++ b/app/PaymentDrivers/GoCardless/DirectDebit.php @@ -62,12 +62,12 @@ class DirectDebit implements MethodInterface 'session_token' => $session_token, ]), 'prefilled_customer' => [ - 'given_name' => auth()->guard('contact')->user()->first_name, - 'family_name' => auth()->guard('contact')->user()->last_name, - 'email' => auth()->guard('contact')->user()->email, - 'address_line1' => auth()->guard('contact')->user()->client->address1, - 'city' => auth()->guard('contact')->user()->client->city, - 'postal_code' => auth()->guard('contact')->user()->client->postal_code, + 'given_name' => auth()->guard('contact')->user()->first_name ?: '', + 'family_name' => auth()->guard('contact')->user()->last_name ?: '', + 'email' => auth()->guard('contact')->user()->email ?: '', + 'address_line1' => auth()->guard('contact')->user()->client->address1 ?: '', + 'city' => auth()->guard('contact')->user()->client->city ?: '', + 'postal_code' => auth()->guard('contact')->user()->client->postal_code ?: '', ], ], ]);