Reverting Export Merchant as Journal Entry Line Item (#498)

* Export Merchant as Journal Entry Line Item * comment resolved * Revert "Export Merchant as Journal Entry Line Item (#478)" This reverts commit 0f312d1.
fylein · Feb 1, 2024 · 085e240 · 085e240
1 parent e3850ba
commit 085e240
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/src/app/core/models/si/si-configuration/export-settings.model.ts b/src/app/core/models/si/si-configuration/export-settings.model.ts
@@ -12,8 +12,7 @@ export type ExportSettingConfiguration = {
     employee_field_mapping: string,
     auto_map_employees: string,
     reimbursable_expenses_object: IntacctReimbursableExpensesObject | null,
-    corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject | null,
-    use_merchant_in_journal_line: boolean
+    corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject | null
   }
 
 export type ExportSettingGeneralMapping = {
@@ -80,8 +79,7 @@ export type ExportSettingOptionSearch = {
                 reimbursable_expenses_object: getValueOrDefault(exportSettingsForm.get('reimbursableExportType')),
                 corporate_credit_card_expenses_object: cccExportType,
                 employee_field_mapping: exportSettingsForm.get('employeeFieldMapping')?.value ? exportSettingsForm.get('employeeFieldMapping')?.value.toUpperCase() : null,
-                auto_map_employees: getValueOrDefault(exportSettingsForm.get('autoMapEmployees')),
-                use_merchant_in_journal_line: exportSettingsForm.get('useMerchantInJournalLine')?.value
+                auto_map_employees: getValueOrDefault(exportSettingsForm.get('autoMapEmployees'))
             },
             general_mappings: {
                 default_gl_account: exportSettingsForm.get('glAccount')?.value?.value ? {id: exportSettingsForm.get('glAccount')?.value.destination_id, name: exportSettingsForm.get('glAccount')?.value.value} : emptyDestinationAttribute,

diff --git a/.../configuration/configuration-export-settings/configuration-export-settings.component.html b/.../configuration/configuration-export-settings/configuration-export-settings.component.html
@@ -177,13 +177,6 @@
                             [formControllerName]="'creditCardVendor'"
                             (searchOptionsDropdown)="searchOptionsDropdown($event)"></app-configuration-select-field>
                         </div>
-                        <div *ngIf="exportSettingsForm.value.cccExportType === CorporateCreditCardExpensesObject.JOURNAL_ENTRY" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
-                            <app-configuration-toggle-field 
-                            [form]="exportSettingsForm"
-                            [label]="'Export Merchant as Vendor for Journal Line'" 
-                            [subLabel]="'we’ll Match merchant name with Vendor in Intacct'"
-                            [formControllerName]="'useMerchantInJournalLine'"></app-configuration-toggle-field>
-                        </div>
                         <div *ngIf="exportSettingsForm.value.cccExportType===CorporateCreditCardExpensesObject.JOURNAL_ENTRY">
                             <app-configuration-select-field
                             [form]="exportSettingsForm"

diff --git a/...si/configuration/configuration-export-settings/configuration-export-settings.component.ts b/...si/configuration/configuration-export-settings/configuration-export-settings.component.ts
@@ -441,8 +441,7 @@ export class ConfigurationExportSettingsComponent implements OnInit {
         cccExpensePaymentType: [findObjectById(this.destinationOptions.CCC_EXPENSE_PAYMENT_TYPE, generalMappings?.default_ccc_expense_payment_type.id)],
         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: [configurations?.use_merchant_in_journal_line]
+        chargeCard: [findObjectById(this.destinationOptions.CHARGE_CARD, generalMappings?.default_charge_card.id)]
       });
 
       this.exportFieldsWatcher();