fix: add a default bank account field for CCC expenses (#1114)

* fix: remove validation temporarily (#1111) * fix: add a default bank account field for CCC expenses * fix: add missing options to bank accounts on page init * fix: dynamic content for xero customize settings (#1112) * fix: update sublabel key to avoid build fail (#1116) * fix: Prod fixes of QBD direct (#1118) * fix bugs (#1119) * refactor: capitalization * fix: only ccc exports not being saved (#1121) --------- Co-authored-by: Ashwin Thanaraj <[email protected]> Co-authored-by: Nilesh Pant <[email protected]> Co-authored-by: Dhaarani <[email protected]> Co-authored-by: Anish Kr Singh <[email protected]>
fylein · Dec 12, 2024 · 56db591 · 56db591
1 parent 9d91a9b
commit 56db591
Show file tree

Hide file tree

Showing 22 changed files with 124 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,3 +76,5 @@ documentation.json
 
 # Sentry Config File
 .sentryclirc
+
+commits.csv
diff --git a/deploy_dump.sh b/deploy_dump.sh
@@ -0,0 +1,11 @@
+if [ -z "$1" ]; then
+  echo "Usage: sh $0 '2024-12-09'"
+  exit 1
+fi
+
+base_url="https://github.com/fylein/fyle-integrations-app/commit"
+branch_name=$(git rev-parse --abbrev-ref HEAD)
+
+git log --since="$1" --pretty=format:"$base_url/%H,%an,%ad,%s,$branch_name,integrations-app" > commits.csv
+
+open commits.csv
diff --git a/src/app/branding/c1-branding-config.ts b/src/app/branding/c1-branding-config.ts
@@ -128,9 +128,7 @@ export const c1KbArticles: KbArticle[string] = {
             IMPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/9082146-configure-the-capital-one-sage-intacct-integration#h_78e1747002`,
             EXPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/9082146-configure-the-capital-one-sage-intacct-integration#h_eebe5df4b7`,
             ADVANCED_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/9082146-configure-the-capital-one-sage-intacct-integration#h_498f2acc61`,
-            LANDING: `${brandingConfig.helpArticleDomain}/en/articles/9082146-configure-the-capital-one-sage-intacct-integration`,
             CONNECTOR: `${brandingConfig.helpArticleDomain}/en/articles/9081356-generate-credentials-to-connect-with-sage-intacct`,
-            SKIP_EXPORT: `${brandingConfig.helpArticleDomain}/en/articles/9082146-configure-the-capital-one-sage-intacct-integration`,
             HELPER_ARTICLE: `${brandingConfig.helpArticleDomain}/en/articles/7882821-how-to-skip-exporting-specific-expenses-from-fyle-to-sage-intacct`
         }
     }

diff --git a/src/app/branding/c1-contents-config.ts b/src/app/branding/c1-contents-config.ts
@@ -254,7 +254,10 @@ export const c1Contents = {
                 accountingPeriodSubLabel: 'If the accounting period is closed, the expenses will be exported with a date stamp for the first day of the current open accounting period.',
                 autoCreateVendorsSubLabel: 'Automatically create a new contact in Xero if an added merchant doesn\'t have a corresponding match.',
                 customPreferencesLabel: 'Other preferences',
-                customPreferencesSubLabel: 'Create new records in Xero if no contacts found or the accounting period is closed.'
+                customPreferencesSubLabel: 'Create new records in Xero if no contacts found or the accounting period is closed.',
+                memoStructureLabel: 'Set the line-item description field in Xero',
+                memoStructureSubLabel: 'Choose from a list of available data points that you\'d like to export to the description field in Xero.',
+                customizeSectionSubLabel: 'Customize the data that you\'d like to export from Expense Management to Xero by choosing which data points need to be exported.'
             }
         }
     },

diff --git a/src/app/branding/fyle-branding-config.ts b/src/app/branding/fyle-branding-config.ts
@@ -67,7 +67,7 @@ export const fyleKbArticles: KbArticle[string] = {
         SAGE300: `${brandingConfig.helpArticleDomain}/en/articles/8948413-how-to-set-up-the-fyle-sage-300-cre-integration`,
         BUSINESS_CENTRAL: `${brandingConfig.helpArticleDomain}/en/articles/8911018-how-to-configure-the-fyle-dynamics-365-business-central-integration`,
         XERO: `${brandingConfig.helpArticleDomain}/en/articles/6721333-how-to-set-up-the-fyle-xero-integration`,
-        QBD_DIRECT: `${brandingConfig.helpArticleDomain}/en/collections/215867-integrations-with-fyle#quickbooks-desktop`
+        QBD_DIRECT: `${brandingConfig.helpArticleDomain}/en/articles/10259583-quickbooks-desktop-integration-beta`
     },
     onboardingArticles: {
         INTACCT: {
@@ -126,12 +126,10 @@ export const fyleKbArticles: KbArticle[string] = {
             ADVANCED_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/6721333-how-to-set-up-the-fyle-xero-integration#h_d95b791edd`
         },
         QBD_DIRECT: {
-            IMPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/8394683-how-to-configure-the-fyle-sage-intacct-integration#h_85f929716c`,
-            EXPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/8394683-how-to-configure-the-fyle-sage-intacct-integration#h_6492c5038d`,
-            ADVANCED_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/8394683-how-to-configure-the-fyle-sage-intacct-integration#h_3f6718633c`,
-            LANDING: `${brandingConfig.helpArticleDomain}/en/articles/8394683-how-to-configure-the-fyle-sage-intacct-integration`,
-            CONNECTOR: `${brandingConfig.helpArticleDomain}/en/articles/8394683-how-to-configure-the-fyle-sage-intacct-integration#h_38e0c9bea6`,
-            SKIP_EXPORT: `${brandingConfig.helpArticleDomain}/en/articles/7882821-how-to-skip-exporting-specific-expenses-from-fyle-to-sage-intacct`,
+            IMPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/10259583-quickbooks-desktop-integration-beta#h_a170c7d562`,
+            EXPORT_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/10259583-quickbooks-desktop-integration-beta#h_1366df4107`,
+            ADVANCED_SETTING: `${brandingConfig.helpArticleDomain}/en/articles/10259583-quickbooks-desktop-integration-beta#h_b3850646c0`,
+            CONNECTOR: `${brandingConfig.helpArticleDomain}/en/articles/10259583-quickbooks-desktop-integration-beta#h_d3cc42849a`,
             HELPER_ARTICLE: `${brandingConfig.helpArticleDomain}/en/articles/7882821-how-to-skip-exporting-specific-expenses-from-fyle-to-sage-intacct`
         }
     }

diff --git a/src/app/branding/fyle-contents-config.ts b/src/app/branding/fyle-contents-config.ts
@@ -250,6 +250,7 @@ export const fyleContents = {
                 topLevelMemoStructureSubLabel: 'Select the datapoints you\'d like to export to Xero’s top-level memo field when exporting expenses from Fyle.',
                 memoStructureLabel: 'Customize the Line-Item Level Memo Field',
                 memoStructureSubLabel: 'Select the datapoints you\'d like to export to Xero\’s line-item level memo field when exporting expenses from Fyle.',
+                customizeSectionSubLabel: 'In this section, you can customize the data that you\'d like to export from ' + brandingConfig.brandName + ' to Xero. You can choose what data points need to be exported and what shouldn\'t be.',
                 frequencySubLabel: 'Set a frequency based on how often you want your expenses in Fyle to be exported to Xero.',
                 customPreferencesLabel: 'Other Preferences',
                 customPreferencesSubLabel: 'Based on your preference, you can choose whether you want to create any new records in Xero from ' + brandingConfig.brandName + '. (when there is no employee record found, or when the accounting period is closed)',

diff --git a/src/app/core/models/branding/content-configuration.model.ts b/src/app/core/models/branding/content-configuration.model.ts
@@ -248,6 +248,9 @@ export type ContentConfiguration = {
                     scheduleSubLabel: string;
                     accountingPeriodSubLabel: string;
                     autoCreateVendorsSubLabel: string;
+                    memoStructureLabel: string;
+                    memoStructureSubLabel: string;
+                    customizeSectionSubLabel: string;
                     frequencySubLabel: string;
                 }
             },

diff --git a/src/app/core/models/branding/kb-article.model.ts b/src/app/core/models/branding/kb-article.model.ts
@@ -17,9 +17,7 @@ export type KbArticle = {
                 IMPORT_SETTING: string;
                 EXPORT_SETTING: string;
                 ADVANCED_SETTING: string;
-                LANDING: string;
                 CONNECTOR: string;
-                SKIP_EXPORT: string;
                 HELPER_ARTICLE: string;
             },
             INTACCT: {

diff --git a/.../business-central/business-central-configuration/business-central-export-setting.model.ts b/.../business-central/business-central-configuration/business-central-export-setting.model.ts
@@ -15,6 +15,8 @@ export type BusinessCentralExportSetting = {
     credit_card_expense_date: ExportDateType,
     default_bank_account_name: string,
     default_bank_account_id: string,
+    default_ccc_bank_account_name: string,
+    default_ccc_bank_account_id: string,
     name_in_journal_entry: string,
     employee_field_mapping: string,
     auto_map_employees: string,
@@ -184,6 +186,7 @@ export class BusinessCentralExportSettingModel {
             cccExportDate: new FormControl(exportSettings?.credit_card_expense_date ? exportSettings?.credit_card_expense_date.toLowerCase() : null),
             cccExportGroup: new FormControl(exportSettings?.credit_card_expense_grouped_by ? exportSettings?.credit_card_expense_grouped_by: null),
             defaultBankName: new FormControl(exportSettings?.default_bank_account_name ? findObjectByDestinationId(accounts, exportSettings?.default_bank_account_id) : null),
+            cccDefaultBankName: new FormControl(exportSettings?.default_ccc_bank_account_name ? findObjectByDestinationId(accounts, exportSettings?.default_ccc_bank_account_id) : null),
             reimbursableEmployeeMapping: new FormControl(exportSettings?.employee_field_mapping ? exportSettings?.employee_field_mapping : null, Validators.required),
             journalEntryNamePreference: new FormControl(exportSettings?.name_in_journal_entry ? exportSettings?.name_in_journal_entry : null),
             autoMapEmployee: new FormControl(exportSettings?.auto_map_employees ? exportSettings?.auto_map_employees : null),
@@ -204,6 +207,8 @@ export class BusinessCentralExportSettingModel {
             credit_card_expense_date: exportSettingsForm.get('cccExportDate')?.value ? exportSettingsForm.get('cccExportDate')?.value.toUpperCase() : null,
             default_bank_account_name: exportSettingsForm.get('defaultBankName')?.value ? exportSettingsForm.get('defaultBankName')?.value.value : null,
             default_bank_account_id: exportSettingsForm.get('defaultBankName')?.value ? exportSettingsForm.get('defaultBankName')?.value.destination_id : null,
+            default_ccc_bank_account_name: exportSettingsForm.get('cccDefaultBankName')?.value ? exportSettingsForm.get('cccDefaultBankName')?.value.value : null,
+            default_ccc_bank_account_id: exportSettingsForm.get('cccDefaultBankName')?.value ? exportSettingsForm.get('cccDefaultBankName')?.value.destination_id : null,
             name_in_journal_entry: exportSettingsForm.get('journalEntryNamePreference')?.value ? exportSettingsForm.get('journalEntryNamePreference')?.value : null,
             employee_field_mapping: exportSettingsForm.get('reimbursableEmployeeMapping')?.value ? exportSettingsForm.get('reimbursableEmployeeMapping')?.value : null,
             auto_map_employees: exportSettingsForm.get('autoMapEmployee')?.value ? exportSettingsForm.get('autoMapEmployee')?.value : null,

diff --git a/src/app/core/models/common/advanced-settings.model.ts b/src/app/core/models/common/advanced-settings.model.ts
@@ -1,9 +1,10 @@
 import { FormControl, FormGroup } from "@angular/forms";
-import { JoinOption, Operator } from "../enum/enum.model";
+import { AppName, JoinOption, Operator } from "../enum/enum.model";
 import { environment } from "src/environments/environment";
 import { ExportSettingGet } from "../intacct/intacct-configuration/export-settings.model";
 import { QBOExportSettingGet } from "../qbo/qbo-configuration/qbo-export-setting.model";
 import { NetSuiteExportSettingGet } from "../netsuite/netsuite-configuration/netsuite-export-setting.model";
+import { IntacctConfiguration } from "../db/configuration.model";
 
 export type EmailOption = {
     email: string;
@@ -75,17 +76,19 @@ export class AdvancedSettingsModel {
     return ['employee_email', 'employee_name', 'merchant', 'purpose', 'category', 'spent_on', 'report_number', 'expense_link', 'card_number'];
   }
 
-  static getMemoOptions(exportSettings: ExportSettingGet | NetSuiteExportSettingGet | QBOExportSettingGet, appName: string): string[] {
+  static getMemoOptions(exportSettings: IntacctConfiguration | ExportSettingGet | NetSuiteExportSettingGet | QBOExportSettingGet, appName: string): string[] {
     const defaultOptions = this.getDefaultMemoOptions();
     let cccExportType: string | undefined;
     // Handle both configurations and configuration properties
-    if ('configurations' in exportSettings) {
+    if (appName === AppName.INTACCT) {
+      cccExportType = (exportSettings as IntacctConfiguration).corporate_credit_card_expenses_object ?? undefined;
+    } else if ('configurations' in exportSettings) {
       cccExportType = exportSettings.configurations?.corporate_credit_card_expenses_object ?? undefined;
     } else if ('workspace_general_settings' in exportSettings) {
       cccExportType = exportSettings.workspace_general_settings?.corporate_credit_card_expenses_object ?? undefined;
     }
     // Filter out options based on cccExportType and appName
-    if (cccExportType && ['netsuite', 'qbo', 'sage intacct'].includes(appName.toLowerCase())) {
+    if (cccExportType && ['netsuite', 'quickbooks online', 'sage intacct'].includes(appName.toLowerCase())) {
       return defaultOptions; // Allow all options including 'card_number'
     }
       return defaultOptions.filter(option => option !== 'card_number'); // Omit 'card_number' for other apps

diff --git a/src/app/core/models/enum/enum.model.ts b/src/app/core/models/enum/enum.model.ts
@@ -702,9 +702,8 @@ export enum Sage300ExportSettingDestinationOptionKey {
 }
 
 export enum BCExportSettingDestinationOptionKey {
-  ACCOUNT = 'ACCOUNT',
   VENDOR = 'VENDOR',
-  REIMBURSABLE_BANK_ACCOUNT = 'REIMBURSABLE_BANK_ACCOUNT'
+  BANK_ACCOUNT = 'BANK_ACCOUNT'
 }
 
 export enum QbdDirectExportSettingDestinationOptionKey {

diff --git a/...l-shared/business-central-export-settings/business-central-export-settings.component.html b/...l-shared/business-central-export-settings/business-central-export-settings.component.html
@@ -91,8 +91,8 @@
                             [mandatoryErrorListName]="'Default Bank Account Name'"
                             [label]="'Set the Default Bank Account as?'"
                             [subLabel]="'The integration will assign the Expenses that is exported as Journal Entry to the Bank Account selected here.'"
-                            [destinationAttributes]="reimbursableBankOptions"
-                            [destinationOptionKey]="BCExportSettingDestinationOptionKey.REIMBURSABLE_BANK_ACCOUNT"
+                            [destinationAttributes]="bankAccountOptions"
+                            [destinationOptionKey]="BCExportSettingDestinationOptionKey.BANK_ACCOUNT"
                             [isOptionSearchInProgress]="isOptionSearchInProgress"
                             [isAdvanceSearchEnabled]="true"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"
@@ -173,21 +173,21 @@
                             [exportTypeIconPathArray]="previewImagePaths">
                         </app-configuration-select-field>
                     </div>
-                    <div *ngIf="exportSettingForm.get('cccExportType')?.value && exportSettingForm.get('reimbursableExportType')?.value !== BusinessCentralExportType.JOURNAL_ENTRY" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
+                    <div *ngIf="exportSettingForm.get('cccExportType')?.value === BusinessCentralExportType.JOURNAL_ENTRY" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
                         <app-configuration-select-field
                             [form]="exportSettingForm"
                             [isFieldMandatory]="true"
                             [mandatoryErrorListName]="'Default Bank Account Name'"
                             [label]="'Set the Default Bank Account as?'"
                             [subLabel]="'The integration will assign the Expenses that is exported as Journal Entry to the Bank Account selected here.'"
-                            [destinationAttributes]="bankOptions"
-                            [destinationOptionKey]="BCExportSettingDestinationOptionKey.ACCOUNT"
+                            [destinationAttributes]="bankAccountOptions"
+                            [destinationOptionKey]="BCExportSettingDestinationOptionKey.BANK_ACCOUNT"
                             [isOptionSearchInProgress]="isOptionSearchInProgress"
                             [isAdvanceSearchEnabled]="true"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"
                             [iconPath]="'list'"
                             [placeholder]="'Select default Bank Account'"
-                            [formControllerName]="'defaultBankName'">
+                            [formControllerName]="'cccDefaultBankName'">
                         </app-configuration-select-field>
                     </div>
                     <div *ngIf="exportSettingForm.get('cccExportType')?.value" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,3 +76,5 @@ documentation.json

		# Sentry Config File
		.sentryclirc

		commits.csv