@@ -4,7 +4,7 @@ import { SelectFormOption } from "../../common/select-form-option.model";
4
4
import { DefaultDestinationAttribute } from "../../db/destination-attribute.model" ;
5
5
import { ExpenseGroupSettingGet , ExpenseGroupSettingPost } from "../../db/expense-group-setting.model" ;
6
6
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" ;
8
8
import { ExportSettingFormOption } from "../../intacct/intacct-configuration/export-settings.model" ;
9
9
10
10
@@ -217,6 +217,8 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
217
217
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 ) ;
218
218
case 'nameInJournalEntry' :
219
219
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 ;
220
222
default :
221
223
return false ;
222
224
}
@@ -225,7 +227,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
225
227
static getValidators ( ) : [ ExportSettingValidatorRule , ExportModuleRule [ ] ] {
226
228
const exportSettingValidatorRule : ExportSettingValidatorRule = {
227
229
reimbursableExpense : [ 'reimbursableExportType' , 'reimbursableExportGroup' , 'reimbursableExportDate' , 'expenseState' ] ,
228
- creditCardExpense : [ 'creditCardExportType' , 'creditCardExportGroup' , 'creditCardExportDate' , 'cccExpenseState' , 'splitExpenseGrouping' ]
230
+ creditCardExpense : [ 'creditCardExportType' , 'creditCardExportGroup' , 'creditCardExportDate' , 'cccExpenseState' ]
229
231
} ;
230
232
231
233
const exportModuleRule : ExportModuleRule [ ] = [
@@ -240,7 +242,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
240
242
{
241
243
formController : 'creditCardExportType' ,
242
244
requiredValue : {
243
- [ NetSuiteCorporateCreditCardExpensesObject . CREDIT_CARD_CHARGE ] : [ 'creditCardAccount' , 'defaultCreditCardVendor' ] ,
245
+ [ NetSuiteCorporateCreditCardExpensesObject . CREDIT_CARD_CHARGE ] : [ 'creditCardAccount' , 'defaultCreditCardVendor' , 'splitExpenseGrouping' ] ,
244
246
[ NetSuiteCorporateCreditCardExpensesObject . BILL ] : [ 'accountsPayable' , 'defaultCreditCardVendor' ] ,
245
247
[ NetSuiteCorporateCreditCardExpensesObject . JOURNAL_ENTRY ] : [ 'creditCardAccount' , 'defaultCreditCardVendor' , 'nameInJournalEntry' ] ,
246
248
[ NetSuiteCorporateCreditCardExpensesObject . EXPENSE_REPORT ] : [ 'bankAccount' , 'creditCardAccount' ]
@@ -275,7 +277,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
275
277
defaultCreditCardVendor : new FormControl ( exportSettings ?. general_mappings ?. default_ccc_vendor ?. id ? exportSettings . general_mappings . default_ccc_vendor : null ) ,
276
278
nameInJournalEntry : new FormControl ( exportSettings ?. configuration ?. name_in_journal_entry ? exportSettings ?. configuration . name_in_journal_entry : this . getNameInJournalOptions ( ) [ 0 ] . value ) ,
277
279
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 )
279
281
} ) ;
280
282
}
281
283
@@ -315,4 +317,4 @@ export class NetSuiteExportSettingModel extends ExportSettingModel {
315
317
316
318
return exportSettingPayload ;
317
319
}
318
- }
320
+ }
0 commit comments