pr commit fix

fylein · Feb 13, 2024 · 80e0c40 · 80e0c40
1 parent c70b760
commit 80e0c40
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
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
@@ -16,7 +16,7 @@
             <div class="tw-mb-24-px tw-rounded-lg tw-border-separator tw-border tw-bg-configuration-bg">
                 <app-configuration-step-sub-header
                     [label]="'Import Sage Intacct Dimensions'"
-                    [subLabel]="'The Sage Intacct dimensions listed below will be mapped to their corresponding Fyle Field as shown below. Importing these dimensions from Sage Intacct to Fyle will make the values available as a dropdown in the expense form for your employees to choose from.'"
+                    [subLabel]="'The Sage Intacct dimensions listed below will be mapped to their corresponding ' + brandingConfig.brandName + ' Field as shown below. Importing these dimensions from Sage Intacct to ' + brandingConfig.brandName + ' will make the values available as a dropdown in the expense form for your employees to choose from.'"
                     [showPreview]="true"
                     (isPreviewClick)="showPreviewDialog(true)">
                 </app-configuration-step-sub-header>

diff --git a/src/app/integrations/qbo/qbo-shared/qbo-import-settings/qbo-import-settings.component.html b/src/app/integrations/qbo/qbo-shared/qbo-import-settings/qbo-import-settings.component.html
@@ -25,7 +25,7 @@
                     <div class="tw-p-24-px tw-pl-60-px tw-pt-0" *ngIf="importSettingForm.value.importCategories">
                         <div class="tw-flex tw-justify-between tw-items-center">
                             <h5 class="lg:tw-w-3/5 md:tw-w-1/2 tw-text-slightly-normal-text-color tw-text-14-px !tw-font-500">
-                                Select the accounts from QuickBooks to import as categories in Fyle
+                                Select the accounts from QuickBooks to import as categories in {{ brandingConfig.brandName }}
                                 <p class="tw-pt-8-px tw-text-faded-text-color">
                                     By default expense will be selected. Open the dropdown to select more as per your requirements
                                 </p>

diff --git a/...sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.html b/...sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.html
@@ -25,7 +25,7 @@
                     <app-configuration-toggle-field 
                         [form]="advancedSettingForm"
                         [label]="'Schedule automatic export'" 
-                        [subLabel]="'Set up a schedule to frequently automate the export of expenses from Fyle to Sage 300 CRE.'" 
+                        [subLabel]="'Set up a schedule to frequently automate the export of expenses from ' + brandingConfig.brandName + ' to Sage 300 CRE.'" 
                         [formControllerName]="'scheduleEnabled'"
                         [iconPath]="'calendar'">
                     </app-configuration-toggle-field>
@@ -36,7 +36,7 @@
                             [isFieldMandatory]="false"
                             [mandatoryErrorListName]="'automatic export method'"
                             [label]="'Set up export frequency'"
-                            [subLabel]="'Set a frequency based on how often you want your expenses in Fyle to be exported to Sage 300 CRE'"
+                            [subLabel]="'Set a frequency based on how often you want your expenses in ' + brandingConfig.brandName + ' to be exported to Sage 300 CRE'"
                             [options]="hours"
                             [placeholder]="'Set Schedule'"
                             [formControllerName]="'scheduleAutoExportFrequency'">
@@ -47,7 +47,7 @@
             <div class="tw-mb-16-px">
                 <app-configuration-step-sub-header
                     [label]="'Customization'"
-                    [subLabel]="'In this section, you can customize the data that you\'d like to export from Fyle to Sage 300 CRE. You can choose what data points need to be exported and what shouldn\'t be.'">
+                    [subLabel]="'In this section, you can customize the data that you\'d like to export from ' + brandingConfig.brandName + ' to Sage 300 CRE. You can choose what data points need to be exported and what shouldn\'t be.'">
                 </app-configuration-step-sub-header>
             </div>
             <div class="tw-rounded-12-px tw-border-separator tw-border tw-bg-white tw-mb-16-px">
@@ -72,8 +72,8 @@ <h4 class="tw-mb-12-px">Preview of the Description Field</h4>
             <div class="tw-rounded-12-px tw-border-separator tw-border tw-bg-white tw-mb-16-px">
                 <app-configuration-toggle-field 
                     [form]="advancedSettingForm"
-                    [label]="'Skip export of specific expenses from Fyle to Sage 300 CRE'" 
-                    [subLabel]="'You could choose to skip expenses from Fyle to Sage 300 CRE by setting up a conditional rule. '" 
+                    [label]="'Skip export of specific expenses from ' + brandingConfig.brandName + ' to Sage 300 CRE'" 
+                    [subLabel]="'You could choose to skip expenses from ' + brandingConfig.brandName + ' to Sage 300 CRE by setting up a conditional rule. '" 
                     [formControllerName]="'skipExport'"
                     [iconPath]="'list'"
                     [redirectLink]="skipExportRedirectLink">

diff --git a/...s/sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.ts b/...s/sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.ts
@@ -13,7 +13,7 @@ import { TrackingService } from 'src/app/core/services/integration/tracking.serv
 import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
 import { Router } from '@angular/router';
 import { Sage300DestinationAttributes } from 'src/app/core/models/sage300/db/sage300-destination-attribuite.model';
-import { brandingKbArticles } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingKbArticles } from 'src/app/branding/branding-config';
 import { environment } from 'src/environments/environment';
 import { SkipExportService } from 'src/app/core/services/common/skip-export.service';
 
@@ -66,6 +66,8 @@ export class Sage300AdvancedSettingsComponent implements OnInit {
 
   readonly AppName = AppName;
 
+  brandingConfig = brandingConfig;
+
   constructor(
     private advancedSettingsService: Sage300AdvancedSettingsService,
     private helper: HelperService,

diff --git a/.../configuration/configuration-step-sub-header/configuration-step-sub-header.component.html b/.../configuration/configuration-step-sub-header/configuration-step-sub-header.component.html
@@ -2,10 +2,10 @@
     <h4 class="tw-text-text-primary tw-font-500">
         {{label}}
     </h4>
-    <h5 class="tw-text-faded-text-color tw-text-14-px tw-pt-8-px !tw-font-400 tw-w-600-px tw-text-pretty">
+    <h5 class="tw-text-text-muted tw-text-14-px tw-pt-8-px !tw-font-400 tw-w-600-px tw-text-pretty">
         {{subLabel}} 
         <div *ngIf="showPreview" class="tw-inline-flex">
-            <a class="tw-text-hyperlink-color tw-pr-4-px tw-w-fit tw-cursor-pointer" (click)="previewClick()">
+            <a class="tw-text-link-primary tw-pr-4-px tw-w-fit tw-cursor-pointer" (click)="previewClick()">
                 Click here
             </a> 
             to preview.

diff --git a/...ared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.html b/...ared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.html
@@ -1,7 +1,7 @@
 <p-table [value]="getTableSourceData()" [tableStyle]="{ 'min-width': '50rem'}">
     <ng-template pTemplate="header">
         <tr>
-        <th class="!tw-pl-40-px">{{sourceField | snakeCaseToSpaceCase | titlecase}} in Fyle</th>
+        <th class="!tw-pl-40-px">{{sourceField | snakeCaseToSpaceCase | titlecase}} in {{brandingConfig.brandName}}</th>
         <th>{{destinationField | snakeCaseToSpaceCase | titlecase}} in {{appName}}</th>
         <th *ngIf="!isDashboardMappingResolve">Status</th>
         </tr>

diff --git a/...shared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.ts b/...shared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
-import { brandingFeatureConfig } from 'src/app/branding/branding-config';
+import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config';
 import { DestinationAttribute } from 'src/app/core/models/db/destination-attribute.model';
 import { ExtendedGenericMapping } from 'src/app/core/models/db/extended-generic-mapping.model';
 import { GenericMapping, MappingClass } from 'src/app/core/models/db/generic-mapping.model';
@@ -42,6 +42,8 @@ export class GenericMappingTableComponent implements OnInit {
 
   readonly brandingFeatureConfig = brandingFeatureConfig;
 
+  brandingConfig = brandingConfig;
+
   constructor(
     private mappingService: MappingService,
     private toastService: IntegrationsToastService,