feat: Qbd direct je changes

src/app/branding/c1-contents-config.ts

@@ -58,8 +58,8 @@ export const c1Contents = {
                     creditCardExpenseNameinJESubLabel: 'You can select either the \'Merchant Name\' or the \'Employee Name\' to appear in the \'Name\' field of your Journal Entries.',
                     defaultCCCAccountLabel: 'Set Default Credit Card Account as',
                     defaultCCCAccountSubLabel: 'Post all your company corporate card transactions to a default credit card account.',
-                    defaultCCCAccountPayableLabel: 'To which accounts payable account should the ',
-                    defaultCCCAccountPayableSubLabel: 'The integration will post the offset credit entry in '
+                    defaultCCCAccountPayableLabel: 'Select the Default Credit Account for adding ',
+                    defaultCCCAccountPayableSubLabel: 'This account will be used for the credit line of the '
                 }
             },
             importSetting: {

src/app/branding/fyle-contents-config.ts

@@ -58,7 +58,7 @@ export const fyleContents = {
                     creditCardExpenseNameinJESubLabel: 'You can select either the \'Merchant Name\' or the \'Employee Name\' to appear in the \'Name\' field of your journal entries.',
                     defaultCCCAccountLabel: 'Set a Default Credit Card Account',
                     defaultCCCAccountSubLabel: 'If there\'s no card-to-card mapping or when an expense lacks a corporate card transaction associated with it, expenses will be posted to the default card configured here.',
-                    defaultCCCAccountPayableLabel: 'Select the Default Credit Account for adding Journal Entry ',
+                    defaultCCCAccountPayableLabel: 'Select the Default Credit Account for adding ',
                     defaultCCCAccountPayableSubLabel: 'This account will be used for the credit line of the '
                 }
             },

src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-export-settings.model.ts

@@ -172,6 +172,8 @@ export class QbdDirectExportSettingModel extends ExportSettingModel {
             return form.controls.reimbursableExportType.value === QBDReimbursableExpensesObject.JOURNAL_ENTRY;
           case 'nameInJE':
             return form.controls.creditCardExportType.value === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY;
+          case 'defaultCreditCardAccountName':
+            return form.controls.creditCardExportType.value === QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE;
           default:
             return false;
         }
@@ -181,7 +183,7 @@ export class QbdDirectExportSettingModel extends ExportSettingModel {
 
         const exportSettingValidatorRule: ExportSettingValidatorRule = {
           reimbursableExpense: ['reimbursableExportType', 'reimbursableExportGroup', 'reimbursableExportDate', 'reimbursableExpenseState', 'employeeMapping'],
-          creditCardExpense: ['creditCardExportType', 'creditCardExportGroup', 'creditCardExportDate', 'creditCardExpenseState', 'defaultCreditCardAccountName']
+          creditCardExpense: ['creditCardExportType', 'creditCardExportGroup', 'creditCardExportDate', 'creditCardExpenseState']
         };
 
         const exportModuleRule: ExportModuleRule[] = [
@@ -195,7 +197,7 @@ export class QbdDirectExportSettingModel extends ExportSettingModel {
               {
                 formController: 'creditCardExportType',
                 requiredValue: {
-                  [QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE]: [],
+                  [QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE]: ['defaultCreditCardAccountName'],
                   [QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY]: ['defaultCCCAccountsPayableAccountName', 'nameInJE']
                 }
               }

src/app/core/services/common/mapping.service.ts

@@ -170,9 +170,9 @@ export class MappingService {
     return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/mappings/`, mapping);
   }
 
-  getPaginatedDestinationAttributes(attributeType: string, value?: string, display_name?: string, appName?: string): Observable<PaginatedDestinationAttribute> {
+  getPaginatedDestinationAttributes(attributeType: string, value?: string, display_name?: string, appName?: string, detailed_accout_type?: string[]): Observable<PaginatedDestinationAttribute> {
     const workspaceId = this.workspaceService.getWorkspaceId();
-    const params: {limit: number, offset: number, attribute_type: string, active?: boolean, value__icontains?: string, value?: string, display_name__in?: string} = {
+    const params: {limit: number, offset: number, attribute_type: string, active?: boolean, value__icontains?: string, value?: string, display_name__in?: string, detail__account_type__in?: string[]} = {
       limit: 100,
       offset: 0,
       attribute_type: attributeType,
@@ -191,6 +191,10 @@ export class MappingService {
       params.display_name__in = display_name;
     }
 
+    if (detailed_accout_type) {
+      params.detail__account_type__in = detailed_accout_type;
+    }
+
     return this.apiService.get(`/workspaces/${workspaceId}/mappings/paginated_destination_attributes/`, params);
   }
 

src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts

@@ -5,12 +5,14 @@ import { forkJoin } from 'rxjs';
 import { brandingConfig } from 'src/app/branding/c1-contents-config';
 import { DestinationAttribute } from 'src/app/core/models/db/destination-attribute.model';
 import { MappingSetting } from 'src/app/core/models/db/mapping-setting.model';
-import { FyleField, AppName, AccountingField, QBDReimbursableExpensesObject, QBDCorporateCreditCardExpensesObject } from 'src/app/core/models/enum/enum.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 { 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';
 import { QbdDirectExportSettingsService } from 'src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-export-settings.service';
+import { QbdDirectImportSettingsService } from 'src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.service';
 import { SharedModule } from 'src/app/shared/shared.module';
 
 @Component({
@@ -46,12 +48,17 @@ export class QbdDirectBaseMappingComponent implements OnInit {
 
   brandingConfig = brandingConfig;
 
+  nameInJE: NameInJournalEntry;
+
+  chartOfAccounts: string[];
+
   constructor(
     private route: ActivatedRoute,
     private mappingService: MappingService,
     private toastService: IntegrationsToastService,
     private workspaceService: WorkspaceService,
-    private expoerSettingService: QbdDirectExportSettingsService
+    private exportSettingService: QbdDirectExportSettingsService,
+    private importSettingService: QbdDirectImportSettingsService
   ) { }
 
   private getDestinationField(workspaceGeneralSetting: QbdDirectExportSettingGet, mappingSettings: MappingSetting[]): string {
@@ -64,23 +71,49 @@ export class QbdDirectBaseMappingComponent implements OnInit {
     return mappingSettings.find((setting) => setting.source_field === this.sourceField)?.destination_field || '';
   }
 
+  destinationOptionsWatcher(detailAccountType?: string[]): void {
+    this.mappingService.getPaginatedDestinationAttributes(this.destinationField, undefined, this.displayName, '', detailAccountType).subscribe((responses) => {
+      this.destinationOptions = responses.results as QbdDirectDestinationAttribute[];
+      this.isLoading = false;
+    });
+  }
+
+  cccAccpuntOptions(): void {
+    if (this.cccExpenseObject === QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE) {
+      this.destinationOptionsWatcher(['CreditCard']);
+    } else if (this.cccExpenseObject === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY && this.employeeFieldMapping === FyleField.EMPLOYEE && this.nameInJE === NameInJournalEntry.EMPLOYEE) {
+      this.destinationOptionsWatcher(['Bank', 'CreditCard', 'OtherCurrentLiability', 'LongTermLiability']);
+    } else {
+      this.destinationOptionsWatcher(['Bank', 'AccountsPayable', 'CreditCard', 'OtherCurrentLiability', 'LongTermLiability']);
+    }
+  }
+
+  categoryOptions(): void {
+    this.destinationOptionsWatcher(this.chartOfAccounts);
+  }
+
   private setupPage(): void {
     this.sourceField = decodeURIComponent(this.route.snapshot.params.source_field.toUpperCase());
     forkJoin([
-      this.expoerSettingService.getQbdExportSettings(),
+      this.exportSettingService.getQbdExportSettings(),
+      this.importSettingService.getImportSettings(),
       this.mappingService.getMappingSettings()
     ]).subscribe((responses) => {
       this.reimbursableExpenseObject = responses[0].reimbursable_expense_export_type;
       this.cccExpenseObject = responses[0].credit_card_expense_export_type;
       this.employeeFieldMapping = (responses[0].employee_field_mapping as unknown as FyleField);
-
-      this.destinationField = this.getDestinationField(responses[0], responses[1].results);
-
-
-      this.mappingService.getPaginatedDestinationAttributes(this.destinationField, undefined, this.displayName).subscribe((responses) => {
-        this.destinationOptions = responses.results;
-        this.isLoading = false;
-      });
+      this.nameInJE = responses[0].name_in_journal_entry;
+      this.chartOfAccounts = responses[1].import_settings.chart_of_accounts;
+
+      this.destinationField = this.getDestinationField(responses[0], responses[2].results);
+
+      if (this.sourceField === 'CORPORATE_CARD') {
+        this.cccAccpuntOptions();
+      } else if (this.sourceField === 'CATEGORY') {
+        this.categoryOptions();
+      } else {
+        this.destinationOptionsWatcher();
+      }
     });
   }
 

src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.html

@@ -57,7 +57,7 @@
                         <div *ngIf="helperService.isFieldRequired(exportSettingsForm, 'defaultReimbursableAccountsPayableAccountName')">
                             <app-configuration-select-field
                                 [form]="exportSettingsForm"
-                                [destinationAttributes]="destinationOptionsWatcher(['AccountsPayable'] , destinationAccounts)"
+                                [destinationAttributes]="reimbursableAccpuntOptions()"
                                 [destinationOptionKey]="QbdDirectExportSettingDestinationOptionKey.ACCOUNTS_PAYABLE"
                                 [isOptionSearchInProgress]="isOptionSearchInProgress"
                                 [isAdvanceSearchEnabled]="true"
@@ -156,6 +156,21 @@
                             </app-configuration-select-field>
                         </div>
 
+                        <div *ngIf="brandingFeatureConfig.featureFlags.exportSettings.nameInJournalEntry && exportSettingsForm.value.creditCardExportType === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY">
+                            <app-configuration-select-field
+                                [form]="exportSettingsForm"
+                                [isFieldMandatory]="true"
+                                [showClearIcon]="true"
+                                [mandatoryErrorListName]="'Name in which Journal Entry should export'"
+                                [label]="brandingContent.corporateCard.creditCardExpenseNameinJELabel"
+                                [subLabel]="brandingContent.corporateCard.creditCardExpenseNameinJESubLabel"
+                                [options]="nameInJEOptions"
+                                [iconPath]="'list'"
+                                [placeholder]="'Select a name'"
+                                [formControllerName]="'nameInJE'">
+                            </app-configuration-select-field>
+                        </div>
+
                         <div *ngIf="exportSettingsForm.get('creditCardExportType')?.value && helperService.isFieldRequired(exportSettingsForm, 'defaultCreditCardAccountName')">
                             <app-configuration-select-field
                               [form]="exportSettingsForm"
@@ -196,20 +211,6 @@
                             </app-configuration-select-field>
                         </div>
 
-                        <div *ngIf="brandingFeatureConfig.featureFlags.exportSettings.nameInJournalEntry && exportSettingsForm.value.creditCardExportType === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY">
-                            <app-configuration-select-field
-                                [form]="exportSettingsForm"
-                                [isFieldMandatory]="true"
-                                [showClearIcon]="true"
-                                [mandatoryErrorListName]="'Name in which Journal Entry should export'"
-                                [label]="brandingContent.corporateCard.creditCardExpenseNameinJELabel"
-                                [subLabel]="brandingContent.corporateCard.creditCardExpenseNameinJESubLabel"
-                                [options]="nameInJEOptions"
-                                [iconPath]="'list'"
-                                [placeholder]="'Select a name'"
-                                [formControllerName]="'nameInJE'">
-                            </app-configuration-select-field>
-                        </div>
                     </div>
                 </div>
 
@@ -238,7 +239,7 @@
                         [iconPath]="'question-square-outline'"
                         [placeholder]="'Select expense grouping'"
                         [isDisableTextRequired]="true"
-                        [isDisabled]="exportSettingsForm.get('creditCardExportType')?.value === QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE ? true : false"
+                        [isDisabled]="exportSettingsForm.get('creditCardExportType')?.value === QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE || exportSettingsForm.get('creditCardExportType')?.value === QBDCorporateCreditCardExpensesObject.JOURNAL_ENTRY ? true : false"
                         [formControllerName]="'creditCardExportGroup'">
                     </app-configuration-select-field>
                 </div>

src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.ts

@@ -101,9 +101,18 @@ export class QbdDirectExportSettingsComponent implements OnInit{
     return true;
   }
 
+  reimbursableAccpuntOptions(): DestinationAttribute[] {
+    if (this.exportSettingsForm.controls.employeeMapping.value === EmployeeFieldMapping.EMPLOYEE) {
+      return this.destinationOptionsWatcher(['Bank', 'CreditCard', 'OtherCurrentLiability', 'LongTermLiability'], this.destinationAccounts);
+    }
+    return this.destinationOptionsWatcher(['Bank', 'AccountsPayable', 'CreditCard', 'OtherCurrentLiability', 'LongTermLiability'], this.destinationAccounts);
+  }
+
   cccAccpuntOptions(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) {
+      return this.destinationOptionsWatcher(['Bank', 'CreditCard', 'OtherCurrentLiability', 'LongTermLiability'], this.destinationAccounts);
     }
     return this.destinationOptionsWatcher(['Bank', 'AccountsPayable', 'CreditCard', 'OtherCurrentLiability', 'LongTermLiability'], this.destinationAccounts);
   }
@@ -173,14 +182,9 @@ export class QbdDirectExportSettingsComponent implements OnInit{
 
   cccExportTypeWatcher(): void {
     this.exportSettingsForm.controls.creditCardExportType.valueChanges.subscribe((creditCardExportTypeValue) => {
-      if (creditCardExportTypeValue === QBDCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE) {
         this.exportSettingsForm.controls.creditCardExportGroup.patchValue(this.creditCardExpenseGroupingFieldOptions[1].value);
         this.exportSettingsForm.controls.creditCardExportGroup.disable();
         this.creditCardExpenseGroupingFieldOptions = [QbdDirectExportSettingModel.expenseGroupingFieldOptions()[1]];
-      } else {
-        this.exportSettingsForm.controls.creditCardExportGroup.enable();
-        this.creditCardExpenseGroupingFieldOptions = QbdDirectExportSettingModel.expenseGroupingFieldOptions();
-      }
     });
   }