Skip to content

Commit 46c8c85

Browse files
vignesh05904Vignesh
authored and
Vignesh
committed
initial commit (#1319)
Co-authored-by: Vignesh <[email protected]>
1 parent fb86533 commit 46c8c85

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/app/core/models/netsuite/netsuite-configuration/netsuite-export-setting.model.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { SelectFormOption } from "../../common/select-form-option.model";
44
import { DefaultDestinationAttribute } from "../../db/destination-attribute.model";
55
import { ExpenseGroupSettingGet, ExpenseGroupSettingPost } from "../../db/expense-group-setting.model";
66
import { CCCExpenseState, EmployeeFieldMapping, ExpenseGroupingFieldOption, ExpenseState, ExportDateType, FyleField, NameInJournalEntry, NetSuiteCorporateCreditCardExpensesObject, NetsuiteReimbursableExpensesObject, SplitExpenseGrouping } from "../../enum/enum.model";
7-
import { brandingConfig, brandingContent, brandingFeatureConfig } from "src/app/branding/branding-config";
7+
import { brandingContent, brandingFeatureConfig } from "src/app/branding/branding-config";
88
import { ExportSettingFormOption } from "../../intacct/intacct-configuration/export-settings.model";
99

1010

@@ -217,6 +217,8 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
217217
return form.controls.creditCardExportType.value === NetSuiteCorporateCreditCardExpensesObject.BILL || form.controls.creditCardExportType.value === NetSuiteCorporateCreditCardExpensesObject.CREDIT_CARD_CHARGE || (form.controls.creditCardExportType.value === NetSuiteCorporateCreditCardExpensesObject.JOURNAL_ENTRY && form.controls.nameInJournalEntry.value === NameInJournalEntry.MERCHANT);
218218
case 'nameInJournalEntry':
219219
return form.controls.creditCardExportType && form.controls.creditCardExportType.value === NetSuiteCorporateCreditCardExpensesObject.JOURNAL_ENTRY;
220+
case 'splitExpenseGrouping':
221+
return form.controls.creditCardExportType && form.controls.creditCardExportType.value === NetSuiteCorporateCreditCardExpensesObject.CREDIT_CARD_CHARGE;
220222
default:
221223
return false;
222224
}
@@ -225,7 +227,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
225227
static getValidators(): [ExportSettingValidatorRule, ExportModuleRule[]] {
226228
const exportSettingValidatorRule: ExportSettingValidatorRule = {
227229
reimbursableExpense: ['reimbursableExportType', 'reimbursableExportGroup', 'reimbursableExportDate', 'expenseState'],
228-
creditCardExpense: ['creditCardExportType', 'creditCardExportGroup', 'creditCardExportDate', 'cccExpenseState', 'splitExpenseGrouping']
230+
creditCardExpense: ['creditCardExportType', 'creditCardExportGroup', 'creditCardExportDate', 'cccExpenseState']
229231
};
230232

231233
const exportModuleRule: ExportModuleRule[] = [
@@ -240,7 +242,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
240242
{
241243
formController: 'creditCardExportType',
242244
requiredValue: {
243-
[NetSuiteCorporateCreditCardExpensesObject.CREDIT_CARD_CHARGE]: ['creditCardAccount', 'defaultCreditCardVendor'],
245+
[NetSuiteCorporateCreditCardExpensesObject.CREDIT_CARD_CHARGE]: ['creditCardAccount', 'defaultCreditCardVendor', 'splitExpenseGrouping'],
244246
[NetSuiteCorporateCreditCardExpensesObject.BILL]: ['accountsPayable', 'defaultCreditCardVendor'],
245247
[NetSuiteCorporateCreditCardExpensesObject.JOURNAL_ENTRY]: ['creditCardAccount', 'defaultCreditCardVendor', 'nameInJournalEntry'],
246248
[NetSuiteCorporateCreditCardExpensesObject.EXPENSE_REPORT]: ['bankAccount', 'creditCardAccount']
@@ -275,7 +277,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
275277
defaultCreditCardVendor: new FormControl(exportSettings?.general_mappings?.default_ccc_vendor?.id ? exportSettings.general_mappings.default_ccc_vendor : null),
276278
nameInJournalEntry: new FormControl(exportSettings?.configuration?.name_in_journal_entry ? exportSettings?.configuration.name_in_journal_entry : this.getNameInJournalOptions()[0].value),
277279
searchOption: new FormControl(''),
278-
splitExpenseGrouping: new FormControl(exportSettings?.expense_group_settings?.split_expense_grouping)
280+
splitExpenseGrouping: new FormControl(exportSettings?.expense_group_settings?.split_expense_grouping ? exportSettings.expense_group_settings.split_expense_grouping : SplitExpenseGrouping.MULTIPLE_LINE_ITEM)
279281
});
280282
}
281283

@@ -315,4 +317,4 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
315317

316318
return exportSettingPayload;
317319
}
318-
}
320+
}

0 commit comments

Comments
 (0)