From ecda27c5c1b71997af1ac3c2cde3b419b9326dac Mon Sep 17 00:00:00 2001 From: Anish Kr Singh <116036738+anishfyle@users.noreply.github.com> Date: Thu, 7 Mar 2024 20:23:13 +0530 Subject: [PATCH] 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 | 12 +- .../branding/content-configuration.model.ts | 1 + .../models/common/export-settings.model.ts | 8 +- .../intacct-export-settings.component.html | 6 +- .../configuration-import-field.component.html | 2 +- .../configuration-select-field.component.html | 2 +- .../configuration-select-field.component.ts | 4 +- .../configuration-step-header.component.html | 2 +- .../app-landing-page-header.component.html | 2 +- .../intacct-connector.component.html | 1 + .../intacct-location-entity.component.html | 5 +- .../sageIntacct/coCCCExportTypeTable.svg | 131 ++++++++++++++++++ ...peTable.svg => fyleCCCExportTypeTable.svg} | 0 src/assets/sprites/sprite.svg | 2 +- 14 files changed, 158 insertions(+), 20 deletions(-) create mode 100644 src/assets/illustrations/sageIntacct/coCCCExportTypeTable.svg rename src/assets/illustrations/sageIntacct/{cccExportTypeTable.svg => fyleCCCExportTypeTable.svg} (100%) diff --git a/src/app/branding/branding-config.ts b/src/app/branding/branding-config.ts index 85f40ab91..f96c08853 100644 --- a/src/app/branding/branding-config.ts +++ b/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.' } }, diff --git a/src/app/core/models/branding/content-configuration.model.ts b/src/app/core/models/branding/content-configuration.model.ts index 4696ac3ff..a089e8fcc 100644 --- a/src/app/core/models/branding/content-configuration.model.ts +++ b/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; diff --git a/src/app/core/models/common/export-settings.model.ts b/src/app/core/models/common/export-settings.model.ts index 23e0c9bc2..8df8e7d74 100644 --- a/src/app/core/models/common/export-settings.model.ts +++ b/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 } ]; diff --git a/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html index 21d79c472..54d11cb43 100644 --- a/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html +++ b/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"> @@ -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)"> @@ -254,7 +254,7 @@

How should the expenses be grouped?

-
Expenses can either be exported as single line items (Expense) or as a grouped report with multiple line items (Expense Report)
+
Expenses can either be exported as single line items (Expense) or as a grouped report with multiple line items (Expense Report).
diff --git a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html index f87d716e4..e0c0a47d5 100644 --- a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html +++ b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html @@ -38,7 +38,7 @@

- 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 }}

diff --git a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html index 9d40ac62c..2d09372cc 100644 --- a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html +++ b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html @@ -74,7 +74,7 @@
Auto-selected based on your export module
-
+
Using the Spend Date may lead to multiple single line
item entries.
diff --git a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts index 8c733f1ab..ca7781c6e 100644 --- a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts +++ b/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; diff --git a/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html b/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html index f6edf4913..2eb38536b 100644 --- a/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html +++ b/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html @@ -26,7 +26,7 @@
- + Sync diff --git a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html index 1d4f1fa42..00a20ffbf 100644 --- a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html +++ b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html @@ -14,7 +14,7 @@ -

+

{{ appDescription }}

diff --git a/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.html b/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.html index da8752e99..5d1547a07 100644 --- a/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.html +++ b/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.html @@ -40,12 +40,13 @@

-
- Please select a {{brandingContent.intacct.common.locationEntity | lowercase}} from Sage Intacct to proceed further. +
+ Please select a {{brandingContent.intacct.common.locationEntity}} from Sage Intacct to proceed further.
Please hold on; we are fetching data from your Sage Intacct account, which may take a few seconds. +
diff --git a/src/assets/illustrations/sageIntacct/coCCCExportTypeTable.svg b/src/assets/illustrations/sageIntacct/coCCCExportTypeTable.svg new file mode 100644 index 000000000..fdbce90f4 --- /dev/null +++ b/src/assets/illustrations/sageIntacct/coCCCExportTypeTable.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/illustrations/sageIntacct/cccExportTypeTable.svg b/src/assets/illustrations/sageIntacct/fyleCCCExportTypeTable.svg similarity index 100% rename from src/assets/illustrations/sageIntacct/cccExportTypeTable.svg rename to src/assets/illustrations/sageIntacct/fyleCCCExportTypeTable.svg diff --git a/src/assets/sprites/sprite.svg b/src/assets/sprites/sprite.svg index a5694f745..1fc024681 100644 --- a/src/assets/sprites/sprite.svg +++ b/src/assets/sprites/sprite.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file