From 03bc2817635714f18b79ed0ce17b58152a2109a8 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 28 Jul 2025 18:01:36 +0530 Subject: [PATCH] fix: fixed labels (cherry picked from commit 4c7a40d8bc882110784dff7a8db63a44fbd9d243) # Conflicts: # frontend/src/components/Settings/General/CurrencySettings.vue # frontend/src/components/Settings/General/GeneralSettings.vue --- .../Settings/General/CurrencySettings.vue | 197 ++++++++++++++++++ .../Settings/General/GeneralSettings.vue | 9 + 2 files changed, 206 insertions(+) create mode 100644 frontend/src/components/Settings/General/CurrencySettings.vue diff --git a/frontend/src/components/Settings/General/CurrencySettings.vue b/frontend/src/components/Settings/General/CurrencySettings.vue new file mode 100644 index 00000000..69d6ec88 --- /dev/null +++ b/frontend/src/components/Settings/General/CurrencySettings.vue @@ -0,0 +1,197 @@ + + diff --git a/frontend/src/components/Settings/General/GeneralSettings.vue b/frontend/src/components/Settings/General/GeneralSettings.vue index 29523d5c..0c35e65b 100644 --- a/frontend/src/components/Settings/General/GeneralSettings.vue +++ b/frontend/src/components/Settings/General/GeneralSettings.vue @@ -105,6 +105,15 @@ const { $dialog } = globalStore() const settingsList = [ { +<<<<<<< HEAD +======= + name: 'currency-settings', + label: 'Currency & Exchange rate provider', + description: + 'Configure the currency and exchange rate provider for your CRM', + }, + { +>>>>>>> 4c7a40d8 (fix: fixed labels) name: 'brand-settings', label: 'Brand settings', description: 'Configure your brand name, logo and favicon',