fix: JE fixes (#1093)

* JE fixes
fylein · Dec 4, 2024 · 84a4838 · 84a4838
1 parent 304ba01
commit 84a4838
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 15 deletions.
diff --git a/src/app/core/models/common/helper.model.ts b/src/app/core/models/common/helper.model.ts
@@ -14,7 +14,7 @@ export class HelperUtility {
         form.controls[controllerName].clearValidators();
 
         // Temporary hack: Don't reset value for fields that are used in reimbursable + ccc section
-        if (controllerName !== 'accountsPayable' && controllerName !== 'defaultCCCAccount' && controllerName !== 'bankAccount' && controllerName !== 'creditCardAccount' && controllerName !== 'defaultCreditCardVendor' && controllerName !== 'nameInJournalEntry' && controllerName !== 'exportScheduleFrequency') {
+        if (controllerName !== 'accountsPayable' && controllerName !== 'defaultCCCAccount' && controllerName !== 'bankAccount' && controllerName !== 'creditCardAccount' && controllerName !== 'defaultCreditCardVendor' && controllerName !== 'nameInJournalEntry' && controllerName !== 'exportScheduleFrequency' && controllerName !== 'employeeMapping') {
             form.controls[controllerName].setValue(null);
         }
     }

diff --git a/src/app/core/models/db/destination-attribute.model.ts b/src/app/core/models/db/destination-attribute.model.ts
@@ -1,4 +1,5 @@
 import { BusinessCentralDestinationAttributes } from "../business-central/db/business-central-destination-attribute.model";
+import { QbdDirectDestinationAttribute } from "../qbd-direct/db/qbd-direct-destination-attribuite.model";
 import { Sage300DestinationAttributes } from "../sage300/db/sage300-destination-attribuite.model";
 import { PaginatedResponse } from "./paginated-response.model";
 
@@ -36,7 +37,7 @@ export interface PaginatedDestinationAttribute extends PaginatedResponse {
 }
 
 export type GroupedDestinationAttribute = {
-  ACCOUNT: Sage300DestinationAttributes[] | BusinessCentralDestinationAttributes[],
+  ACCOUNT: Sage300DestinationAttributes[] | BusinessCentralDestinationAttributes[] | QbdDirectDestinationAttribute[],
   EXPENSE_TYPE: Sage300DestinationAttributes[],
   EXPENSE_PAYMENT_TYPE: Sage300DestinationAttributes[] | BusinessCentralDestinationAttributes[],
   VENDOR_PAYMENT_ACCOUNT: DestinationAttribute[],

diff --git a/src/app/core/models/db/task-log.model.ts b/src/app/core/models/db/task-log.model.ts
@@ -23,5 +23,5 @@ export type TaskLogGetParams = {
   type__in?: string[];
   expense_group_ids?: number[];
   task_type?: string[];
-  export_log__id?: number[];
+  export_log__id__in?: number[];
 };
diff --git a/...app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-advanced-settings.model.ts b/...app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-advanced-settings.model.ts
@@ -29,6 +29,15 @@ export class QbdDirectAdvancedSettingsModel extends AdvancedSettingsModel {
         return ["employee_name", "Expense/Report ID"];
     }
 
+    static topMemoExpenseKeyNameConversion(keys: string[]): string[] {
+        keys.forEach((key: string, index: number) => {
+            if (key === 'expense_key') {
+                keys[index] = 'Expense/Report ID';
+            }
+        });
+        return keys;
+    }
+
     static formatMemoStructure(memoStructure: string[], defaultMemoOptions: string[]): string[] {
         const originMemo: string[] = [];
         defaultMemoOptions.forEach((field, index) => {
@@ -43,7 +52,7 @@ export class QbdDirectAdvancedSettingsModel extends AdvancedSettingsModel {
 
         return new FormGroup({
             expenseMemoStructure: new FormControl(advancedSettings?.line_level_memo_structure && advancedSettings?.line_level_memo_structure.length > 0 ? this.formatMemoStructure(this.defaultMemoFields(), advancedSettings?.line_level_memo_structure) : this.defaultMemoFields(), Validators.required),
-            topMemoStructure: new FormControl(advancedSettings?.top_level_memo_structure && advancedSettings?.top_level_memo_structure.length > 0 ? advancedSettings?.top_level_memo_structure : this.defaultTopMemoOptions(), Validators.required),
+            topMemoStructure: new FormControl(advancedSettings?.top_level_memo_structure && advancedSettings?.top_level_memo_structure.length > 0 ? this.topMemoExpenseKeyNameConversion(advancedSettings?.top_level_memo_structure) : this.defaultTopMemoOptions(), Validators.required),
             exportSchedule: new FormControl(advancedSettings?.schedule_is_enabled ? advancedSettings?.schedule_is_enabled : false),
             email: new FormControl(advancedSettings?.emails_selected ? advancedSettings?.emails_selected : null),
             exportScheduleFrequency: new FormControl(advancedSettings?.schedule_is_enabled ? advancedSettings?.interval_hours : 1),

diff --git a/src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-export-settings.model.ts b/src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-export-settings.model.ts
@@ -174,6 +174,8 @@ export class QbdDirectExportSettingModel extends ExportSettingModel {
             return form.controls.creditCardExportType.value === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY;
           case 'defaultCreditCardAccountName':
             return form.controls.creditCardExportType.value === QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE;
+          case 'employeeMapping':
+            return !form.get('reimbursableExportType')?.value && form.get('creditCardExportType')?.value && form.get('creditCardExportType')?.value === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY;
           default:
             return false;
         }
@@ -182,23 +184,23 @@ export class QbdDirectExportSettingModel extends ExportSettingModel {
     static getValidators(): [ExportSettingValidatorRule, ExportModuleRule[]] {
 
         const exportSettingValidatorRule: ExportSettingValidatorRule = {
-          reimbursableExpense: ['reimbursableExportType', 'reimbursableExportGroup', 'reimbursableExportDate', 'reimbursableExpenseState', 'employeeMapping'],
+          reimbursableExpense: ['reimbursableExportType', 'reimbursableExportGroup', 'reimbursableExportDate', 'reimbursableExpenseState'],
           creditCardExpense: ['creditCardExportType', 'creditCardExportGroup', 'creditCardExportDate', 'creditCardExpenseState']
         };
 
         const exportModuleRule: ExportModuleRule[] = [
             {
                 formController: 'reimbursableExportType',
                 requiredValue: {
-                  [QbdDirectReimbursableExpensesObject.BILL]: [],
-                  [QbdDirectReimbursableExpensesObject.JOURNAL_ENTRY]: ['defaultReimbursableAccountsPayableAccountName']
+                  [QbdDirectReimbursableExpensesObject.BILL]: ['employeeMapping'],
+                  [QbdDirectReimbursableExpensesObject.JOURNAL_ENTRY]: ['defaultReimbursableAccountsPayableAccountName', 'employeeMapping']
                 }
               },
               {
                 formController: 'creditCardExportType',
                 requiredValue: {
                   [QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE]: ['defaultCreditCardAccountName'],
-                  [QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY]: ['defaultCCCAccountsPayableAccountName', 'nameInJE']
+                  [QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY]: ['defaultCCCAccountsPayableAccountName', 'nameInJE', 'employeeMapping']
                 }
               }
         ];

diff --git a/src/app/core/services/common/dashboard.service.ts b/src/app/core/services/common/dashboard.service.ts
@@ -58,7 +58,7 @@ export class DashboardService {
     }
 
     if (expenseGroupIds.length) {
-      const expenseKey = appName === AppName.INTACCT ? 'expense_group_ids' : appName === AppName.QBD_DIRECT ? 'export_log__id' : 'expense_group_id__in';
+      const expenseKey = appName === AppName.INTACCT ? 'expense_group_ids' : appName === AppName.QBD_DIRECT ? 'export_log__id__in' : 'expense_group_id__in';
       apiParams[expenseKey] = expenseGroupIds;
     }
 

diff --git a/...tions/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.html b/...tions/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.html
@@ -43,6 +43,7 @@
         [isImportItemsEnabled]="isImportItemsEnabled"
         [destinationOptionsVersion]="'v1'"
         [importCodeFields]="importCodeFields"
+        [chartOfAccounts]="chartOfAccounts"
         [errorsVersion]="'v1'">
     </app-dashboard-error-section>
 </div>
diff --git a/...rations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts b/...rations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts
@@ -78,6 +78,8 @@ export class QbdDirectDashboardComponent implements OnInit {
 
   importCodeFields: any;
 
+  chartOfAccounts: string[];
+
   constructor(
     private accountingExportService: AccountingExportService,
     private dashboardService: DashboardService,
@@ -151,6 +153,8 @@ export class QbdDirectDashboardComponent implements OnInit {
 
       this.importCodeFields = responses[5].import_settings?.import_code_fields;
 
+      this.chartOfAccounts = responses[5].import_settings.chart_of_accounts;
+
       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.FAILED || task.status === TaskLogState.FATAL).length;
 

diff --git a/...ct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.html b/...ct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.html
@@ -141,7 +141,7 @@
                             [showExportPreview]="false">
                         </app-configuration-select-field>
 
-                        <div *ngIf="!exportSettingsForm.get('reimbursableExpense')?.value && exportSettingsForm.get('creditCardExportType')?.value && exportSettingsForm.get('creditCardExportType')?.value === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY">
+                        <div *ngIf="exportSettingsForm.get('creditCardExportType')?.value && helperService.isFieldRequired(exportSettingsForm, 'employeeMapping')">
                             <app-configuration-select-field
                                 [form]="exportSettingsForm"
                                 [isFieldMandatory]="true"
@@ -174,7 +174,7 @@
                         <div *ngIf="exportSettingsForm.get('creditCardExportType')?.value && helperService.isFieldRequired(exportSettingsForm, 'defaultCreditCardAccountName')">
                             <app-configuration-select-field
                               [form]="exportSettingsForm"
-                              [destinationAttributes]="cccAccpuntOptions(exportSettingsForm.get('creditCardExportType')?.value)"
+                              [destinationAttributes]="cccAccountOptions(exportSettingsForm.get('creditCardExportType')?.value)"
                               [destinationOptionKey]="QbdDirectExportSettingDestinationOptionKey.CREDIT_CARD_ACCOUNT"
                               [isOptionSearchInProgress]="isOptionSearchInProgress"
                               [isAdvanceSearchEnabled]="true"
@@ -194,7 +194,7 @@
                         <div *ngIf="helperService.isFieldRequired(exportSettingsForm, 'defaultCCCAccountsPayableAccountName')">
                             <app-configuration-select-field
                                 [form]="exportSettingsForm"
-                                [destinationAttributes]="destinationOptionsWatcher(['AccountsPayable'] , destinationAccounts)"
+                                [destinationAttributes]="cccAccountOptions(exportSettingsForm.get('creditCardExportType')?.value)"
                                 [destinationOptionKey]="QbdDirectExportSettingDestinationOptionKey.ACCOUNTS_PAYABLE"
                                 [isOptionSearchInProgress]="isOptionSearchInProgress"
                                 [isAdvanceSearchEnabled]="true"

diff --git a/...rect/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.ts b/...rect/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.ts
@@ -108,7 +108,7 @@ export class QbdDirectExportSettingsComponent implements OnInit{
     return this.destinationOptionsWatcher(['Bank', 'AccountsPayable', 'CreditCard', 'OtherCurrentLiability', 'LongTermLiability'], this.destinationAccounts);
   }
 
-  cccAccpuntOptions(cccExportType: string): DestinationAttribute[] {
+  cccAccountOptions(cccExportType: string): DestinationAttribute[] {
     if (cccExportType === QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE) {
       return this.destinationOptionsWatcher(['CreditCard'], this.destinationAccounts);
     } else if (cccExportType === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY && this.exportSettingsForm.controls.employeeMapping.value === EmployeeFieldMapping.EMPLOYEE && this.exportSettingsForm.controls.nameInJE.value === EmployeeFieldMapping.EMPLOYEE) {
@@ -182,7 +182,7 @@ export class QbdDirectExportSettingsComponent implements OnInit{
 
   cccExportTypeWatcher(): void {
     this.exportSettingsForm.controls.creditCardExportType.valueChanges.subscribe((creditCardExportTypeValue) => {
-        this.exportSettingsForm.controls.creditCardExportGroup.patchValue(this.creditCardExpenseGroupingFieldOptions[1].value);
+        this.exportSettingsForm.controls.creditCardExportGroup.patchValue(QbdDirectExportSettingModel.expenseGroupingFieldOptions()[1].value);
         this.exportSettingsForm.controls.creditCardExportGroup.disable();
         this.creditCardExpenseGroupingFieldOptions = [QbdDirectExportSettingModel.expenseGroupingFieldOptions()[1]];
     });

diff --git a/.../shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts b/.../shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts
@@ -13,6 +13,7 @@ import { MappingService } from 'src/app/core/services/common/mapping.service';
 import { TrackingService } from 'src/app/core/services/integration/tracking.service';
 import { WindowService } from 'src/app/core/services/common/window.service';
 import { HelperService } from 'src/app/core/services/common/helper.service';
+import { QbdDirectDestinationAttribute } from 'src/app/core/models/qbd-direct/db/qbd-direct-destination-attribuite.model';
 
 @Component({
   selector: 'app-dashboard-error-section',
@@ -51,6 +52,8 @@ export class DashboardErrorSectionComponent implements OnInit {
 
   @Input() importCodeFields: string[];
 
+  @Input() chartOfAccounts: string[];
+
   filteredMappings: ExtendedGenericMapping[];
 
   destinationOptions: DestinationAttribute[];
@@ -134,6 +137,10 @@ export class DashboardErrorSectionComponent implements OnInit {
     }, 100);
   }
 
+  destinationOptionsWatcher(detailAccountType: string[], destinationOptions: QbdDirectDestinationAttribute[]): DestinationAttribute[] {
+    return destinationOptions.filter((account: QbdDirectDestinationAttribute) =>  detailAccountType.includes(account.detail.account_type));
+  }
+
   private getDestinationOptionsV2(errorType: AccountingErrorType) {
     this.mappingService.getGroupedDestinationAttributes([this.destinationField], 'v2').subscribe(groupedDestinationResponse => {
       if (this.sourceField === 'EMPLOYEE') {
@@ -142,7 +149,7 @@ export class DashboardErrorSectionComponent implements OnInit {
         if (this.destinationField === 'EXPENSE_TYPE') {
           this.destinationOptions = groupedDestinationResponse.EXPENSE_TYPE;
         } else {
-          this.destinationOptions = groupedDestinationResponse.ACCOUNT;
+          this.destinationOptions = this.appName !== AppName.QBD_DIRECT ? groupedDestinationResponse.ACCOUNT : this.destinationOptionsWatcher( this.chartOfAccounts, groupedDestinationResponse.ACCOUNT as QbdDirectDestinationAttribute[]);
         }
       }