pr comments

fylein · Dec 16, 2024 · 244ac58 · 244ac58
1 parent 35712f1
commit 244ac58
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/src/app/core/models/common/advanced-settings.model.ts b/src/app/core/models/common/advanced-settings.model.ts
@@ -94,7 +94,7 @@ export class AdvancedSettingsModel {
       if (cccExportType && ['netsuite', 'quickbooks online', 'sage intacct'].includes(appName.toLowerCase()) && brandingConfig.brandId === 'fyle') {
         return defaultOptions;
       }
-      return defaultOptions.filter(option => option !== 'card_number');
+    return defaultOptions.filter(option => option !== 'card_number');
 
   }
 

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
@@ -102,7 +102,7 @@
                             </div>
                         </div>
 
-                        <div class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
+                        <div *ngIf="brandingConfig.brandId === 'fyle'" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
                             <form [formGroup]="employeeSettingForm">
                                 <app-configuration-select-field
                                     [form]="employeeSettingForm"

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
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
-import { Observable, Subject, debounceTime, filter, forkJoin } from 'rxjs';
+import { Observable, Subject, concat, debounceTime, filter, forkJoin } from 'rxjs';
 import { brandingConfig, brandingContent, brandingFeatureConfig, brandingKbArticles } from 'src/app/branding/branding-config';
 import { ExportSettingModel, ExportSettingOptionSearch } from 'src/app/core/models/common/export-settings.model';
 import { SelectFormOption } from 'src/app/core/models/common/select-form-option.model';
@@ -152,19 +152,25 @@ export class QboExportSettingsComponent implements OnInit {
       this.isSaveInProgress = true;
       const exportSettingPayload = QBOExportSettingModel.constructPayload(this.exportSettingForm);
       const employeeSettingPayload = QBOEmployeeSettingModel.constructPayload(this.employeeSettingForm);
-      forkJoin([
+
+      concat(
         this.employeeSettingService.postEmployeeSettings(employeeSettingPayload),
         this.exportSettingService.postExportSettings(exportSettingPayload)
-      ]).subscribe(() => {
-        this.isSaveInProgress = false;
-        this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Settings saved successfully');
-        if (this.isOnboarding) {
-          this.workspaceService.setOnboardingState(QBOOnboardingState.IMPORT_SETTINGS);
-          this.router.navigate(['/integrations/qbo/onboarding/import_settings']);
+      ).subscribe({
+        complete: () => {
+          this.isSaveInProgress = false;
+          this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Export Settings saved successfully');
+          if (this.isOnboarding) {
+            this.workspaceService.setOnboardingState(QBOOnboardingState.IMPORT_SETTINGS);
+            this.router.navigate([`/integrations/qbo/onboarding/import_settings`]);
+        } else if (this.isAdvancedSettingAffected()) {
+          this.router.navigate(['/integrations/qbo/main/configuration/advanced_settings']);
+          }
+        },
+        error: () => {
+          this.isSaveInProgress = false;
+          this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Error saving export settings, please try again later');
         }
-      }, () => {
-        this.isSaveInProgress = false;
-        this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Error saving settings, please try again later');
       });
     }
   }