Currency Separator

app/Http/Controllers/V1/Admin/Settings/GetCompanyCurrencyController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin\Settings;
+
+use App\Http\Controllers\Controller;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use Illuminate\Http\Request;
+
+class GetCompanyCurrencyController extends Controller
+{
+    /**
+     * Handle the incoming request.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function __invoke(Request $request)
+    {
+        $currency_id = CompanySetting::getSetting('currency', $request->header('company'));
+
+        $currency = Currency::find($currency_id);
+
+        return response()->json($currency);
+    }
+}

app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php

@@ -6,6 +6,7 @@
 use App\Http\Requests\UpdateSettingsRequest;
 use App\Models\Company;
 use App\Models\CompanySetting;
+use App\Models\Currency;
 use Illuminate\Support\Arr;
 
 class UpdateCompanySettingsController extends Controller
@@ -36,6 +37,14 @@ public function __invoke(UpdateSettingsRequest $request)
 
         CompanySetting::setSettings($data, $request->header('company'));
 
+        if (isset($data['currency_thousand_separator']) && isset($data['currency_decimal_separator'])) {
+            $currency = Currency::findOrFail($data['currency']);
+            $currency->update([
+                'thousand_separator' => $data['currency_thousand_separator'],
+                'decimal_separator' => $data['currency_decimal_separator'],
+            ]);
+        }
+
         return response()->json([
             'success' => true,
         ]);

resources/scripts/admin/stores/company.js

@@ -38,6 +38,20 @@ export const useCompanyStore = (useWindow = false) => {
         })
       },
 
+      fetchCompanyCurrency() {
+        return new Promise((resolve, reject) => {
+          axios
+            .get('/api/v1/company/currency')
+            .then((response) => {
+              resolve(response)
+            })
+            .catch((err) => {
+              handleError(err)
+              reject(err)
+            })
+        })
+      },
+
       updateCompany(data) {
         return new Promise((resolve, reject) => {
           axios
@@ -157,7 +171,7 @@ export const useCompanyStore = (useWindow = false) => {
                   message: global.t(message),
                 })
               }
-
+              
               resolve(response)
             })
             .catch((err) => {

resources/scripts/admin/views/settings/PreferencesSetting.vue

@@ -46,6 +46,34 @@
           />
         </BaseInputGroup>
 
+        <BaseInputGroup
+          :content-loading="isFetchingInitialData"
+          :label="$t('settings.currencies.thousand_separator')"
+          :error="v$.language.$error && v$.language.$errors[0].$message"
+          required
+        >
+          <BaseInput
+          :content-loading="isFetchingInitialData"
+            v-model="settingsForm.currency_thousand_separator"
+            class="w-full"
+            :invalid="v$.currency_thousand_separator.$error"
+          />
+        </BaseInputGroup>
+
+        <BaseInputGroup
+          :content-loading="isFetchingInitialData"
+          :label="$t('settings.currencies.decimal_separator')"
+          :error="v$.language.$error && v$.language.$errors[0].$message"
+          required
+        >
+          <BaseInput
+            :content-loading="isFetchingInitialData"
+            v-model="settingsForm.currency_decimal_separator"
+            class="w-full"
+            :invalid="v$.currency_decimal_separator.$error"
+          />
+        </BaseInputGroup>
+
         <BaseInputGroup
           :label="$t('settings.preferences.time_zone')"
           :content-loading="isFetchingInitialData"
@@ -262,6 +290,12 @@ const rules = computed(() => {
     currency: {
       required: helpers.withMessage(t('validation.required'), required),
     },
+    currency_thousand_separator: {
+      //required: helpers.withMessage(t('validation.required'), required),
+    },
+    currency_decimal_separator: {
+      required: helpers.withMessage(t('validation.required'), required),
+    },
     language: {
       required: helpers.withMessage(t('validation.required'), required),
     },
@@ -293,11 +327,22 @@ async function setInitialData() {
     globalStore.fetchCurrencies(),
     globalStore.fetchDateFormats(),
     globalStore.fetchTimeZones(),
+    fetchCurrencyData()
   ]).then(([res1]) => {
     isFetchingInitialData.value = false
   })
 }
 
+async function fetchCurrencyData() {
+  try {
+    const response = await companyStore.fetchCompanyCurrency()
+    settingsForm.currency_thousand_separator = response.data.thousand_separator
+    settingsForm.currency_decimal_separator = response.data.decimal_separator
+  } catch (error) {
+    console.error('Error fetching currency data:', error)
+  }
+}
+
 async function updatePreferencesData() {
   v$.value.$touch()
   if (v$.value.$invalid) {
@@ -327,8 +372,9 @@ async function submitData() {
     data: {
       settings: {
         link_expiry_days: settingsForm.link_expiry_days,
-        automatically_expire_public_links:
-          settingsForm.automatically_expire_public_links,
+        automatically_expire_public_links: settingsForm.automatically_expire_public_links,
+        currency_thousand_separator: settingsForm.currency.thousand_separator,
+        currency_decimal_separator: settingsForm.currency.decimal_separator,
       },
     },
     message: 'settings.preferences.updated_message',

routes/api.php

@@ -70,6 +70,7 @@
 use App\Http\Controllers\V1\Admin\Settings\CompanyController;
 use App\Http\Controllers\V1\Admin\Settings\CompanyCurrencyCheckTransactionsController;
 use App\Http\Controllers\V1\Admin\Settings\DiskController;
+use App\Http\Controllers\V1\Admin\Settings\GetCompanyCurrencyController;
 use App\Http\Controllers\V1\Admin\Settings\GetCompanyMailConfigurationController;
 use App\Http\Controllers\V1\Admin\Settings\GetCompanySettingsController;
 use App\Http\Controllers\V1\Admin\Settings\GetSettingsController;
@@ -372,6 +373,8 @@
 
             Route::get('/company/settings', GetCompanySettingsController::class);
 
+            Route::get('/company/currency', GetCompanyCurrencyController::class);
+
             Route::post('/company/settings', UpdateCompanySettingsController::class);
 
             Route::get('/settings', GetSettingsController::class);