mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-16 09:44:06 +00:00
Fix customer portal not reflecting company default currency
The customer portal bootstrap now returns current_company_currency alongside the customer's own currency. The store falls back to the company currency when the customer has no currency assigned. Fixes #142
This commit is contained in:
@@ -31,10 +31,13 @@ class BootstrapController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
$companyCurrencyId = CompanySetting::getSetting('currency', $customer->company_id);
|
||||
|
||||
return (new CustomerResource($customer))
|
||||
->additional(['meta' => [
|
||||
'menu' => $menu,
|
||||
'current_customer_currency' => Currency::find($customer->currency_id),
|
||||
'current_company_currency' => $companyCurrencyId ? Currency::find($companyCurrencyId) : null,
|
||||
'modules' => Module::where('enabled', true)->pluck('name'),
|
||||
'current_company_language' => CompanySetting::getSetting('language', $customer->company_id),
|
||||
]]);
|
||||
|
||||
@@ -77,6 +77,7 @@ export interface CustomerPortalBootstrapMeta {
|
||||
menu: CustomerPortalMenuItem[]
|
||||
modules: string[]
|
||||
current_customer_currency?: Currency | null
|
||||
current_company_currency?: Currency | null
|
||||
current_company_language?: string
|
||||
}
|
||||
|
||||
@@ -280,7 +281,7 @@ export const useCustomerPortalStore = defineStore('customerPortal', {
|
||||
|
||||
this.currentUser = data.data
|
||||
this.mainMenu = data.meta.menu ?? []
|
||||
this.currency = data.data.currency ?? data.meta.current_customer_currency ?? null
|
||||
this.currency = data.data.currency ?? data.meta.current_customer_currency ?? data.meta.current_company_currency ?? null
|
||||
this.enabledModules = data.meta.modules ?? []
|
||||
this.currentCompanyLanguage = data.meta.current_company_language ?? 'en'
|
||||
this.userForm = hydrateUserForm(data.data)
|
||||
|
||||
Reference in New Issue
Block a user