fix conflict

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

@@ -6,6 +6,7 @@
 use Crater\Http\Requests\UpdateSettingsRequest;
 use Crater\Models\Company;
 use Crater\Models\CompanySetting;
+use Illuminate\Support\Arr;
 
 class UpdateCompanySettingsController extends Controller
 {
@@ -20,16 +21,17 @@ public function __invoke(UpdateSettingsRequest $request)
         $company = Company::find($request->header('company'));
         $this->authorize('manage company', $company);
 
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
         $data = $request->settings;
 
-        if (array_key_exists('currency', $data)) {
-            if ($companyCurrency !== $data['currency'] && $company->hasTransactions()) {
-                return response()->json([
-                    'success' => false,
-                    'message' => 'Cannot update company currency after transactions are created.'
-                ]);
-            }
+        if (
+            Arr::exists($data, 'currency') &&
+            (CompanySetting::getSetting('currency', $company->id) !== $data['currency']) &&
+            $company->hasTransactions()
+        ) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Cannot update company currency after transactions are created.'
+            ]);
         }
 
         CompanySetting::setSettings($data, $request->header('company'));

app/Models/Invoice.php

@@ -498,7 +498,7 @@ public static function createItems($invoice, $invoiceItems)
             if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
                 foreach ($invoiceItem['taxes'] as $tax) {
                     $tax['company_id'] = $invoice->company_id;
-                    $tax['exchnage_rate'] = $invoice->exchange_rate;
+                    $tax['exchange_rate'] = $invoice->exchange_rate;
                     $tax['base_amount'] = $tax['amount'] * $exchange_rate;
                     $tax['currency_id'] = $invoice->currency_id;
 
@@ -524,7 +524,7 @@ public static function createTaxes($invoice, $taxes)
 
         foreach ($taxes as $tax) {
             $tax['company_id'] = $invoice->company_id;
-            $tax['exchnage_rate'] = $invoice->exchange_rate;
+            $tax['exchange_rate'] = $invoice->exchange_rate;
             $tax['base_amount'] = $tax['amount'] * $exchange_rate;
             $tax['currency_id'] = $invoice->currency_id;
 

resources/scripts/admin/components/modal-components/BackupModal.vue

@@ -51,7 +51,7 @@
               label="name"
               value-prop="id"
               :placeholder="$t('settings.disk.select_disk')"
-              track-by="id"
+              track-by="name"
               object
             />
           </BaseInputGroup>

resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue

@@ -38,6 +38,7 @@
               label="key"
               :searchable="true"
               :invalid="v$.currentExchangeRate.driver.$error"
+              track-by="key"
               @update:modelValue="resetCurrency"
               @input="v$.currentExchangeRate.driver.$touch()"
             />
@@ -60,6 +61,7 @@
               :options="serverOptions"
               :invalid="v$.currencyConverter.type.$error"
               label="value"
+              track-by="value"
               @update:modelValue="resetCurrency"
             />
           </BaseInputGroup>
@@ -104,8 +106,8 @@
               :invalid="v$.currentExchangeRate.currencies.$error"
               label="code"
               track-by="code"
+              open-direction="top"
               @input="v$.currentExchangeRate.currencies.$touch()"
-              openDirection="top"
             />
           </BaseInputGroup>
           <!--  For Currency Converter  -->

resources/scripts/admin/components/modal-components/ItemModal.vue

@@ -50,7 +50,7 @@
                 :can-clear="false"
                 :placeholder="$t('items.select_a_unit')"
                 searchable
-                track-by="id"
+                track-by="name"
               />
             </BaseInputGroup>
 
@@ -61,13 +61,14 @@
               <BaseMultiselect
                 v-model="taxes"
                 :options="getTaxTypes"
-                label="name"
+                mode="tags"
+                label="tax_name"
                 value-prop="id"
                 class="w-full"
                 :can-deselect="false"
                 :can-clear="false"
                 searchable
-                track-by="id"
+                track-by="tax_name"
                 object
               />
             </BaseInputGroup>

resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue

@@ -35,6 +35,7 @@
             searchable
             label="name"
             :can-deselect="false"
+            track-by="name"
             @update:modelValue="onChangeDriver(data)"
           />
         </BaseInputGroup>

resources/scripts/admin/views/installation/Step8CompanyPreferences.vue

@@ -48,7 +48,7 @@
               value-prop="code"
               :placeholder="$tc('settings.preferences.select_language')"
               class="w-full"
-              track-by="code"
+              track-by="name"
               :searchable="true"
               :invalid="v$.currentPreferences.language.$error"
             />
@@ -95,7 +95,7 @@
               label="key"
               value-prop="value"
               :placeholder="$tc('settings.preferences.select_time_zone')"
-              track-by="value"
+              track-by="key"
               :searchable="true"
               :invalid="v$.currentPreferences.time_zone.$error"
             />

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

@@ -75,7 +75,7 @@
             :options="globalStore.config.languages"
             label="name"
             value-prop="code"
-            track-by="code"
+            track-by="name"
             open-direction="top"
           />
         </BaseInputGroup>

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

@@ -23,7 +23,7 @@
           v-model="filters.selected_disk"
           :content-loading="isFetchingInitialData"
           :options="getDisksOptions"
-          track-by="id"
+          track-by="name"
           :placeholder="$t('settings.disk.select_disk')"
           label="name"
           :searchable="true"

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

@@ -40,7 +40,7 @@
             label="name"
             value-prop="code"
             class="w-full"
-            track-by="code"
+            track-by="name"
             :searchable="true"
             :invalid="v$.language.$error"
           />
@@ -79,7 +79,7 @@
             :options="globalStore.dateFormats"
             label="display_date"
             value-prop="carbon_format_value"
-            track-by="carbon_format_value"
+            track-by="display_date"
             searchable
             :invalid="v$.carbon_date_format.$error"
             class="w-full"

resources/scripts/admin/views/users/Create.vue

@@ -70,6 +70,7 @@
                 searchable
                 :can-deselect="false"
                 class="w-full"
+                track-by="name"
               />
             </BaseInputGroup>
 

resources/scripts/components/base/BaseItemSelect.vue

@@ -30,7 +30,7 @@
       v-model="itemSelect"
       :content-loading="contentLoading"
       value-prop="id"
-      track-by="id"
+      track-by="name"
       :invalid="invalid"
       preserve-search
       :initial-search="itemData.name"

resources/scripts/components/notifications/NotificationItem.vue

@@ -83,7 +83,7 @@
                   ? notification.message
                   : success
                   ? 'Successful'
-                  : 'Somthing went wrong'
+                  : 'Something went wrong'
               }}
             </p>
           </div>

resources/scripts/locales/ar.json

@@ -526,6 +526,7 @@
     "cloned_successfully": "Recurring Invoice cloned successfully",
     "clone_invoice": "Clone Recurring Invoice",
     "confirm_clone": "This recurring invoice will be cloned into a new Recurring Invoice",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
     "item": {
       "title": "Item Title",
       "description": "Description",

resources/scripts/locales/cs.json

@@ -526,6 +526,7 @@
     "cloned_successfully": "Opakující se faktura úspěšně naklonována",
     "clone_invoice": "Naklonovat opakující se fakturu",
     "confirm_clone": "Tato opakující se faktura bude naklonována do nové opakující se faktury",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
     "item": {
       "title": "Název položky",
       "description": "Popis",

resources/scripts/locales/de.json

@@ -526,6 +526,7 @@
     "cloned_successfully": "Serienrechnung erfolgreich kopiert",
     "clone_invoice": "Serienrechnung kopieren",
     "confirm_clone": "Diese Serienrechnung wird in eine neue Serienrechnung kopiert",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
     "item": {
       "title": "Titel des Artikels",
       "description": "Beschreibung",

resources/scripts/locales/el.json

@@ -526,6 +526,7 @@
     "cloned_successfully": "Επαναλαμβανόμενο τιμολόγιο κλωνοποιήθηκε επιτυχής",
     "clone_invoice": "Δημιουργία Επαναλαμβανόμενου Τιμολογίου",
     "confirm_clone": "Αυτό το επαναλαμβανόμενο τιμολόγιο θα κλωνοποιηθεί σε ένα νέο επαναλαμβανόμενο τιμολόγιο",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
     "item": {
       "title": "Τίτλος Προϊόντος",
       "description": "Περιγραφή",

resources/scripts/locales/es.json

@@ -526,6 +526,7 @@
     "cloned_successfully": "Factura recurrente clonada con éxito",
     "clone_invoice": "Clonar factura recurrente",
     "confirm_clone": "Esta factura recurrente será clonada en una nueva factura recurrente",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
     "item": {
       "title": "Título del artículo",
       "description": "Descripción",

resources/scripts/locales/fa.json

@@ -526,6 +526,7 @@
     "cloned_successfully": "Recurring Invoice cloned successfully",
     "clone_invoice": "Clone Recurring Invoice",
     "confirm_clone": "This recurring invoice will be cloned into a new Recurring Invoice",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
     "item": {
       "title": "Item Title",
       "description": "Description",