@@ -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,
From 204c5f799b53cc04984d23b0d7a8f879f150655c Mon Sep 17 00:00:00 2001
From: Anish Kr Singh <116036738+anishfyle@users.noreply.github.com>
Date: Fri, 13 Dec 2024 12:16:08 +0530
Subject: [PATCH 5/5] fix: hide card number and employee name as options for
memo field (#1123)
* fix: hide card number and employee name as options for memo field
* updated conditions
* fix lint
---
.../core/models/common/advanced-settings.model.ts | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/app/core/models/common/advanced-settings.model.ts b/src/app/core/models/common/advanced-settings.model.ts
index 735a4d3f1..0c178709b 100644
--- a/src/app/core/models/common/advanced-settings.model.ts
+++ b/src/app/core/models/common/advanced-settings.model.ts
@@ -5,7 +5,7 @@ import { ExportSettingGet } from "../intacct/intacct-configuration/export-settin
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";
-
+import { brandingConfig } from 'src/app/branding/branding-config';
export type EmailOption = {
email: string;
name: string;
@@ -87,11 +87,14 @@ export class AdvancedSettingsModel {
} 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', 'quickbooks online', 'sage intacct'].includes(appName.toLowerCase())) {
- return defaultOptions; // Allow all options including 'card_number'
+
+ if (brandingConfig.brandId === 'co') {
+ return defaultOptions.filter(option => option !== 'card_number' && option !== 'employee_name');
}
- return defaultOptions.filter(option => option !== 'card_number'); // Omit 'card_number' for other apps
+ if (cccExportType && ['netsuite', 'quickbooks online', 'sage intacct'].includes(appName.toLowerCase()) && brandingConfig.brandId === 'fyle') {
+ return defaultOptions;
+ }
+ return defaultOptions.filter(option => option !== 'card_number');
}