Fix expense groups get in Intacct (#626)

* Fix expense groups get in Intacct * fix for c1 * fix
fylein · Mar 5, 2024 · b744527 · b744527
1 parent 68821f4
commit b744527
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/...intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.html b/...intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.html
@@ -19,7 +19,7 @@
                     [label]="'Automation'"
                     [subLabel]="'You can automate the export and sync of your data in this section.'">
                 </app-configuration-step-sub-header>
-                <div class="tw-mb-16-px">
+                <div class="tw-my-16-px">
                     <div class="tw-rounded-12-px tw-border-border-tertiary tw-border tw-bg-white tw-mb-16-px">
                         <app-configuration-toggle-field
                             [form]="advancedSettingsForm"

diff --git a/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html b/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html
@@ -130,7 +130,7 @@
                     <app-configuration-toggle-field
                     [form]="exportSettingsForm"
                     [label]="brandingContent.configuration.exportSetting.headerText" 
-                    [subLabel]="brandingContent.intacct.configuration.exportSetting.headerText" 
+                    [subLabel]="brandingContent.intacct.configuration.exportSetting.contentText" 
                     [formControllerName]="'creditCardExpense'"
                     [isSectionHeader]="true"></app-configuration-toggle-field>
                 </div>

diff --git a/...tions/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts b/...tions/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts
@@ -427,11 +427,13 @@ export class IntacctExportSettingsComponent implements OnInit {
         creditCardVendor: [findObjectById(this.destinationOptions.VENDOR, generalMappings?.default_ccc_vendor.id)],
         creditCard: [findObjectById(this.destinationOptions.ACCOUNT, generalMappings?.default_credit_card.id)],
         chargeCard: [findObjectById(this.destinationOptions.CHARGE_CARD, generalMappings?.default_charge_card.id)],
-        useMerchantInJournalLine: [brandingFeatureConfig.featureFlags.exportSettings.useMerchantInJournalLine ? (configurations?.use_merchant_in_journal_line ? configurations?.use_merchant_in_journal_line: false) : true]
+        useMerchantInJournalLine: [brandingFeatureConfig.featureFlags.exportSettings.useMerchantInJournalLine ? (configurations?.use_merchant_in_journal_line ? configurations?.use_merchant_in_journal_line: false) : true],
+        searchOption: ['']
       });
 
       if (brandingConfig.brandId === 'co') {
         this.exportSettingsForm.controls.creditCardExpense.patchValue(true);
+        this.exportSettingsForm.controls.employeeFieldMapping.patchValue(FyleField.VENDOR);
       }
 
       this.exportFieldsWatcher();

diff --git a/...tions/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.ts b/...tions/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.ts
@@ -423,7 +423,8 @@ export class IntacctImportSettingsComponent implements OnInit {
       costTypes: [importSettings.dependent_field_settings?.cost_type_field_name ? this.generateDependentFieldValue(importSettings.dependent_field_settings.cost_type_field_name, importSettings.dependent_field_settings.cost_type_placeholder) : null],
       isDependentImportEnabled: [importSettings.dependent_field_settings?.is_import_enabled || false],
       sageIntacctTaxCodes: [(this.sageIntacctTaxGroup?.find(taxGroup => taxGroup.destination_id === this.importSettings?.general_mappings?.default_tax_code?.id)) || null, importSettings.configurations.import_tax_codes ? [Validators.required] : []],
-      expenseFields: this.formBuilder.array(this.constructFormArray())
+      expenseFields: this.formBuilder.array(this.constructFormArray()),
+      searchOption: ['']
     });
     if (this.importSettingsForm.controls.costCodes.value && this.importSettingsForm.controls.costTypes.value && this.dependentFieldSettings?.is_import_enabled) {
       this.fyleFields = this.fyleFields.filter(field => !field.is_dependent);

diff --git a/.../dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts b/.../dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts
@@ -60,7 +60,7 @@ export class DashboardExportSummarySectionComponent implements OnInit {
   }
 
   private getExpenseGroups(limit: number, offset: number, status: AccountingExportStatus, lastExportedAt?: string | null): void {
-    this.exportLogService.getExpenseGroups((status as unknown as TaskLogState), limit, offset, null, lastExportedAt, this.appName).subscribe((accountingExportResponse: ExpenseGroupResponse) => {
+    this.exportLogService.getExpenseGroups((status as unknown as TaskLogState), limit, offset, null, lastExportedAt, null, this.appName).subscribe((accountingExportResponse: ExpenseGroupResponse) => {
       const accountingExports: AccountingExportList[] = accountingExportResponse.results.map((accountingExport: ExpenseGroup) =>
         AccountingExportModel.parseExpenseGroupAPIResponseToExportLog(accountingExport, this.org_id, this.appName)
       );