export settingd group bug fix (#783)

* export settingd group bug fix * export settingd group bug fix * pr comment --------- Co-authored-by: anishfyle <[email protected]>
fylein · May 10, 2024 · 94b0a3d · 94b0a3d
1 parent 3f2963a
commit 94b0a3d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/app/core/models/common/helper.model.ts b/src/app/core/models/common/helper.model.ts
@@ -9,7 +9,7 @@ export class HelperUtility {
         form.controls[controllerName].clearValidators();
 
         // Temporary hack: Don't reset value for fields that are used in reimbursable + ccc section
-        if (controllerName !== 'accountsPayable' && controllerName !== 'defaultCCCAccount') {
+        if (controllerName !== 'accountsPayable' && controllerName !== 'defaultCCCAccount' ) {
             form.controls[controllerName].setValue(null);
         }
     }

diff --git a/...l-shared/business-central-export-settings/business-central-export-settings.component.html b/...l-shared/business-central-export-settings/business-central-export-settings.component.html
@@ -125,7 +125,7 @@
                             [formControllerName]="'reimbursableExpenseState'">
                         </app-configuration-select-field>
                     </div>
-                    <div *ngIf="exportSettingForm.value.reimbursableExportType && exportSettingForm.value.reimbursableExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
+                    <div *ngIf="exportSettingForm.value.reimbursableExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
                         <app-configuration-select-field
                             [form]="exportSettingForm"
                             [isFieldMandatory]="true"
@@ -247,7 +247,7 @@
                             [formControllerName]="'cccExpenseState'">
                         </app-configuration-select-field>
                     </div>
-                    <div *ngIf="exportSettingForm.value.cccExportType && exportSettingForm.value.cccExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
+                    <div *ngIf="exportSettingForm.value.cccExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
                         <app-configuration-select-field
                             [form]="exportSettingForm"
                             [isFieldMandatory]="true"

diff --git a/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html b/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html
@@ -111,7 +111,7 @@
                         [placeholder]="'Select expense grouping'"
                         [formControllerName]="'reimbursableExportGroup'"></app-configuration-select-field>
                     </div>
-                    <div *ngIf="exportSettingsForm.value.reimbursableExportType && exportSettingsForm.value.reimbursableExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
+                    <div *ngIf="exportSettingsForm.value.reimbursableExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
                         <app-configuration-select-field
                         [form]="exportSettingsForm"
                         [isFieldMandatory]="true"
@@ -249,7 +249,7 @@
                         [placeholder]="'Select expense grouping'"
                         [formControllerName]="'cccExportGroup'"></app-configuration-select-field>
                     </div>
-                    <div *ngIf="exportSettingsForm.value.cccExportType && exportSettingsForm.value.cccExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
+                    <div *ngIf="exportSettingsForm.value.cccExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
                         <app-configuration-select-field
                         [form]="exportSettingsForm"
                         [isFieldMandatory]="true"

diff --git a/...netsuite/netsuite-shared/netsuite-export-settings/netsuite-export-settings.component.html b/...netsuite/netsuite-shared/netsuite-export-settings/netsuite-export-settings.component.html
@@ -121,7 +121,7 @@
                             </app-configuration-select-field>
                         </div>
 
-                        <div *ngIf="exportSettingForm.value.reimbursableExportType && exportSettingForm.value.reimbursableExportGroup"
+                        <div *ngIf="exportSettingForm.value.reimbursableExportType"
                             class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
                             <app-configuration-select-field
                                 [form]="exportSettingForm"
@@ -243,7 +243,7 @@
                         </app-configuration-select-field>
                     </div>
 
-                    <div *ngIf="exportSettingForm.value.creditCardExportType && exportSettingForm.value.creditCardExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
+                    <div *ngIf="exportSettingForm.value.creditCardExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
                         <app-configuration-select-field
                             [form]="exportSettingForm"
                             [isFieldMandatory]="true"

diff --git a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.html b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.html
@@ -116,7 +116,7 @@
                             </app-configuration-select-field>
                         </div>
 
-                        <div *ngIf="exportSettingForm.value.reimbursableExportType && exportSettingForm.value.reimbursableExportGroup"
+                        <div *ngIf="exportSettingForm.value.reimbursableExportType"
                             class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
                             <app-configuration-select-field
                                 [form]="exportSettingForm"
@@ -263,7 +263,7 @@
                         </app-configuration-select-field>
                     </div>
 
-                    <div *ngIf="exportSettingForm.value.creditCardExportType && exportSettingForm.value.creditCardExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
+                    <div *ngIf="exportSettingForm.value.creditCardExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
                         <app-configuration-select-field
                             [form]="exportSettingForm"
                             [isFieldMandatory]="true"

diff --git a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
@@ -322,10 +322,10 @@ export class QboExportSettingsComponent implements OnInit {
         this.helperService.setOrClearValidators(this.exportSettings.workspace_general_settings.corporate_credit_card_expenses_object, exportSettingValidatorRule.creditCardExpense, this.exportSettingForm);
       }
 
-      this.exportSettingService.setExportTypeValidatorsAndWatchers(exportModuleRule, this.exportSettingForm);
-
       this.setupCustomWatchers();
 
+      this.exportSettingService.setExportTypeValidatorsAndWatchers(exportModuleRule, this.exportSettingForm);
+
       this.isLoading = false;
     });
   }

diff --git a/...ons/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.html b/...ons/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.html
@@ -110,7 +110,7 @@
                             [exportTypeIconPathArray]="previewExpenseGroupTypeImagePath">
                         </app-configuration-select-field>
                     </div>
-                    <div *ngIf="exportSettingForm.value.reimbursableExportType && exportSettingForm.value.reimbursableExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
+                    <div *ngIf="exportSettingForm.value.reimbursableExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
                         <app-configuration-select-field
                         [form]="exportSettingForm"
                         [isFieldMandatory]="true"
@@ -238,7 +238,7 @@
                             [exportTypeIconPathArray]="previewExpenseGroupTypeImagePath">
                         </app-configuration-select-field>
                     </div>
-                    <div *ngIf="exportSettingForm.value.cccExportType && exportSettingForm.value.cccExportGroup" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
+                    <div *ngIf="exportSettingForm.value.cccExportType" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
                         <app-configuration-select-field
                         [form]="exportSettingForm"
                         [isFieldMandatory]="true"