PR commit fix

src/app/branding/c1-branding-config.ts

@@ -21,18 +21,22 @@ export const c1FeatureConfig: FeatureConfiguration[string] = {
         c1Icon: true,
         c1Options: true,
         allowForC1: true,
+        showOptionalTextInsteadOfAsterisk: true,
+        useCustomIcon: true,
+        displayAppLogoInDashboard: true,
         exportSettings: {
             reimbursableExpenses: false,
             nameInJournalEntry: false,
             useMerchantInJournalLine: false,
             splitExpenseGrouping: false,
             cccDateConfiguration: true,
-            isEmployeeMappingIsEmployee: false,
-            sentenseCaseConversion: true,
+            isEmployeeMappingFixed: true,
+            transformContentToSentenceCase: true,
             cccExportGroupConfiguration: true,
             lowerCaseConversion: true,
             allowAccountsPayableInCoCCC: true,
-            allowBankAccountInCoCCC: true
+            allowBankAccountInCoCCC: true,
+            isReimbursableExpensesAllowed: true
         },
         importSettings: {
             tax: false,
@@ -43,7 +47,7 @@ export const c1FeatureConfig: FeatureConfiguration[string] = {
             allowCustomSegment: false,
             dependentField: true,
             allowImportCode: false,
-            categoryImportEnabled: false,
+            importSettingsV1: false,
             intacctC1ImportSettings: true,
             disableCustomerSourceField: true
         },

src/app/branding/fyle-branding-config.ts

@@ -21,18 +21,22 @@ export const fyleFeatureConfig: FeatureConfiguration[string] = {
         c1Icon: false,
         c1Options: false,
         allowForC1: false,
+        showOptionalTextInsteadOfAsterisk: false,
+        useCustomIcon: false,
+        displayAppLogoInDashboard: false,
         exportSettings: {
             reimbursableExpenses: true,
             nameInJournalEntry: true,
             useMerchantInJournalLine: true,
             splitExpenseGrouping: true,
             cccDateConfiguration: true,
-            isEmployeeMappingIsEmployee: true,
-            sentenseCaseConversion: false,
+            isEmployeeMappingFixed: false,
+            transformContentToSentenceCase: false,
             cccExportGroupConfiguration: false,
             lowerCaseConversion: false,
             allowAccountsPayableInCoCCC: false,
-            allowBankAccountInCoCCC: false
+            allowBankAccountInCoCCC: false,
+            isReimbursableExpensesAllowed: false
         },
         importSettings: {
             tax: true,
@@ -43,7 +47,7 @@ export const fyleFeatureConfig: FeatureConfiguration[string] = {
             allowCustomSegment: true,
             dependentField: true,
             allowImportCode: true,
-            categoryImportEnabled: true,
+            importSettingsV1: true,
             intacctC1ImportSettings: false,
             disableCustomerSourceField: false
         },

src/app/core/models/branding/feature-configuration.model.ts

@@ -9,20 +9,24 @@ export type FeatureConfiguration = {
         allowIntacctHelperDoc: boolean;
         loginRedirectUri: boolean;
         featureFlags: {
+            showOptionalTextInsteadOfAsterisk: boolean;
             cloneSettings: boolean;
             mapEmployees: boolean;
             c1Icon: boolean;
+            useCustomIcon: boolean;
             c1Options: boolean;
             allowForC1: boolean;
+            displayAppLogoInDashboard: boolean;
             exportSettings: {
+                isReimbursableExpensesAllowed: boolean;
                 reimbursableExpenses: boolean;
                 nameInJournalEntry: boolean;
                 useMerchantInJournalLine: boolean;
                 splitExpenseGrouping: boolean;
                 cccDateConfiguration: boolean;
                 cccExportGroupConfiguration: boolean;
-                isEmployeeMappingIsEmployee: boolean;
-                sentenseCaseConversion: boolean;
+                isEmployeeMappingFixed: boolean;
+                transformContentToSentenceCase: boolean;
                 lowerCaseConversion: boolean;
                 allowAccountsPayableInCoCCC: boolean;
                 allowBankAccountInCoCCC: boolean;
@@ -36,7 +40,7 @@ export type FeatureConfiguration = {
                 allowCustomSegment: boolean;
                 dependentField: boolean;
                 allowImportCode: boolean;
-                categoryImportEnabled: boolean;
+                importSettingsV1: boolean;
                 intacctC1ImportSettings: boolean;
                 disableCustomerSourceField: boolean;
             },

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

@@ -88,7 +88,7 @@ export class ImportSettings {
 
         let isCategoryImportEnabled = false;
 
-        if (brandingFeatureConfig.featureFlags.importSettings.categoryImportEnabled) {
+        if (brandingFeatureConfig.featureFlags.importSettings.importSettingsV1) {
             isCategoryImportEnabled = importSettingsForm.get('importCategories')?.value ? importSettingsForm.get('importCategories')?.value : false;
         } else {
             isCategoryImportEnabled = filteredExpenseFieldArray.filter((field: MappingSetting) => field.source_field === 'CATEGORY' && field.import_to_fyle).length > 0 ? true : false;

src/app/core/models/netsuite/netsuite-configuration/netsuite-export-setting.model.ts

@@ -107,6 +107,9 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
     }
 
     static getCreditCardExportTypes(): SelectFormOption[] {
+      if (brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) {
+        return this.getCoCreditCardExportTypes();
+      }
       return [
         {
           label: 'Bill',
@@ -264,7 +267,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
       }
 
       static getEmployeeFieldMapping(employeeFieldMapping: string): string {
-        return !brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingIsEmployee ? EmployeeFieldMapping.VENDOR : employeeFieldMapping;
+        return brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingFixed ? EmployeeFieldMapping.VENDOR : employeeFieldMapping;
       }
 
       static mapAPIResponseToFormGroup(exportSettings: NetSuiteExportSettingGet | null): FormGroup {
@@ -295,7 +298,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
         const emptyDestinationAttribute: DefaultDestinationAttribute = {id: null, name: null};
         const nameInJournalEntry = exportSettingsForm.get('nameInJournalEntry')?.value ? exportSettingsForm.get('nameInJournalEntry')?.value : NameInJournalEntry.EMPLOYEE;
 
-        if (!brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingIsEmployee) {
+        if (brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingFixed) {
           exportSettingsForm.controls.creditCardExpense.patchValue(true);
           exportSettingsForm.controls.employeeFieldMapping.patchValue(FyleField.VENDOR);
         }

src/app/core/services/common/helper.service.ts

@@ -260,7 +260,7 @@ export class HelperService {
 
   sentenseCaseConversion(content: string) {
     content = new SnakeCaseToSpaceCasePipe().transform(content);
-    return brandingFeatureConfig.featureFlags.exportSettings.sentenseCaseConversion ? new SentenceCasePipe().transform(content) : content;
+    return brandingFeatureConfig.featureFlags.exportSettings.transformContentToSentenceCase ? new SentenceCasePipe().transform(content) : content;
   }
 
   /**

src/app/integrations/intacct/intacct-main/intacct-mapping/intacct-mapping.component.ts

@@ -42,7 +42,7 @@ export class IntacctMappingComponent implements OnInit {
           if (item.source_field !== FyleField.EMPLOYEE && item.source_field !== FyleField.CATEGORY) {
             const mappingPage = new SnakeCaseToSpaceCasePipe().transform(item.source_field);
             this.mappingPages.push({
-              label: brandingFeatureConfig.featureFlags.exportSettings.sentenseCaseConversion ? new SentenceCasePipe().transform(mappingPage) : new TitleCasePipe().transform(mappingPage),
+              label: brandingFeatureConfig.featureFlags.exportSettings.transformContentToSentenceCase ? new SentenceCasePipe().transform(mappingPage) : new TitleCasePipe().transform(mappingPage),
               routerLink: `/integrations/intacct/main/mapping/${encodeURIComponent(item.source_field.toLowerCase())}`
             });
           }

src/app/integrations/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.allowForC1" 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"

src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts

@@ -392,7 +392,7 @@ export class IntacctExportSettingsComponent implements OnInit {
     }
 
     private setupCCCGroupingWatcher(): void {
-      if (brandingFeatureConfig.featureFlags.exportSettings.cccExportGroupConfiguration) {
+      if (brandingConfig.brandId === 'co') {
         this.updateCCCGroupingDateOptions(this.exportSettingsForm.get('cccExportGroup')?.value);
         this.exportSettingsForm.controls.cccExportGroup.valueChanges.subscribe((cccExportGroup) => {
           this.updateCCCGroupingDateOptions(cccExportGroup);
@@ -484,7 +484,7 @@ export class IntacctExportSettingsComponent implements OnInit {
         splitExpenseGrouping: new FormControl(this.exportSettings?.expense_group_settings?.split_expense_grouping)
       });
 
-      if (!brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingIsEmployee) {
+      if (brandingFeatureConfig.featureFlags.exportSettings.isReimbursableExpensesAllowed) {
         this.exportSettingsForm.controls.creditCardExpense.patchValue(true);
         this.exportSettingsForm.controls.employeeFieldMapping.patchValue(FyleField.VENDOR);
       }
@@ -525,7 +525,7 @@ export class IntacctExportSettingsComponent implements OnInit {
     });
 
     this.exportSettingsForm.controls.cccExportGroup?.valueChanges.subscribe((cccExportGroup) => {
-      if (brandingFeatureConfig.featureFlags.exportSettings.cccDateConfiguration) {
+      if (brandingConfig.brandId==='fyle') {
         this.cccExpenseGroupingDateOptions = IntacctExportSettingModel.getExpenseGroupingDateOptions();
         this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(cccExportGroup, this.cccExpenseGroupingDateOptions);
         if (this.exportSettingsForm?.value.cccExportType === IntacctCorporateCreditCardExpensesObject.CHARGE_CARD_TRANSACTION) {

src/app/integrations/netsuite/netsuite-main/netsuite-mapping/netsuite-mapping.component.ts

@@ -40,7 +40,7 @@ export class NetsuiteMappingComponent implements OnInit {
           if (item.source_field !== FyleField.EMPLOYEE && item.source_field !== FyleField.CATEGORY) {
             const mappingPage = new SnakeCaseToSpaceCasePipe().transform(item.source_field);
             this.mappingPages.push({
-              label: brandingFeatureConfig.featureFlags.exportSettings.sentenseCaseConversion ? new SentenceCasePipe().transform(mappingPage) : new TitleCasePipe().transform(mappingPage),
+              label: brandingFeatureConfig.featureFlags.exportSettings.transformContentToSentenceCase ? new SentenceCasePipe().transform(mappingPage) : new TitleCasePipe().transform(mappingPage),
               routerLink: `/integrations/netsuite/main/mapping/${encodeURIComponent(item.source_field.toLowerCase())}`
             });
           }

src/app/integrations/netsuite/netsuite-shared/netsuite-advanced-settings/netsuite-advanced-settings.component.ts

@@ -119,7 +119,7 @@ export class NetsuiteAdvancedSettingsComponent implements OnInit {
   ) { }
 
   isOptional(): string {
-    return brandingFeatureConfig.featureFlags.exportSettings.sentenseCaseConversion ? ' \(optional\)' : '';
+    return brandingFeatureConfig.featureFlags.showOptionalTextInsteadOfAsterisk ? ' \(optional\)' : '';
   }
 
   invalidSkipExportForm($event: boolean) {
@@ -128,13 +128,13 @@ export class NetsuiteAdvancedSettingsComponent implements OnInit {
 
   getCreateVendorLabel(): string {
     if (this.workspaceGeneralSettings.employee_field_mapping === EmployeeFieldMapping.VENDOR) {
-      return brandingFeatureConfig.featureFlags.exportSettings.lowerCaseConversion ? EmployeeFieldMapping.VENDOR.toLowerCase() : new TitleCasePipe().transform(EmployeeFieldMapping.VENDOR);
+      return brandingFeatureConfig.featureFlags.exportSettings.transformContentToSentenceCase ? EmployeeFieldMapping.VENDOR.toLowerCase() : new TitleCasePipe().transform(EmployeeFieldMapping.VENDOR);
     }
-    return brandingFeatureConfig.featureFlags.exportSettings.lowerCaseConversion ? EmployeeFieldMapping.EMPLOYEE.toLowerCase() : new TitleCasePipe().transform(EmployeeFieldMapping.EMPLOYEE);
+    return brandingFeatureConfig.featureFlags.exportSettings.transformContentToSentenceCase ? EmployeeFieldMapping.EMPLOYEE.toLowerCase() : new TitleCasePipe().transform(EmployeeFieldMapping.EMPLOYEE);
   }
 
   getCreateMerchantLabel(): string {
-    return brandingFeatureConfig.featureFlags.exportSettings.lowerCaseConversion ? NameInJournalEntry.MERCHANT.toLowerCase() : new TitleCasePipe().transform(NameInJournalEntry.MERCHANT);
+    return brandingFeatureConfig.featureFlags.exportSettings.transformContentToSentenceCase ? NameInJournalEntry.MERCHANT.toLowerCase() : new TitleCasePipe().transform(NameInJournalEntry.MERCHANT);
   }
 
   navigateToPreviousStep(): void {

src/app/integrations/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.allowAccountsPayableInCoCCC) && 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.allowBankAccountInCoCCC) && 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"

src/app/integrations/netsuite/netsuite-shared/netsuite-export-settings/netsuite-export-settings.component.ts

@@ -54,7 +54,7 @@ export class NetsuiteExportSettingsComponent implements OnInit {
 
   employeeFieldOptions: SelectFormOption[] = NetSuiteExportSettingModel.getEmployeeFieldOptions();
 
-  creditCardExportTypes = brandingFeatureConfig.featureFlags.c1Options ? NetSuiteExportSettingModel.getCoCreditCardExportTypes() : NetSuiteExportSettingModel.getCreditCardExportTypes();
+  creditCardExportTypes = NetSuiteExportSettingModel.getCreditCardExportTypes();
 
   cccExpenseStateOptions = NetSuiteExportSettingModel.getCCCExpenseStateOptions();
 
@@ -300,7 +300,7 @@ export class NetsuiteExportSettingsComponent implements OnInit {
   }
 
   private setupCustomDateOptionWatchers(): void {
-    if (brandingFeatureConfig.featureFlags.exportSettings.cccDateConfiguration) {
+    if (brandingConfig.brandId === 'fyle') {
       this.reimbursableExpenseGroupingDateOptions = this.reimbursableExpenseGroupingDate(this.exportSettingForm.controls.reimbursableExportGroup?.value, NetSuiteExportSettingModel.getReimbursableExpenseGroupingDateOptions());
       if (this.exportSettingForm.get('creditCardExportType')?.value && this.exportSettingForm.get('creditCardExportType')?.value !== NetSuiteCorporateCreditCardExpensesObject.CREDIT_CARD_CHARGE) {
         this.cccExpenseGroupingDateOptions = this.reimbursableExpenseGroupingDate(this.exportSettingForm.controls.creditCardExportGroup?.value, NetSuiteExportSettingModel.getReimbursableExpenseGroupingDateOptions());
@@ -317,7 +317,7 @@ export class NetsuiteExportSettingsComponent implements OnInit {
     });
 
     this.exportSettingForm.controls.creditCardExportGroup?.valueChanges.subscribe((creditCardExportGroup) => {
-      if (brandingFeatureConfig.featureFlags.exportSettings.cccDateConfiguration && this.exportSettingForm.get('creditCardExportType')?.value && this.exportSettingForm.get('creditCardExportType')?.value !== NetSuiteCorporateCreditCardExpensesObject.CREDIT_CARD_CHARGE) {
+      if (brandingConfig.brandId === 'fyle' && this.exportSettingForm.get('creditCardExportType')?.value && this.exportSettingForm.get('creditCardExportType')?.value !== NetSuiteCorporateCreditCardExpensesObject.CREDIT_CARD_CHARGE) {
         const cccExpenseGroupingDateOptions = NetSuiteExportSettingModel.getReimbursableExpenseGroupingDateOptions();
         this.cccExpenseGroupingDateOptions = this.reimbursableExpenseGroupingDate(creditCardExportGroup, cccExpenseGroupingDateOptions);
       }