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

Fixes for language init

Browse Source
This commit is contained in:
David Bomba 2022-08-11 09:34:13 +10:00
parent 7994bf5574
commit e0e702d87f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Company.php
View File

@ -405,15 +405,21 @@ class Company extends BaseModel
{ {
$languages = Cache::get('languages'); $languages = Cache::get('languages');
//build cache and reinit
if (! $languages) { if (! $languages) {
$this->buildCache(true); $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 $languages->filter(function ($item) {
return $item->id == $this->settings->language_id; return $item->id == $this->settings->language_id;
})->first(); })->first();
// return Language::find($this->settings->language_id);
} }
public function getLocale() public function getLocale()

12
app/PaymentDrivers/GoCardless/DirectDebit.php
View File

@ -62,12 +62,12 @@ class DirectDebit implements MethodInterface
'session_token' => $session_token, 'session_token' => $session_token,
]), ]),
'prefilled_customer' => [ 'prefilled_customer' => [
'given_name' => auth()->guard('contact')->user()->first_name, 'given_name' => auth()->guard('contact')->user()->first_name ?: '',
'family_name' => auth()->guard('contact')->user()->last_name, 'family_name' => auth()->guard('contact')->user()->last_name ?: '',
'email' => auth()->guard('contact')->user()->email, 'email' => auth()->guard('contact')->user()->email ?: '',
'address_line1' => auth()->guard('contact')->user()->client->address1, 'address_line1' => auth()->guard('contact')->user()->client->address1 ?: '',
'city' => auth()->guard('contact')->user()->client->city, 'city' => auth()->guard('contact')->user()->client->city ?: '',
'postal_code' => auth()->guard('contact')->user()->client->postal_code, 'postal_code' => auth()->guard('contact')->user()->client->postal_code ?: '',
], ],
], ],
]); ]);