@@ -172,21 +173,21 @@
[exportTypeIconPathArray]="previewImagePaths">
-
+
+ [formControllerName]="'cccDefaultBankName'">
@@ -217,7 +218,8 @@
[iconPath]="'question-square-outline'"
[placeholder]="'Select expense grouping'"
[formControllerName]="'cccExportGroup'"
- [appName]="appName">
+ [appName]="appName"
+ [isDisabled]="exportSettingForm.get('cccExportType')?.value === BusinessCentralExportType.JOURNAL_ENTRY">
diff --git a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts
index 438b0cac2..87c43b1a0 100644
--- a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts
+++ b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.ts
@@ -29,9 +29,7 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
exportSettingForm: FormGroup;
- bankOptions: DestinationAttribute[];
-
- reimbursableBankOptions: DestinationAttribute[];
+ bankAccountOptions: DestinationAttribute[];
vendorOptions: DestinationAttribute[];
@@ -142,13 +140,23 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
if (this.exportSettingForm.controls[formControllerName].value === ExpenseGroupedBy.EXPENSE) {
return options.filter(option => option.value !== ExportDateType.LAST_SPENT_AT);
}
- return options.filter(option => option.value !== ExportDateType.SPENT_AT);
+ return options.filter(option => (option.value !== ExportDateType.SPENT_AT && option.value !== ExportDateType.POSTED_AT));
}
refreshDimensions(isRefresh: boolean): void{
this.businessCentralHelperService.importAttributes(isRefresh);
}
+ updateExpenseGroupingValues() {
+ if (this.exportSettingForm.get('cccExportType')?.value === BusinessCentralExportType.JOURNAL_ENTRY) {
+ this.exportSettingForm.get('cccExportGroup')?.setValue(ExpenseGroupedBy.EXPENSE);
+ }
+
+ if (this.exportSettingForm.get('reimbursableExportType')?.value === BusinessCentralExportType.JOURNAL_ENTRY) {
+ this.exportSettingForm.get('reimbursableExportGroup')?.setValue(ExpenseGroupedBy.EXPENSE);
+ }
+ }
+
private setupCustomWatchers(): void {
this.exportSettingForm.controls.reimbursableExportGroup.valueChanges.subscribe((reimbursableExportGroup) => {
if (brandingConfig.brandId==='fyle') {
@@ -161,8 +169,17 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
if (brandingConfig.brandId==='fyle') {
this.cccExpenseGroupingDateOptions = BusinessCentralExportSettingModel.getCCCExpenseGroupingDateOptions();
this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(cccExportGroup, this.cccExpenseGroupingDateOptions);
+
+ // If the selected value is not valid after the export group change, reset the field
+ const visibleValues = this.getExportDate(this.cccExpenseGroupingDateOptions, 'cccExportGroup').map(option => option.value);
+ if (!visibleValues.includes(this.exportSettingForm.get('cccExportDate')?.value)) {
+ this.exportSettingForm.get('cccExportDate')?.reset();
+ }
}
});
+
+ this.exportSettingForm.get('reimbursableExportType')?.valueChanges.subscribe(() => this.updateExpenseGroupingValues());
+ this.exportSettingForm.get('cccExportType')?.valueChanges.subscribe(() => this.updateExpenseGroupingValues());
}
private optionSearchWatcher(): void {
@@ -170,7 +187,7 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
debounceTime(1000)
).subscribe((event: ExportSettingOptionSearch) => {
- if (event.destinationOptionKey === BCExportSettingDestinationOptionKey.REIMBURSABLE_BANK_ACCOUNT) {
+ if (event.destinationOptionKey === BCExportSettingDestinationOptionKey.BANK_ACCOUNT) {
const observables = [
this.mappingService.getPaginatedDestinationAttributes('BANK_ACCOUNT', event.searchTerm),
this.mappingService.getPaginatedDestinationAttributes(
@@ -182,12 +199,12 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
// Insert new options (if any) to existing options, and sort them
const newOptions = [...bankAccounts.results, ...accounts.results];
newOptions.forEach((newOption) => {
- if (!this.reimbursableBankOptions.find((existingOption) => existingOption.destination_id === newOption.destination_id)) {
- this.reimbursableBankOptions.push(newOption);
+ if (!this.bankAccountOptions.find((existingOption) => existingOption.destination_id === newOption.destination_id)) {
+ this.bankAccountOptions.push(newOption);
}
});
- this.reimbursableBankOptions.sort((a, b) => (a.value || '').localeCompare(b.value || ''));
+ this.bankAccountOptions.sort((a, b) => (a.value || '').localeCompare(b.value || ''));
this.isOptionSearchInProgress = false;
});
@@ -195,9 +212,6 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
let existingOptions: DestinationAttribute[];
switch (event.destinationOptionKey) {
- case BCExportSettingDestinationOptionKey.ACCOUNT:
- existingOptions = this.bankOptions;
- break;
case BCExportSettingDestinationOptionKey.VENDOR:
existingOptions = this.vendorOptions;
break;
@@ -214,10 +228,6 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
switch (event.destinationOptionKey) {
- case BCExportSettingDestinationOptionKey.ACCOUNT:
- this.bankOptions = existingOptions.concat();
- this.bankOptions.sort((a, b) => (a.value || '').localeCompare(b.value || ''));
- break;
case BCExportSettingDestinationOptionKey.VENDOR:
this.vendorOptions = existingOptions.concat();
this.vendorOptions.sort((a, b) => (a.value || '').localeCompare(b.value || ''));
@@ -237,6 +247,29 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
}
}
+ addMissingOptions() {
+ // Since pagination API response is a subset of all options, we're making use of the export settings response to fill in options
+
+ if (this.exportSettings) {
+ this.helperService.addDestinationAttributeIfNotExists({
+ options: this.bankAccountOptions,
+ value: this.exportSettings.default_ccc_bank_account_name,
+ destination_id: this.exportSettings.default_ccc_bank_account_id
+ });
+ this.helperService.addDestinationAttributeIfNotExists({
+ options: this.bankAccountOptions,
+ value: this.exportSettings.default_bank_account_name,
+ destination_id: this.exportSettings.default_bank_account_id
+ });
+
+ this.helperService.addDestinationAttributeIfNotExists({
+ options: this.vendorOptions,
+ value: this.exportSettings.default_vendor_name,
+ destination_id: this.exportSettings.default_vendor_id
+ });
+ }
+ }
+
private setupPage(): void {
this.isOnboarding = this.router.url.includes('onboarding');
const exportSettingValidatorRule: ExportSettingValidatorRule = {
@@ -254,11 +287,11 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
{
'formController': 'cccExportType',
'requiredValue': {
- 'JOURNAL_ENTRY': ['defaultBankName', 'journalEntryNamePreference']
+ 'JOURNAL_ENTRY': ['cccDefaultBankName', 'journalEntryNamePreference']
}
}
];
- const commonFormFields: string[] = ['defaultBankName'];
+ const commonFormFields: string[] = [];
const destinationAttributes = [BusinessCentralField.ACCOUNT, FyleField.VENDOR];
@@ -295,14 +328,15 @@ export class BusinessCentralExportSettingsComponent implements OnInit {
});
}
- this.exportSettingForm = BusinessCentralExportSettingModel.mapAPIResponseToFormGroup(this.exportSettings, accounts.results, vendors.results);
+ this.vendorOptions = vendors.results;
+ this.bankAccountOptions = [...reimbursableBankAccounts.results, ...reimbursableAccounts.results];
+ this.bankAccountOptions.sort((a, b) => (a.value || '').localeCompare(b.value || ''));
+ this.addMissingOptions();
+ this.exportSettingForm = BusinessCentralExportSettingModel.mapAPIResponseToFormGroup(this.exportSettings, this.bankAccountOptions, vendors.results);
+
this.helperService.addExportSettingFormValidator(this.exportSettingForm);
this.helper.setConfigurationSettingValidatorsAndWatchers(exportSettingValidatorRule, this.exportSettingForm);
this.helper.setExportTypeValidatorsAndWatchers(exportModuleRule, this.exportSettingForm, commonFormFields);
- this.bankOptions = accounts.results;
- this.vendorOptions = vendors.results;
- this.reimbursableBankOptions = [...reimbursableBankAccounts.results, ...reimbursableAccounts.results];
- this.reimbursableBankOptions.sort((a, b) => (a.value || '').localeCompare(b.value || ''));
this.setupCustomWatchers();
this.optionSearchWatcher();
diff --git a/src/app/integrations/business-central/business-central-shared/business-central.fixture.ts b/src/app/integrations/business-central/business-central-shared/business-central.fixture.ts
index 8af0c393e..07c1a755d 100644
--- a/src/app/integrations/business-central/business-central-shared/business-central.fixture.ts
+++ b/src/app/integrations/business-central/business-central-shared/business-central.fixture.ts
@@ -12,6 +12,8 @@ export const exportSettingsResponse: BusinessCentralExportSettingGet = {
"reimbursable_expenses_export_type": BusinessCentralExportType.JOURNAL_ENTRY,
"default_bank_account_name": "XYZ",
"default_bank_account_id": "1232",
+ "default_ccc_bank_account_name": "ABC",
+ "default_ccc_bank_account_id": "2321",
"reimbursable_expense_state": ExpenseState.PAYMENT_PROCESSING,
"reimbursable_expense_date": ExportDateType.LAST_SPENT_AT,
"reimbursable_expense_grouped_by": ExpenseGroupedBy.EXPENSE,
diff --git a/src/app/integrations/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.ts b/src/app/integrations/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.ts
index 761b0691a..3377486ac 100644
--- a/src/app/integrations/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.ts
+++ b/src/app/integrations/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.ts
@@ -93,7 +93,7 @@ export class IntacctAdvancedSettingsComponent implements OnInit {
private sessionStartTime = new Date();
- defaultMemoFields: string[] = ['employee_email', 'merchant', 'purpose', 'category', 'spent_on', 'report_number', 'expense_link'];
+ defaultMemoFields: string[] = AdvancedSettingsModel.getDefaultMemoOptions();
paymentSyncOptions: AdvancedSettingFormOption[] = [
{
@@ -313,6 +313,7 @@ export class IntacctAdvancedSettingsComponent implements OnInit {
if (this.advancedSettings.workspace_schedules?.additional_email_options) {
this.adminEmails = this.adminEmails.concat(this.advancedSettings.workspace_schedules?.additional_email_options);
}
+ this.defaultMemoFields = AdvancedSettingsModel.getMemoOptions(configuration, AppName.INTACCT);
this.initializeAdvancedSettingsFormWithData(!!expenseFilter.count);
this.initializeSkipExportForm();
this.isLoading = false;
diff --git a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts
index 4847e4e1c..109b27b3b 100644
--- a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts
+++ b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts
@@ -9,6 +9,7 @@ import { DestinationFieldMap, DashboardModel } from 'src/app/core/models/db/dash
import { AccountingGroupedErrors, AccountingGroupedErrorStat, Error, ErrorResponse } from 'src/app/core/models/db/error.model';
import { AppName, AccountingErrorType, QbdDirectTaskLogType, ReimbursableImportState, CCCImportState, AppUrl, TaskLogState } from 'src/app/core/models/enum/enum.model';
import { QbdDirectTaskResponse, QbdDirectTaskLog } from 'src/app/core/models/qbd-direct/db/qbd-direct-task-log.model';
+import { QbdDirectImportSettingModel } from 'src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.model';
import { AccountingExportService } from 'src/app/core/services/common/accounting-export.service';
import { DashboardService } from 'src/app/core/services/common/dashboard.service';
import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
@@ -151,7 +152,7 @@ export class QbdDirectDashboardComponent implements OnInit {
this.importCodeFields = responses[5].import_settings?.import_code_fields;
- this.chartOfAccounts = responses[5].import_settings.chart_of_accounts;
+ this.chartOfAccounts = responses[5].import_settings.import_account_as_category ? responses[5].import_settings.chart_of_accounts : QbdDirectImportSettingModel.getChartOfAccountTypesList();
const queuedTasks: QbdDirectTaskLog[] = responses[2].results.filter((task: QbdDirectTaskLog) => this.exportLogProcessingStates.includes(task.status));
this.failedExpenseGroupCount = responses[2].results.filter((task: QbdDirectTaskLog) => task.status === TaskLogState.ERROR || task.status === TaskLogState.FATAL).length;
diff --git a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts
index 6e7266fc9..abfd042d8 100644
--- a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts
+++ b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts
@@ -8,6 +8,7 @@ import { MappingSetting } from 'src/app/core/models/db/mapping-setting.model';
import { FyleField, AppName, AccountingField, QBDReimbursableExpensesObject, QBDCorporateCreditCardExpensesObject, NameInJournalEntry } from 'src/app/core/models/enum/enum.model';
import { QbdDirectDestinationAttribute } from 'src/app/core/models/qbd-direct/db/qbd-direct-destination-attribuite.model';
import { QbdDirectExportSettingGet } from 'src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-export-settings.model';
+import { QbdDirectImportSettingModel } from 'src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.model';
import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
import { MappingService } from 'src/app/core/services/common/mapping.service';
import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
@@ -106,7 +107,7 @@ export class QbdDirectBaseMappingComponent implements OnInit {
this.cccExpenseObject = responses[0].credit_card_expense_export_type;
this.employeeFieldMapping = (responses[0].employee_field_mapping as unknown as FyleField);
this.nameInJE = responses[0].name_in_journal_entry;
- this.chartOfAccounts = responses[1].import_settings.chart_of_accounts;
+ this.chartOfAccounts = responses[1].import_settings.import_account_as_category ? responses[1].import_settings.chart_of_accounts : QbdDirectImportSettingModel.getChartOfAccountTypesList();
this.destinationField = this.getDestinationField(responses[0], responses[2].results);
diff --git a/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts b/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts
index 0c1cfbb48..a1bb46e03 100644
--- a/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts
+++ b/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts
@@ -83,17 +83,19 @@ export class QbdDirectOnboardingConnectorComponent implements OnInit {
) { }
triggerDownload(filePath: string) {
- const normalizedPath = filePath.replace(/\\\\/g, "\\");
- const filePathRegex = /^(\/?|\.?\/?|[a-zA-Z]:\\)([a-zA-Z0-9_-]+[\\/])*[a-zA-Z0-9 _-]+\.qbw$/;
- this.isCompanyPathInvalid = filePathRegex.test(normalizedPath);
- this.isDownloadfileLoading = true;
- this.qbdDirectConnectorService.postQbdDirectConntion({file_location: normalizedPath}).subscribe((connectionResponse: QbdConnectorGet) => {
+ if (filePath) {
+ this.isDownloadfileLoading = true;
+ this.isCompanyPathInvalid = false;
+ this.qbdDirectConnectorService.postQbdDirectConntion({file_location: filePath}).subscribe((connectionResponse: QbdConnectorGet) => {
this.password = connectionResponse.password;
this.xmlFileContent = connectionResponse.qwc;
this.triggerManualDownload();
this.showDownloadLink = true;
- });
- this.isDownloadfileLoading = false;
+ });
+ this.isDownloadfileLoading = false;
+ } else {
+ this.isCompanyPathInvalid = true;
+ }
}
triggerManualDownload() {
diff --git a/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-advanced-settings/qbd-direct-advanced-settings.component.html b/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-advanced-settings/qbd-direct-advanced-settings.component.html
index 2240fea34..9d5c3cfd6 100644
--- a/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-advanced-settings/qbd-direct-advanced-settings.component.html
+++ b/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-advanced-settings/qbd-direct-advanced-settings.component.html
@@ -8,6 +8,7 @@
[contentText]="brandingContent.contentText"
[showSyncButton]="isOnboarding"
[appName]="appName.QBD_DIRECT"
+ [redirectLink]="redirectLink"
(refreshDimension)="refreshDimensions()">
@@ -88,6 +89,12 @@
[placeholder]="'Select top memo type'"
[formControllerName]="'topMemoStructure'">
+
+
{{brandingContent.previewDescriptionFieldLabel}}
+
+ {{ topMemoPreviewText }}
+
+
{
+ this.memoStructure = memoChanges;
+ this.topMemoPreviewText = QbdDirectAdvancedSettingsModel.formatMemoPreview(this.memoStructure, this.defaultTopMemoOptions)[0];
+ });
+ }
+
private scheduledWatcher() {
if (this.advancedSettingsForm.controls.exportSchedule.value) {
this.helper.markControllerAsRequired(this.advancedSettingsForm, 'exportScheduleFrequency');
@@ -216,6 +226,7 @@ export class QbdDirectAdvancedSettingsComponent implements OnInit {
this.createMemoStructureWatcher();
this.scheduledWatcher();
this.skipExportWatcher();
+ this.createTopMemoStructureWatcher();
}
private getSettingsAndSetupForm(): void {
diff --git a/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.html b/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.html
index 25f2a4943..b6fb9d100 100644
--- a/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.html
+++ b/src/app/integrations/xero/xero-shared/xero-export-settings/xero-export-settings.component.html
@@ -191,7 +191,7 @@
-
+
- Auto-selected based on your export module
- Auto-selected when your default credit account is set to an Accounts Payable account
+ Auto-selected based on your export module
+ Auto-selected when your default credit account is set to an Accounts Payable account
Using the Spend Date may lead to multiple single line
item entries.