PR commit fix

fylein · Feb 14, 2025 · bee5bde · bee5bde
1 parent 21fe4a9
commit bee5bde
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 33 deletions.
diff --git a/src/app/branding/c1-branding-config.ts b/src/app/branding/c1-branding-config.ts
@@ -18,8 +18,6 @@ export const c1FeatureConfig: FeatureConfiguration[string] = {
     featureFlags: {
         cloneSettings: false,
         mapEmployees: false,
-        c1Icon: true,
-        c1Options: true,
         allowForC1: true,
         showOptionalTextInsteadOfAsterisk: true,
         useCustomIcon: true,
@@ -29,14 +27,9 @@ export const c1FeatureConfig: FeatureConfiguration[string] = {
             nameInJournalEntry: false,
             useMerchantInJournalLine: false,
             splitExpenseGrouping: false,
-            cccDateConfiguration: true,
             isEmployeeMappingFixed: true,
             transformContentToSentenceCase: true,
-            cccExportGroupConfiguration: true,
-            lowerCaseConversion: true,
-            allowAccountsPayableInCoCCC: true,
-            allowBankAccountInCoCCC: true,
-            isReimbursableExpensesAllowed: true
+            isReimbursableExpensesAllowed: false
         },
         importSettings: {
             tax: false,
@@ -48,7 +41,6 @@ export const c1FeatureConfig: FeatureConfiguration[string] = {
             dependentField: true,
             allowImportCode: false,
             importSettingsV1: false,
-            intacctC1ImportSettings: true,
             disableCustomerSourceField: true
         },
         advancedSettings: {

diff --git a/src/app/branding/fyle-branding-config.ts b/src/app/branding/fyle-branding-config.ts
@@ -18,8 +18,6 @@ export const fyleFeatureConfig: FeatureConfiguration[string] = {
     featureFlags: {
         cloneSettings: true,
         mapEmployees: true,
-        c1Icon: false,
-        c1Options: false,
         allowForC1: false,
         showOptionalTextInsteadOfAsterisk: false,
         useCustomIcon: false,
@@ -29,14 +27,9 @@ export const fyleFeatureConfig: FeatureConfiguration[string] = {
             nameInJournalEntry: true,
             useMerchantInJournalLine: true,
             splitExpenseGrouping: true,
-            cccDateConfiguration: true,
             isEmployeeMappingFixed: false,
             transformContentToSentenceCase: false,
-            cccExportGroupConfiguration: false,
-            lowerCaseConversion: false,
-            allowAccountsPayableInCoCCC: false,
-            allowBankAccountInCoCCC: false,
-            isReimbursableExpensesAllowed: false
+            isReimbursableExpensesAllowed: true
         },
         importSettings: {
             tax: true,
@@ -48,7 +41,6 @@ export const fyleFeatureConfig: FeatureConfiguration[string] = {
             dependentField: true,
             allowImportCode: true,
             importSettingsV1: true,
-            intacctC1ImportSettings: false,
             disableCustomerSourceField: false
         },
         advancedSettings: {

diff --git a/src/app/core/models/branding/feature-configuration.model.ts b/src/app/core/models/branding/feature-configuration.model.ts
@@ -12,9 +12,7 @@ export type FeatureConfiguration = {
             showOptionalTextInsteadOfAsterisk: boolean;
             cloneSettings: boolean;
             mapEmployees: boolean;
-            c1Icon: boolean;
             useCustomIcon: boolean;
-            c1Options: boolean;
             allowForC1: boolean;
             displayAppLogoInDashboard: boolean;
             exportSettings: {
@@ -23,13 +21,8 @@ export type FeatureConfiguration = {
                 nameInJournalEntry: boolean;
                 useMerchantInJournalLine: boolean;
                 splitExpenseGrouping: boolean;
-                cccDateConfiguration: boolean;
-                cccExportGroupConfiguration: boolean;
                 isEmployeeMappingFixed: boolean;
                 transformContentToSentenceCase: boolean;
-                lowerCaseConversion: boolean;
-                allowAccountsPayableInCoCCC: boolean;
-                allowBankAccountInCoCCC: boolean;
             },
             importSettings: {
                 tax: boolean;
@@ -41,7 +34,6 @@ export type FeatureConfiguration = {
                 dependentField: boolean;
                 allowImportCode: boolean;
                 importSettingsV1: boolean;
-                intacctC1ImportSettings: boolean;
                 disableCustomerSourceField: boolean;
             },
             advancedSettings: {

diff --git a/src/app/core/models/netsuite/netsuite-configuration/netsuite-export-setting.model.ts b/src/app/core/models/netsuite/netsuite-configuration/netsuite-export-setting.model.ts
@@ -107,7 +107,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
     }
 
     static getCreditCardExportTypes(): SelectFormOption[] {
-      if (brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) {
+      if (!brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) {
         return this.getCoCreditCardExportTypes();
       }
       return [

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
@@ -13,7 +13,7 @@
     </div>
     <form [formGroup]="exportSettingsForm">
         <div class="tw-p-24-px" [ngClass]="{'tw-pt-0': !brandingFeatureConfig.featureFlags.exportSettings.reimbursableExpenses}">
-            <div *ngIf="!brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed" class="tw-mb-16-px">
+            <div *ngIf="brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed" class="tw-mb-16-px">
                 <div *ngIf="brandingFeatureConfig.featureFlags.exportSettings.reimbursableExpenses" class="tw-rounded-lg tw-border-separator tw-border tw-bg-configuration-bg">
                     <app-configuration-toggle-field 
                     [form]="exportSettingsForm"

diff --git a/...tions/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts b/...tions/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts
@@ -484,7 +484,7 @@ export class IntacctExportSettingsComponent implements OnInit {
         splitExpenseGrouping: new FormControl(this.exportSettings?.expense_group_settings?.split_expense_grouping)
       });
 
-      if (brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) {
+      if (!brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) {
         this.exportSettingsForm.controls.creditCardExpense.patchValue(true);
         this.exportSettingsForm.controls.employeeFieldMapping.patchValue(FyleField.VENDOR);
       }

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
@@ -190,7 +190,7 @@
                             </app-configuration-select-field>
                         </div>
 
-                        <div *ngIf="(!exportSettingForm.get('reimbursableExportType')?.value || brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) && helperService.isFieldRequired(exportSettingForm, 'accountsPayable')">
+                        <div *ngIf="(!exportSettingForm.get('reimbursableExportType')?.value || !brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) && helperService.isFieldRequired(exportSettingForm, 'accountsPayable')">
                             <app-configuration-select-field
                             [form]="exportSettingForm"
                             [destinationAttributes]="accountsPayables"
@@ -209,7 +209,7 @@
                             </app-configuration-select-field>
                         </div>
 
-                        <div *ngIf="(!exportSettingForm.get('reimbursableExportType')?.value || brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) && helperService.isFieldRequired(exportSettingForm, 'bankAccount')">
+                        <div *ngIf="(!exportSettingForm.get('reimbursableExportType')?.value || !brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) && helperService.isFieldRequired(exportSettingForm, 'bankAccount')">
                             <app-configuration-select-field
                             [form]="exportSettingForm"
                             [destinationAttributes]="bankAccounts"

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 *ngIf="!brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-border-tertiary tw-rounded-12-px">
+                        <div *ngIf="brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed" 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/...p/shared/components/helper/mandatory-error-message/mandatory-error-message.component.html b/...p/shared/components/helper/mandatory-error-message/mandatory-error-message.component.html
@@ -1,5 +1,5 @@
 <div class="tw-text-form-error-help-text-color tw-text-12-px tw-font-400 tw-pt-4-px tw-max-w-300-px tw-flex tw-text-pretty tw-items-center">
-    <app-svg-icon *ngIf="brandingFeatureConfig.featureFlags.c1Icon" [c1SvgSource]="'grv-caution-triangle-critical-small'" [width]="'14px'" [height]="'14px'" [styleClasses]="'tw-pr-4-px tw-text-form-error-icon-color'" [isTextColorAllowed]="true"></app-svg-icon>
+    <app-svg-icon *ngIf="brandingFeatureConfig.featureFlags.useCustomIcon" [c1SvgSource]="'grv-caution-triangle-critical-small'" [width]="'14px'" [height]="'14px'" [styleClasses]="'tw-pr-4-px tw-text-form-error-icon-color'" [isTextColorAllowed]="true"></app-svg-icon>
     <span *ngIf="listName">Please select {{ listName }} from the list</span>
     <span *ngIf="customErrorMessage">{{ customErrorMessage }}</span>
   </div>