white lableing - converting all fyle reference to generic form

fylein · Jan 17, 2025 · 5c73ede · 5c73ede
1 parent 47f5a8c
commit 5c73ede
Show file tree

Hide file tree

Showing 47 changed files with 232 additions and 151 deletions.
diff --git a/src/app/branding/c1-contents-config.ts b/src/app/branding/c1-contents-config.ts
diff --git a/src/app/branding/fyle-contents-config.ts b/src/app/branding/fyle-contents-config.ts
diff --git a/src/app/core/models/branding/content-configuration.model.ts b/src/app/core/models/branding/content-configuration.model.ts
@@ -429,6 +429,8 @@ export type ContentConfiguration = {
             qboErrorDialogHeaderText: string;
             exportLogHeader: string;
             exportLogSubHeader: string;
+            dashboardExportZeroStateHeaderText: string;
+            dashboardExportZeroStateSubHeaderText: string;
         },
         exportLog: {
             tableHeaders: {
@@ -441,12 +443,24 @@ export type ContentConfiguration = {
             },
             searchPlaceholder: string;
             dateRangeLabel: string;
+            completeExportLogZeroStateHeaderText: string;
+            completeExportLogZeroStateSubHeaderText: string;
+            completeExportLogCountZeroStateHeaderText: string;
+            completeExportLogCountZeroStateSubHeaderText: string;
+            skipExportLogZeroStateHeaderText: string;
+            skipExportLogZeroStateSubHeaderText: string;
+            skipExportLogCountZeroStateHeaderText: string;
+            skipExportLogCountZeroStateSubHeaderText: string;
         },
         mapping: {
             filterPlaceholder: string;
             employeeMappingToastText: string;
             categoryMappingToastText: string;
             mappingToastText: string;
+            mappingSerchZeroStateHeaderText: string;
+            mappingSerchZeroStateSubHeaderText: string;
+            mappedHeader: string;
+            unMappedHeader: string;
         },
         landing: {
             contentText: string;

diff --git a/src/app/core/models/xero/xero-configuration/xero-advanced-settings.model.ts b/src/app/core/models/xero/xero-configuration/xero-advanced-settings.model.ts
@@ -5,6 +5,7 @@ import { DefaultDestinationAttribute, DestinationAttribute } from "../../db/dest
 import { PaymentSyncDirection } from "../../enum/enum.model";
 import { HelperUtility } from "../../common/helper.model";
 import { ExportSettingModel } from "../../common/export-settings.model";
+import { brandingConfig } from "src/app/branding/branding-config";
 
 
 export type XeroAdvancedSettingWorkspaceGeneralSetting = {
@@ -64,11 +65,11 @@ export class XeroAdvancedSettingModel extends HelperUtility{
   static getPaymentSyncOptions(): SelectFormOption[] {
     return [
       {
-        label: 'Export Fyle ACH Payments to Xero',
+        label: 'Export ' + brandingConfig.brandName + ' ACH Payments to Xero',
         value: PaymentSyncDirection.FYLE_TO_XERO
       },
       {
-        label: 'Import Xero Payments into Fyle',
+        label: 'Import Xero Payments into ' + brandingConfig.brandName,
         value: PaymentSyncDirection.XERO_TO_FYLE
       }
     ];

diff --git a/src/app/core/models/xero/xero-configuration/xero-export-settings.model.ts b/src/app/core/models/xero/xero-configuration/xero-export-settings.model.ts
@@ -4,7 +4,7 @@ import { DefaultDestinationAttribute, DestinationAttribute } from "../../db/dest
 import { ExpenseGroupSettingGet, ExpenseGroupSettingPost } from "../../db/expense-group-setting.model";
 import { AutoMapEmployeeOptions, ExpenseGroupingFieldOption, ExpenseState, ExportDateType, SplitExpenseGrouping, XeroCCCExpenseState, XeroCorporateCreditCardExpensesObject, XeroReimbursableExpensesObject } from "../../enum/enum.model";
 import { ExportModuleRule, ExportSettingModel, ExportSettingValidatorRule } from "../../common/export-settings.model";
-import { brandingContent } from "src/app/branding/branding-config";
+import { brandingConfig, brandingContent } from "src/app/branding/branding-config";
 
 export type XeroExpenseGroupSettingPost = {
   ccc_expense_state: XeroCCCExpenseState;
@@ -94,11 +94,11 @@ export class XeroExportSettingModel {
         value: null
       },
       {
-        label: 'Employee name on Fyle to contact name on Xero',
+        label: 'Employee name on ' + brandingConfig.brandName + ' to contact name on Xero',
         value: AutoMapEmployeeOptions.NAME
       },
       {
-        label: 'Employee email on Fyle to contact email on Xero',
+        label: 'Employee email on ' + brandingConfig.brandName + ' to contact email on Xero',
         value: AutoMapEmployeeOptions.EMAIL
       }
     ];

diff --git a/src/app/integrations/intacct/intacct-main/intacct-dashboard/intacct-dashboard.component.html b/src/app/integrations/intacct/intacct-main/intacct-dashboard/intacct-dashboard.component.html
@@ -22,8 +22,8 @@
 
     <app-zero-state *ngIf="!accountingExportSummary && !exportableAccountingExportIds.length"
         [zeroStateImageURL]="'assets/illustrations/dashboard-illustration.svg'"
-        [headerText]="brandingConfig.brandId === 'fyle' ? 'Looks like you have': 'No records to show yet'"
-        [subHeaderText]="brandingConfig.brandId === 'fyle' ? '0 expenses to export right now': 'Looks like you have no records to export right now.'">
+        [headerText]="brandingContent.dashboardExportZeroStateHeaderText"
+        [subHeaderText]="brandingContent.dashboardExportZeroStateSubHeaderText">
     </app-zero-state>
 
     <app-dashboard-export-summary-section *ngIf="exportableAccountingExportIds.length || accountingExportSummary"

diff --git a/src/app/integrations/intacct/intacct-main/intacct-dashboard/intacct-dashboard.component.ts b/src/app/integrations/intacct/intacct-main/intacct-dashboard/intacct-dashboard.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Observable, catchError, forkJoin, from, interval, of, switchMap, takeWhile } from 'rxjs';
-import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config';
 import { AccountingErrorType, AppName, AppUrl, CCCImportState, ExpenseState, ExportState, FyleReferenceType, IntacctCategoryDestination, IntacctCorporateCreditCardExpensesObject, IntacctErrorType, IntacctReimbursableExpensesObject, MappingSourceField, ReimbursableImportState, SageIntacctField, TaskLogState, TaskLogType } from 'src/app/core/models/enum/enum.model';
 import { ExpenseGroupList } from 'src/app/core/models/intacct/db/expense-group.model';
 import { Expense } from 'src/app/core/models/intacct/db/expense.model';
@@ -109,6 +109,8 @@ export class IntacctDashboardComponent implements OnInit {
 
   readonly brandingFeatureConfig = brandingFeatureConfig;
 
+  readonly brandingContent = brandingContent.dashboard;
+
   constructor(
     private dashboardService: DashboardService,
     private accountingExportService: AccountingExportService,

diff --git a/...tacct-export-log/intacct-completed-export-log/intacct-completed-export-log.component.html b/...tacct-export-log/intacct-completed-export-log/intacct-completed-export-log.component.html
@@ -30,13 +30,13 @@
         </div>
 
         <app-zero-state-with-illustration *ngIf="(isDateSelected || searchQuery) && totalCount === 0 && !isLoading"
-            [mainText]="brandingConfig.brandId === 'fyle' ? 'Sorry, no results found!': 'No results found.'"
-            [subText]="brandingConfig.brandId === 'fyle' ? 'We could not find what you were looking for. Kindly check the keywords again.' : 'Review your keywords and try again. '">
+            [mainText]="brandingContent.completeExportLogZeroStateHeaderText"
+            [subText]="brandingContent.completeExportLogZeroStateSubHeaderText">
         </app-zero-state-with-illustration>
     </div>
 
     <app-zero-state-with-illustration *ngIf="totalCount === 0 && (!isDateSelected && !searchQuery) && !isLoading"
-        [mainText]="brandingConfig.brandId === 'fyle' ? 'No records to show yet!': 'No records to show yet'"
-        [subText]="brandingConfig.brandId === 'fyle' ? 'All your successful exports and their details will be stored here.': 'All your expenses that are successfully exported will be visible here.'">
+        [mainText]="brandingContent.completeExportLogCountZeroStateHeaderText"
+        [subText]="brandingContent.completeExportLogCountZeroStateSubHeaderText">
     </app-zero-state-with-illustration>
 </div>
diff --git a/...intacct-export-log/intacct-completed-export-log/intacct-completed-export-log.component.ts b/...intacct-export-log/intacct-completed-export-log/intacct-completed-export-log.component.ts
@@ -9,7 +9,7 @@ import { TrackingService } from 'src/app/core/services/integration/tracking.serv
 import { ExportLogService } from 'src/app/core/services/common/export-log.service';
 import { PaginatorService } from 'src/app/core/services/common/paginator.service';
 import { environment } from 'src/environments/environment';
-import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config';
 import { AccountingExportList, AccountingExportModel } from 'src/app/core/models/db/accounting-export.model';
 import { UserService } from 'src/app/core/services/misc/user.service';
 import { Subject } from 'rxjs/internal/Subject';
@@ -68,6 +68,8 @@ export class IntacctCompletedExportLogComponent implements OnInit {
 
   private searchQuerySubject = new Subject<string>();
 
+  readonly brandingContent = brandingContent.exportLog;
+
   constructor(
     @Inject(FormBuilder) private formBuilder: FormBuilder,
     private trackingService: TrackingService,

diff --git a/...ct-main/intacct-export-log/intacct-skip-export-log/intacct-skip-export-log.component.html b/...ct-main/intacct-export-log/intacct-skip-export-log/intacct-skip-export-log.component.html
@@ -25,14 +25,14 @@
         </div>
 
         <app-zero-state-with-illustration *ngIf="(isDateSelected || searchQuery) && totalCount === 0 && !isLoading"
-            [mainText]="brandingConfig.brandId === 'fyle' ? 'Sorry, no results found!': 'Sorry, no results found'"
-            [subText]="'We could not find what you were looking for. Kindly check the keywords again.'">
+            [mainText]="brandingContent.skipExportLogZeroStateHeaderText"
+            [subText]="brandingContent.skipExportLogZeroStateSubHeaderText">
         </app-zero-state-with-illustration>
 
     </div>
 
     <app-zero-state-with-illustration *ngIf="totalCount === 0 && (!isDateSelected && !searchQuery) && !isLoading"
-    [mainText]="brandingConfig.brandId === 'fyle' ? 'No records to show yet!': 'No records to show yet'"
-    [subText]="brandingConfig.brandId === 'fyle' ? 'All your expenses that were skipped from exporting will be stored here.': 'All your expenses that are skipped from exporting will be visible here'">
+    [mainText]="brandingContent.skipExportLogCountZeroStateHeaderText"
+    [subText]="brandingContent.skipExportLogCountZeroStateSubHeaderText">
     </app-zero-state-with-illustration>
 </div>
diff --git a/...acct-main/intacct-export-log/intacct-skip-export-log/intacct-skip-export-log.component.ts b/...acct-main/intacct-export-log/intacct-skip-export-log/intacct-skip-export-log.component.ts
@@ -7,7 +7,7 @@ import { Paginator } from 'src/app/core/models/misc/paginator.model';
 import { TrackingService } from 'src/app/core/services/integration/tracking.service';
 import { ExportLogService } from 'src/app/core/services/common/export-log.service';
 import { PaginatorService } from 'src/app/core/services/si/si-core/paginator.service';
-import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config';
 import { AccountingExportModel, SkippedAccountingExportModel } from 'src/app/core/models/db/accounting-export.model';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
@@ -66,6 +66,8 @@ export class IntacctSkipExportLogComponent implements OnInit {
 
   hideCalendar: boolean;
 
+  readonly brandingContent = brandingContent.exportLog;
+
   constructor(
     private formBuilder: FormBuilder,
     private userService: UserService,

diff --git a/...ons/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.html b/...ons/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.html
@@ -209,7 +209,7 @@ <h4 class="tw-text-16-px tw-text-normal-text-color tw-mb-8-px">
                     </div>
                     <div class="tw-pt-16-px">
                         <app-configuration-info-label
-                            [infoText]="'This is a one-time setup and cannot be modified once the values are imported to Fyle.'">
+                            [infoText]="'This is a one-time setup and cannot be modified once the values are imported to ' + brandingConfig.brandName + '.'">
                         </app-configuration-info-label>
                     </div>
                 </div>

diff --git a/.../integrations/netsuite/netsuite-main/netsuite-dashboard/netsuite-dashboard.component.html b/.../integrations/netsuite/netsuite-main/netsuite-dashboard/netsuite-dashboard.component.html
@@ -22,8 +22,8 @@
 
     <app-zero-state *ngIf="!accountingExportSummary && !exportableAccountingExportIds.length"
         [zeroStateImageURL]="'assets/illustrations/dashboard-illustration.svg'"
-        [headerText]="brandingConfig.brandId === 'fyle' ? 'Looks like you have': 'No records to show yet'"
-        [subHeaderText]="brandingConfig.brandId === 'fyle' ? '0 expenses to export right now': 'Looks like you have no records to export right now.'">
+        [headerText]="brandingContent.dashboardExportZeroStateHeaderText"
+        [subHeaderText]="brandingContent.dashboardExportZeroStateSubHeaderText">
     </app-zero-state>
 
     <app-dashboard-export-summary-section *ngIf="exportableAccountingExportIds.length || accountingExportSummary"

diff --git a/...pp/integrations/netsuite/netsuite-main/netsuite-dashboard/netsuite-dashboard.component.ts b/...pp/integrations/netsuite/netsuite-main/netsuite-dashboard/netsuite-dashboard.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { catchError, forkJoin, from, interval, of, switchMap, takeWhile } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
-import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config';
 import { AccountingExportSummary, AccountingExportSummaryModel } from 'src/app/core/models/db/accounting-export-summary.model';
 import { DashboardModel, DestinationFieldMap } from 'src/app/core/models/db/dashboard.model';
 import { AccountingGroupedErrorStat, AccountingGroupedErrors, Error } from 'src/app/core/models/db/error.model';
@@ -66,6 +66,8 @@ export class NetsuiteDashboardComponent implements OnInit {
 
   readonly brandingConfig = brandingConfig;
 
+  readonly brandingContent = brandingContent.dashboard;
+
   constructor(
     private accountingExportService: AccountingExportService,
     private dashboardService: DashboardService,

diff --git a/...ite-export-log/netsuite-complete-export-logs/netsuite-complete-export-logs.component.html b/...ite-export-log/netsuite-complete-export-logs/netsuite-complete-export-logs.component.html
@@ -30,13 +30,13 @@
         </div>
 
         <app-zero-state-with-illustration *ngIf="(isDateSelected || searchQuery) && totalCount === 0 && !isLoading"
-            [mainText]="brandingConfig.brandId === 'fyle' ? 'Sorry, no results found!': 'Sorry, no results found'"
-            [subText]="'We could not find what you were looking for. Kindly check the keywords again.'">
+            [mainText]="brandingContent.completeExportLogZeroStateHeaderText"
+            [subText]="brandingContent.completeExportLogZeroStateSubHeaderText">
         </app-zero-state-with-illustration>
     </div>
 
     <app-zero-state-with-illustration *ngIf="totalCount === 0 && (!isDateSelected && !searchQuery) && !isLoading"
-        [mainText]="brandingConfig.brandId === 'fyle' ? 'No records to show yet!': 'No records to show yet'"
-        [subText]="brandingConfig.brandId === 'fyle' ? 'All your successful exports and their details will be stored here.': 'All your expenses that are successfully exported will be visible here.'">
+        [mainText]="brandingContent.completeExportLogCountZeroStateHeaderText"
+        [subText]="brandingContent.completeExportLogCountZeroStateSubHeaderText">
     </app-zero-state-with-illustration>
 </div>
diff --git a/...suite-export-log/netsuite-complete-export-logs/netsuite-complete-export-logs.component.ts b/...suite-export-log/netsuite-complete-export-logs/netsuite-complete-export-logs.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { Subject, debounceTime } from 'rxjs';
-import { brandingConfig } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingContent } from 'src/app/branding/branding-config';
 import { AccountingExportList, AccountingExportModel } from 'src/app/core/models/db/accounting-export.model';
 import { ExpenseGroupResponse, ExpenseGroup } from 'src/app/core/models/db/expense-group.model';
 import { AppName, PaginatorPage, TaskLogState } from 'src/app/core/models/enum/enum.model';
@@ -56,6 +56,8 @@ export class NetsuiteCompleteExportLogsComponent implements OnInit {
 
   private searchQuerySubject = new Subject<string>();
 
+  readonly brandingContent = brandingContent.exportLog;
+
   constructor(
     @Inject(FormBuilder) private formBuilder: FormBuilder,
     private exportLogService: ExportLogService,

diff --git a/...etsuite-export-log/netsuite-skipped-export-log/netsuite-skipped-export-log.component.html b/...etsuite-export-log/netsuite-skipped-export-log/netsuite-skipped-export-log.component.html
@@ -25,14 +25,14 @@
         </div>
 
         <app-zero-state-with-illustration *ngIf="(isDateSelected || searchQuery) && totalCount === 0 && !isLoading"
-            [mainText]="brandingConfig.brandId === 'fyle' ? 'Sorry, no results found!': 'Sorry, no results found'"
-            [subText]="'We could not find what you were looking for. Kindly check the keywords again.'">
+            [mainText]="brandingContent.skipExportLogZeroStateHeaderText"
+            [subText]="brandingContent.skipExportLogZeroStateSubHeaderText">
         </app-zero-state-with-illustration>
 
     </div>
 
     <app-zero-state-with-illustration *ngIf="totalCount === 0 && (!isDateSelected && !searchQuery) && !isLoading"
-        [mainText]="brandingConfig.brandId === 'fyle' ? 'No records to show yet!': 'No records to show yet'"
-        [subText]="brandingConfig.brandId === 'fyle' ? 'All your expenses that were skipped from exporting will be stored here.': 'All your expenses that are skipped from exporting will be visible here'">
+        [mainText]="brandingContent.skipExportLogCountZeroStateHeaderText"
+        [subText]="brandingContent.skipExportLogCountZeroStateSubHeaderText">
     </app-zero-state-with-illustration>
 </div>
diff --git a/.../netsuite-export-log/netsuite-skipped-export-log/netsuite-skipped-export-log.component.ts b/.../netsuite-export-log/netsuite-skipped-export-log/netsuite-skipped-export-log.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { Subject, debounceTime } from 'rxjs';
-import { brandingConfig } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingContent } from 'src/app/branding/branding-config';
 import { AccountingExportModel, SkippedAccountingExportModel } from 'src/app/core/models/db/accounting-export.model';
 import { AppName, PaginatorPage } from 'src/app/core/models/enum/enum.model';
 import { SkipExportList, SkipExportLogResponse, SkipExportLog } from 'src/app/core/models/intacct/db/expense-group.model';
@@ -48,6 +48,8 @@ export class NetsuiteSkippedExportLogComponent implements OnInit {
 
   hideCalendar: boolean;
 
+  readonly brandingContent = brandingContent.exportLog;
+
   constructor(
     private formBuilder: FormBuilder,
     private userService: UserService,

diff --git a/...tions/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.html b/...tions/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.html
@@ -22,8 +22,8 @@
 
     <app-zero-state *ngIf="!accountingExportSummary && !exportableAccountingExportIds.length"
         [zeroStateImageURL]="'assets/illustrations/dashboard-illustration.svg'"
-        [headerText]="brandingConfig.brandId === 'fyle' ? 'Looks like you have': 'No records to show yet'"
-        [subHeaderText]="brandingConfig.brandId === 'fyle' ? '0 expenses to export right now': 'Looks like you have no records to export right now.'">
+        [headerText]="brandingContent.dashboardExportZeroStateHeaderText"
+        [subHeaderText]="brandingContent.dashboardExportZeroStateSubHeaderText">
     </app-zero-state>
 
     <app-dashboard-export-summary-section *ngIf="exportableAccountingExportIds.length || accountingExportSummary"

diff --git a/...rations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts b/...rations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { Observable, interval, switchMap, from, takeWhile, forkJoin, catchError, of } from 'rxjs';
-import { brandingFeatureConfig } from 'src/app/branding/branding-config';
+import { brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config';
 import { brandingConfig } from 'src/app/branding/c1-contents-config';
 import { AccountingExportSummary, AccountingExportSummaryModel } from 'src/app/core/models/db/accounting-export-summary.model';
 import { DestinationFieldMap, DashboardModel } from 'src/app/core/models/db/dashboard.model';
@@ -75,6 +75,8 @@ export class QbdDirectDashboardComponent implements OnInit {
 
   readonly brandingConfig = brandingConfig;
 
+  readonly brandingContent = brandingContent.dashboard;
+
   importCodeFields: any;
 
   chartOfAccounts: string[];

diff --git a/...t-export-log/qbd-direct-complete-export-log/qbd-direct-complete-export-log.component.html b/...t-export-log/qbd-direct-complete-export-log/qbd-direct-complete-export-log.component.html
@@ -30,13 +30,13 @@
         </div>
 
         <app-zero-state-with-illustration *ngIf="(isDateSelected || searchQuery) && totalCount === 0 && !isLoading"
-            [mainText]="brandingConfig.brandId === 'fyle' ? 'Sorry, no results found!': 'No results found.'"
-            [subText]="brandingConfig.brandId === 'fyle' ? 'We could not find what you were looking for. Kindly check the keywords again.' : 'Review your keywords and try again. '">
+            [mainText]="brandingContent.completeExportLogZeroStateHeaderText"
+            [subText]="brandingContent.completeExportLogZeroStateSubHeaderText">
         </app-zero-state-with-illustration>
     </div>
 
     <app-zero-state-with-illustration *ngIf="totalCount === 0 && (!isDateSelected && !searchQuery) && !isLoading"
-        [mainText]="brandingConfig.brandId === 'fyle' ? 'No records to show yet!': 'No records to show yet'"
-        [subText]="brandingConfig.brandId === 'fyle' ? 'All your successful exports and their details will be stored here.': 'All your expenses that are successfully exported will be visible here.'">
+        [mainText]="brandingContent.completeExportLogCountZeroStateHeaderText"
+        [subText]="brandingContent.completeExportLogCountZeroStateSubHeaderText">
     </app-zero-state-with-illustration>
 </div>