fix: Fix Xero clone settings save() (#1200)

* fix: Clone settings CCC date options

* fixes

Author: ashwin1111

src/app/core/models/xero/xero-configuration/clone-setting.model.ts

@@ -20,15 +20,9 @@ export type XeroCloneSettingPost = {
 
 export class XeroCloneSettingModel {
     static constructPayload(exportSettingForm: FormGroup, importSettingForm: FormGroup, advancedSettingForm: FormGroup, isTaxGroupSyncAllowed: boolean): XeroCloneSettingPost {
-        const exportSettingPayload = XeroExportSettingModel.constructPayload(exportSettingForm);
-        const importSettingPayload = XeroImportSettingModel.constructPayload(importSettingForm);
-        const advancedSettingPayload = XeroAdvancedSettingModel.constructPayload(advancedSettingForm);
-
-        // Set the bank_account in the payload to the selected field value without formatting it
-        // Since we format them on component init (clone settings only)
-        exportSettingPayload.general_mappings.bank_account = exportSettingForm.get('bankAccount')?.value;
-        importSettingPayload.general_mappings.default_tax_code = importSettingForm.get('defaultTaxCode')?.value;
-        advancedSettingPayload.general_mappings.payment_account = advancedSettingForm.get('billPaymentAccount')?.value;
+        const exportSettingPayload = XeroExportSettingModel.constructPayload(exportSettingForm, true);
+        const importSettingPayload = XeroImportSettingModel.constructPayload(importSettingForm, true);
+        const advancedSettingPayload = XeroAdvancedSettingModel.constructPayload(advancedSettingForm, true);
 
         if (!isTaxGroupSyncAllowed) {
             importSettingPayload.workspace_general_settings.import_tax_codes = false;

src/app/core/models/xero/xero-configuration/xero-advanced-settings.model.ts

@@ -121,8 +121,16 @@ export class XeroAdvancedSettingModel extends HelperUtility{
     });
   }
 
-  static constructPayload(advancedSettingsForm: FormGroup): XeroAdvancedSettingPost {
-    const emptyDestinationAttribute = {id: null, name: null};
+  static constructPayload(advancedSettingsForm: FormGroup, isCloneSettings: boolean = false): XeroAdvancedSettingPost {
+    const emptyDestinationAttribute: DefaultDestinationAttribute = {id: null, name: null};
+    let paymentAccount = {...emptyDestinationAttribute};
+    if (advancedSettingsForm.get('billPaymentAccount')?.value) {
+      if (isCloneSettings) {
+        paymentAccount = advancedSettingsForm.get('billPaymentAccount')?.value;
+      } else {
+        paymentAccount = ExportSettingModel.formatGeneralMappingPayload(advancedSettingsForm.get('billPaymentAccount')?.value);
+      }
+    }
     const advancedSettingPayload: XeroAdvancedSettingPost = {
       workspace_general_settings: {
         sync_fyle_to_xero_payments: advancedSettingsForm.get('paymentSync')?.value && advancedSettingsForm.get('paymentSync')?.value === PaymentSyncDirection.FYLE_TO_XERO ? true : false,
@@ -133,7 +141,7 @@ export class XeroAdvancedSettingModel extends HelperUtility{
         memo_structure: advancedSettingsForm.get('memoStructure')?.value
       },
       general_mappings: {
-        payment_account: advancedSettingsForm.get('billPaymentAccount')?.value ? ExportSettingModel.formatGeneralMappingPayload(advancedSettingsForm.get('billPaymentAccount')?.value) : emptyDestinationAttribute
+        payment_account: paymentAccount
       },
       workspace_schedules: {
         enabled: advancedSettingsForm.get('exportSchedule')?.value ? true : false,

src/app/core/models/xero/xero-configuration/xero-export-settings.model.ts

@@ -224,8 +224,19 @@ export class XeroExportSettingModel {
     });
   }
 
-  static constructPayload(exportSettingsForm: FormGroup): XeroExportSettingPost {
-    const emptyDestinationAttribute = {id: null, name: null};
+  static constructPayload(exportSettingsForm: FormGroup, isCloneSettings: boolean = false): XeroExportSettingPost {
+    const emptyDestinationAttribute: DefaultDestinationAttribute = {id: null, name: null};
+
+    let bankAccount = {...emptyDestinationAttribute};
+
+    if (exportSettingsForm.get('bankAccount')?.value) {
+      if (isCloneSettings) {
+        bankAccount = exportSettingsForm.get('bankAccount')?.value;
+      } else {
+        bankAccount = ExportSettingModel.formatGeneralMappingPayload(exportSettingsForm.get('bankAccount')?.value);
+      }
+    }
+
     const exportSettingPayload: XeroExportSettingPost = {
       expense_group_settings: {
         reimbursable_expense_state: exportSettingsForm.get('expenseState')?.value,
@@ -240,7 +251,7 @@ export class XeroExportSettingModel {
         auto_map_employees: exportSettingsForm.get('autoMapEmployees')?.value
       },
       general_mappings: {
-        bank_account: exportSettingsForm.get('bankAccount')?.value ? ExportSettingModel.formatGeneralMappingPayload(exportSettingsForm.get('bankAccount')?.value) : emptyDestinationAttribute
+        bank_account: bankAccount
       }
     };
 

src/app/core/models/xero/xero-configuration/xero-import-settings.model.ts

@@ -89,13 +89,21 @@ export class XeroImportSettingModel extends ImportSettingsModel {
     });
   }
 
-  static constructPayload(importSettingsForm: FormGroup): XeroImportSettingPost {
+  static constructPayload(importSettingsForm: FormGroup, isCloneSettings: boolean = false): XeroImportSettingPost {
 
-    const emptyDestinationAttribute = {id: null, name: null};
+    const emptyDestinationAttribute: DefaultDestinationAttribute = {id: null, name: null};
     const COA = importSettingsForm.get('chartOfAccountTypes')?.value.map((name: string) => name.toUpperCase());
     const expenseFieldArray = importSettingsForm.getRawValue().expenseFields.filter(((data:any) => data.destination_field !== XeroFyleField.CUSTOMER));
     const mappingSettings = this.constructMappingSettingPayload(expenseFieldArray);
 
+    let defaultTaxCode = {...emptyDestinationAttribute};
+    if (importSettingsForm.get('defaultTaxCode')?.value) {
+      if (isCloneSettings) {
+        defaultTaxCode = importSettingsForm.get('defaultTaxCode')?.value;
+      } else {
+        defaultTaxCode = ExportSettingModel.formatGeneralMappingPayload(importSettingsForm.get('defaultTaxCode')?.value);
+      }
+    }
     const importSettingPayload: XeroImportSettingPost = {
       workspace_general_settings: {
         import_categories: importSettingsForm.get('importCategories')?.value ?? false,
@@ -105,7 +113,7 @@ export class XeroImportSettingModel extends ImportSettingsModel {
         import_customers: importSettingsForm.get('importCustomers')?.value ? importSettingsForm.get('importCustomers')?.value : false
       },
       general_mappings: {
-        default_tax_code: importSettingsForm.get('defaultTaxCode')?.value ? ExportSettingModel.formatGeneralMappingPayload(importSettingsForm.get('defaultTaxCode')?.value) : emptyDestinationAttribute
+        default_tax_code: defaultTaxCode
       },
       mapping_settings: mappingSettings
     };

src/app/integrations/qbo/qbo-onboarding/qbo-clone-settings/qbo-clone-settings.component.html

@@ -233,7 +233,7 @@
                 <app-clone-setting-field
                     [iconSource]="'question-square-outline'"
                     [label]="'At which state should the expenses be ready to export from ' + brandingConfig.brandName + '?'"
-                    [options]="expenseStateOptions"
+                    [options]="cccExpenseStateOptions"
                     [placeholder]="'Select CCC expense state'"
                     [form]="exportSettingForm"
                     [isFieldMandatory]="true"

src/app/integrations/xero/xero-onboarding/xero-clone-settings/xero-clone-settings.component.html

@@ -140,7 +140,7 @@
                     <app-clone-setting-field
                         [iconSource]="'question-square-outline'"
                         [label]="'At which state should the expenses be ready to export from ' + brandingConfig.brandName + '?'"
-                        [options]="expenseStateOptions"
+                        [options]="cccExpenseStateOptions"
                         [placeholder]="'Select CCC expense state'"
                         [form]="exportSettingForm"
                         [isFieldMandatory]="true"