QA : Intacct C1 WL (#632)

* Content QA : Intacct

* pr comment

* cccExportTypeTable

* qa items 2

* lint fix

* removed max width

* option reordering

* general ledger

* fixed repeated account

* qa fix 3

* qa items 4

* rev

src/app/branding/branding-config.ts

@@ -256,11 +256,12 @@ const content: ContentConfiguration = {
                         creditCardVendor: 'Set the Default Credit Card Vendor as',
                         creditCardVendorSublabel: 'The vendor configured here will be added to all the Credit Card expenses exported as Bills.',
                         chargeCard: 'Set the Default Charge Card',
+                        chargeCardPlaceholder: 'Select Corporate Charge Card',
                         chargeCardSublabel: 'Expenses of Corporate Cards in ' + brandingConfig.brandName + ' that are not mapped to their respective cards in Sage Intacct will be posted to the Card configured here. You can map your cards in the Mapping section after configuring the integration.',
-                        cccExpenseState: 'You can export expenses either when they are awaiting closure after approval (Approved) or when the transaction has been settled (Closed)',
+                        cccExpenseState: 'You can export expenses either when they are awaiting closure after approval (Approved) or when the transactions has been settled (Closed)',
                         cccExportGroup: 'Expenses can either be exported as single line items (Expense) or as a grouped report with multiple line items (Report)',
                         employeeFieldMapping: 'How are your Employees represented in Sage Intacct?',
-                        creditCard: 'To which GL Account should the expenses be credited to?',
+                        creditCard: 'To which General Ledger Account should the expenses be credited to?',
                         creditCardSubLabel: 'The integration will credit the account selected here for Corporate Credit Card Expenses exported as Journal Entries.'
                     }
                 },
@@ -414,7 +415,7 @@ const content: ContentConfiguration = {
                 companyId: 'company ID',
                 userPassword: 'User password',
                 password: 'password',
-                locationEntity: 'Location entity',
+                locationEntity: 'location entity',
                 descriptionText: 'of the description field'
             },
             configuration: {
@@ -432,11 +433,12 @@ const content: ContentConfiguration = {
                         creditCardVendor: 'Set the default credit card vendor as',
                         creditCardVendorSublabel: 'The vendor configured here will be added to all the credit card expenses exported as bills.',
                         chargeCard: 'Set the default charge card',
+                        chargeCardPlaceholder: 'Select a charge card',
                         chargeCardSublabel: 'Expenses of corporate cards in ' + brandingConfig.brandName + ' that are not mapped to their respective cards in Sage Intacct will be posted to the card configured here. You can map your cards in the mapping section after configuring the integration.',
-                        cccExpenseState: 'You can export expenses either when they are awaiting closure after approval (approved) or when the transaction has been settled (closed).',
+                        cccExpenseState: 'You can export expenses either when they are awaiting closure after approval (approved) or when the transactions has been settled (closed).',
                         cccExportGroup: 'Expenses can either be exported as single line items (expense) or as a grouped report with multiple line items (report).',
                         employeeFieldMapping: 'How are your employees represented in Sage Intacct?',
-                        creditCard: 'To which gl account should the expenses be credited to?',
+                        creditCard: 'To which general ledger account should the expenses be credited to?',
                         creditCardSubLabel: 'The integration will credit the account selected here for corporate credit card expenses exported as journal entries.'
                     }
                 },

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

@@ -39,6 +39,7 @@ export type ContentConfiguration = {
                         creditCardVendor: string;
                         creditCardVendorSublabel: string;
                         chargeCard: string;
+                        chargeCardPlaceholder: string;
                         chargeCardSublabel: string;
                         cccExpenseState: string;
                         cccExportGroup: string;

src/app/core/models/common/export-settings.model.ts

@@ -52,16 +52,16 @@ export class ExportSettingModel {
         }
             return [
                 {
-                  label: 'Bill',
-                  value: IntacctReimbursableExpensesObject.BILL
+                  label: 'Charge Card Transaction',
+                  value: IntacctCorporateCreditCardExpensesObject.CHARGE_CARD_TRANSACTION
                 },
                 {
                   label: 'Journal Entry',
                   value: IntacctCorporateCreditCardExpensesObject.JOURNAL_ENTRY
                 },
                 {
-                  label: 'Charge Card Transaction',
-                  value: IntacctCorporateCreditCardExpensesObject.CHARGE_CARD_TRANSACTION
+                  label: 'Bill',
+                  value: IntacctReimbursableExpensesObject.BILL
                 }
               ];
 

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

@@ -145,7 +145,7 @@
                         [iconPath]="'list'"
                         [placeholder]="'Select expense export module'"
                         [formControllerName]="'cccExportType'"
-                        [exportConfigurationIconPath]="'assets/illustrations/sageIntacct/cccExportTypeTable.svg'"
+                        [exportConfigurationIconPath]="'assets/illustrations/sageIntacct/'+brandingConfig.brandId+'CCCExportTypeTable.svg'"
                         [showExportPreview]="true"
                         [appName]="appName"
                         [exportTypeIconPathArray]="previewImagePaths"></app-configuration-select-field>
@@ -216,7 +216,7 @@
                             [destinationOptionKey]="IntacctExportSettingDestinationOptionKey.CHARGE_CARD"
                             [isOptionSearchInProgress]="isOptionSearchInProgress"
                             [iconPath]="'list'"
-                            [placeholder]="'Select Charge Corporate Card'"
+                            [placeholder]="brandingContent.intacct.configuration.exportSetting.corporateCard.chargeCardPlaceholder"
                             [formControllerName]="'chargeCard'"
                             [isAdvanceSearchEnabled]="true"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
@@ -254,7 +254,7 @@
                                     <app-svg-icon [svgSource]="'list'" [width]="'24px'" [height]="'24px'" [styleClasses]="'tw-text-mandatory-field-color'"></app-svg-icon>
                                     <div class="lg:tw-w-3/5 md:tw-w-1/2 tw-pl-6">
                                         <h4 class="!tw-text-14-px !tw-font-500">How should the expenses be grouped?<app-mandatory-field></app-mandatory-field></h4>
-                                        <h5 class="!tw-text-text-muted !tw-font-400 !tw-text-14-px tw-pt-6-px !tw-leading-4">Expenses can either be exported as single line items (Expense) or as a grouped report with multiple line items (Expense Report)</h5>
+                                        <h5 class="!tw-text-text-muted !tw-font-400 !tw-text-14-px tw-pt-6-px !tw-leading-4">Expenses can either be exported as single line items (Expense) or as a grouped report with multiple line items (Expense Report).</h5>
                                     </div>
                                 </div>
                                 <div class="tw-pl-18-px tw-pt-18-px">

src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html

@@ -38,7 +38,7 @@
                       </div>
                       <div>
                         <h4 class="tw-font-500 tw-text-14-px tw-text-text-secondary" [ngClass]="isCloneSettingView ? 'tw-py-2-px' : ''">
-                            Import {{ brandingConfig.brandId === 'co' ? (expenseField.value.destination_field | snakeCaseToSpaceCase | titlecase | lowercase) : (expenseField.value.destination_field | snakeCaseToSpaceCase | titlecase) }} from {{ appName }}
+                            Import {{ brandingConfig.brandId === 'co' ? (expenseField.value.destination_field | snakeCaseToSpaceCase | titlecase | lowercase ) : (expenseField.value.destination_field | snakeCaseToSpaceCase | titlecase) }} from {{ appName }}
                             <app-optional-field *ngIf="!isAsterikAllowed"></app-optional-field>
                         </h4>
                         <h5 *ngIf="!isCloneSettingView" class="!tw-text-text-muted tw-text-14-px !tw-font-400 !tw-leading-4" [ngClass]="{'tw-pt-4-px': brandingConfig.brandId === 'co', 'tw-pt-8-px': brandingConfig.brandId !== 'co'}">

src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html

@@ -74,7 +74,7 @@ <h5 *ngIf="subLabel && (exportConfigurationIconPath && appName === AppName.TRAVE
                     <div *ngIf="!showExportPreview && isDisabled" class="sub-text tw-text-pretty">
                         <span>Auto-selected based on your export module</span>
                     </div>
-                    <div *ngIf="form.controls[formControllerName].value==='spent_at' && isOnboarding" class="sub-text">
+                    <div *ngIf="form.controls[formControllerName].value==='spent_at' && isOnboarding && form.value.cccExportType!==IntacctCorporateCreditCardExpensesObject.CHARGE_CARD_TRANSACTION" class="sub-text">
                         <span>Using the Spend Date may lead to multiple single line<br>item entries.</span>
                     </div>
                 </div>

src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts

@@ -87,6 +87,8 @@ export class ConfigurationSelectFieldComponent implements OnInit {
 
   isCCCExportTableVisible: boolean = false;
 
+  IntacctCorporateCreditCardExpensesObject = IntacctCorporateCreditCardExpensesObject;
+
   optionsCopy: any[];
 
   exportTableData = [
@@ -128,7 +130,7 @@ export class ConfigurationSelectFieldComponent implements OnInit {
   }
 
   showExportPreviewDialog(exportType: string) {
-    this.dialogHeader = 'Preview how '+ new SnakeCaseToSpaceCasePipe().transform(new TitleCasePipe().transform(exportType)) +' is made in '+ this.appName;
+    this.dialogHeader = 'Preview of a '+ new SnakeCaseToSpaceCasePipe().transform(new TitleCasePipe().transform(exportType)) +' exported to '+ this.appName;
     const index = this.formControllerName === 'reimbursableExportType' ? 0 : 1;
     this.exportTypeIconPath = this.exportTypeIconPathArray[index][exportType];
     this.isPreviewDialogVisible = true;

src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html

@@ -26,7 +26,7 @@ <h5 class="tw-text-text-muted tw-text-14-px tw-pt-8-px !tw-font-400 tw-text-pret
             </span>
         </button>
         <div *ngIf="showSyncButton && !brandingFeatureConfig.isIconsInsideButtonAllowed">
-          <span (click)="refreshDimensions()" class="p-button primary-outline tw-mr-12-px" [pTooltip]="'The integration will import all the newly updated '+ appName +' dimensions and ' + brandingConfig.brandName + ' expenses in the configured state of export'">
+          <span (click)="refreshDimensions()" class="p-button primary-outline tw-mr-12-px" [pTooltip]="'If you are unable to find a required value, click the sync button to instantly retrieve the latest values from ' + appName">
             Sync
         </span>
         </div>

src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html

@@ -14,7 +14,7 @@
                             <app-svg-icon *ngIf="isIntegrationConnected && !isLoading && !hideRefreshIcon" [tooltipText]="'Sync Data'" [tooltipPosition]="'right'" [svgSource]="'arrow-rotate-sync'" [width]="'14px'" [height]="'14px'" [styleClasses]="'tw-cursor-pointer tw-ml-10-px tw-text-faded-text-color'" (iconClick)="syncData()"></app-svg-icon>
                         </div>
                     </div>
-                    <p *ngIf="!isIntegrationSetupInProgress" class="tw-text-text-secondary tw-pt-4-px tw-text-14-px tw-font-400 tw-max-w-700-px tw-text-pretty">
+                    <p *ngIf="!isIntegrationSetupInProgress" class="tw-text-text-secondary tw-pt-4-px tw-text-14-px tw-font-400 tw-text-pretty">
                         {{ appDescription }}
                         <a *ngIf="redirectLink"
                             class="tw-text-link-primary tw-w-fit tw-cursor-pointer tw-inline-flex tw-items-center tw-pl-2-px"

src/app/shared/components/si/core/intacct-connector/intacct-connector.component.html

@@ -6,6 +6,7 @@
       <app-configuration-step-header *ngIf="!isLoading"
       [headerText]="'Connect to Sage Intacct'"
       [contentText]="'Connect to your Sage Intacct account to establish a connection between ' + brandingConfig.brandName + ' and Sage Intacct.'"
+      [contentText]="'To connect your ' + brandingConfig.brandName + ' and Sage Intacct accounts, follow the detailed instructions provided in the article to generate the credentials and establish a secure connection.'"
       [redirectLink]="redirectLink"></app-configuration-step-header>
    </div>
    <div *ngIf="!isLoading" class="tw-px-24-px tw-pb-24-px">

src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.html

@@ -40,12 +40,13 @@ <h3 *ngIf="locationEntity" [pTooltip]="locationEntity.location_entity_name" [too
               {{ locationEntity.location_entity_name | trimCharacter: 26 }}
             </h3>
 
-            <div *ngIf="!locationEntity" class="tw-text-14-px tw-pt-16-px tw-w-300-px tw-text-text-muted tw-text-center">
-              Please select a {{brandingContent.intacct.common.locationEntity | lowercase}} from Sage Intacct to proceed further.
+            <div *ngIf="!locationEntity" class="tw-text-14-px tw-pl-24-px tw-pt-16-px tw-w-300-px tw-text-text-muted tw-text-center">
+              Please select a {{brandingContent.intacct.common.locationEntity}} from Sage Intacct to proceed further.
             </div>
 
             <div *ngIf="isRefreshDimensionInProgress" class="tw-text-14-px tw-pt-16-px tw-w-300-px tw-text-text-muted tw-text-center">
               Please hold on; we are fetching data from your Sage Intacct account, which may take a few seconds.
+              <app-loader [styleClass]="'spinner-16 tw-top-2-px'"></app-loader>
             </div>
         </form>
     </div>