feat: sage50 export settings, show field to select account for per diem and mileage (#1639)

vignesh05904 · vignesh05904 · web-flow · commit 17b75a309461 · 2025-11-05T14:00:42.000+05:30
* intial

* design alignments for ts

* emp mapping tooltip to be displayed at last

* comment fix minor


---------

Co-authored-by: vignesh05904 &lt;vignesh.s@fyle.in&gt;
diff --git a/src/app/core/models/sage50/db/sage50-workspace.model.ts b/src/app/core/models/sage50/db/sage50-workspace.model.ts
@@ -4,6 +4,8 @@ import { Workspace } from "../../db/workspaces.model";
 export interface Sage50Workspace extends Workspace {
     onboarding_state: Sage50OnboardingState
     org_settings: {
-        enabled_payment_modes: ("CREDIT_CARD" | "REIMBURSABLE")[]
+        enabled_payment_modes: ("CREDIT_CARD" | "REIMBURSABLE")[],
+        is_mileage_enabled: boolean,
+        is_per_diem_enabled: boolean
     }
 }
diff --git a/src/app/core/models/sage50/sage50-configuration/sage50-export-settings.model.ts b/src/app/core/models/sage50/sage50-configuration/sage50-export-settings.model.ts
@@ -45,6 +45,8 @@ type Sage50ExportSettingsBase = {
 export interface Sage50ExportSettingsPost extends Sage50ExportSettingsBase {
     reimbursable_default_credit_line_account: number | null,
     reimbursable_default_account_payable_account: number | null,
+    default_per_diem_account: number | null,
+    default_mileage_account: number | null,
     ccc_default_credit_line_account: number | null,
     ccc_default_account_payable_account: number | null,
     default_cash_account: number | null,
@@ -54,6 +56,8 @@ export interface Sage50ExportSettingsPost extends Sage50ExportSettingsBase {
 export interface Sage50ExportSettingsGet extends Sage50ExportSettingsBase {
     reimbursable_default_credit_line_account: DestinationAttribute | null,
     reimbursable_default_account_payable_account: DestinationAttribute | null,
+    default_per_diem_account: DestinationAttribute | null,
+    default_mileage_account: DestinationAttribute | null,
     ccc_default_credit_line_account: DestinationAttribute | null,
     ccc_default_account_payable_account: DestinationAttribute | null,
     default_cash_account: DestinationAttribute | null,
@@ -73,6 +77,8 @@ export type Sage50ExportSettingsForm = {
     cccExportGroup: FormControl<Sage50ExpensesGroupedBy | null>,
     reimbursableDefaultCreditLineAccount: FormControl<DestinationAttribute | null>,
     reimbursableDefaultAccountPayableAccount: FormControl<DestinationAttribute | null>,
+    defaultPerDiemAccount: FormControl<DestinationAttribute | null>,
+    defaultMileageAccount: FormControl<DestinationAttribute | null>,
     cccDefaultCreditLineAccount: FormControl<DestinationAttribute | null>,
     cccDefaultAccountPayableAccount: FormControl<DestinationAttribute | null>,
     defaultCashAccount: FormControl<DestinationAttribute | null>,
diff --git a/src/app/core/services/sage50/sage50-configuration/sage50-export-settings.service.ts b/src/app/core/services/sage50/sage50-configuration/sage50-export-settings.service.ts
@@ -22,6 +22,12 @@ export const FIELD_DEPENDENCIES = new Map<keyof Sage50ExportSettingsForm, Depend
   ['reimbursableDefaultAccountPayableAccount', (form) =>
     form.get('reimbursableExportType')?.value === Sage50ReimbursableExportType.PURCHASES_RECEIVE_INVENTORY
   ],
+  ['defaultPerDiemAccount', (form) =>
+    !!form.get('reimbursableExportType')?.value
+  ],
+  ['defaultMileageAccount', (form) =>
+    !!form.get('reimbursableExportType')?.value
+  ],
   ['reimbursableExpenseState', (form) =>
     !!form.get('reimbursableExportType')?.value
   ],
@@ -143,6 +149,8 @@ export class Sage50ExportSettingsService extends ExportSettingsService {
       reimbursable_expense_grouped_by: form.get('reimbursableExportGroup')?.value,
       reimbursable_default_credit_line_account: form.get('reimbursableDefaultCreditLineAccount')?.value?.id,
       reimbursable_default_account_payable_account: form.get('reimbursableDefaultAccountPayableAccount')?.value?.id,
+      default_per_diem_account: form.get('defaultPerDiemAccount')?.value?.id,
+      default_mileage_account: form.get('defaultMileageAccount')?.value?.id,
       credit_card_expense_export_type: cccExportType,
       credit_card_expense_state: form.get('cccExpenseState')?.value,
       credit_card_expense_date: form.get('cccExportDate')?.value,
@@ -181,7 +189,13 @@ export class Sage50ExportSettingsService extends ExportSettingsService {
     };
   }
 
-  mapApiResponseToFormGroup(apiResponse: Sage50ExportSettingsGet | null, isReimbursableEnabled: boolean, isCCCEnabled: boolean): FormGroup<Sage50ExportSettingsForm> {
+  mapApiResponseToFormGroup(
+    apiResponse: Sage50ExportSettingsGet | null,
+    isReimbursableEnabled: boolean,
+    isCCCEnabled: boolean,
+    isPerDiemEnabled: boolean,
+    isMileageEnabled: boolean
+  ): FormGroup<Sage50ExportSettingsForm> {
     const { reimbursableExpenses, cccExpenses } = this.getEnabledExportTypes(apiResponse, isReimbursableEnabled, isCCCEnabled);
 
     return new FormGroup<Sage50ExportSettingsForm>({
@@ -197,6 +211,8 @@ export class Sage50ExportSettingsService extends ExportSettingsService {
       cccExportGroup: new FormControl(apiResponse?.credit_card_expense_grouped_by ?? null),
       reimbursableDefaultAccountPayableAccount: new FormControl(apiResponse?.reimbursable_default_account_payable_account ?? null),
       reimbursableDefaultCreditLineAccount: new FormControl(apiResponse?.reimbursable_default_credit_line_account ?? null),
+      defaultPerDiemAccount: new FormControl(apiResponse?.default_per_diem_account ?? null),
+      defaultMileageAccount: new FormControl(apiResponse?.default_mileage_account ?? null),
       cccDefaultCreditLineAccount: new FormControl(apiResponse?.ccc_default_credit_line_account ?? null),
       cccDefaultAccountPayableAccount: new FormControl(apiResponse?.ccc_default_account_payable_account ?? null),
       defaultPaymentMethod: new FormControl(apiResponse?.default_payment_method ?? null),
@@ -222,6 +238,13 @@ export class Sage50ExportSettingsService extends ExportSettingsService {
           // If a field is required and empty, add an error
           const condition = FIELD_DEPENDENCIES.get(key as keyof Sage50ExportSettingsForm);
           if (condition && condition(form) && !form.get(key)?.value) {
+            // Additional check for feature-flag-dependent fields
+            if (key === 'defaultPerDiemAccount' && !isPerDiemEnabled) {
+              continue; // Skip validation if per diem is not enabled
+            }
+            if (key === 'defaultMileageAccount' && !isMileageEnabled) {
+              continue; // Skip validation if mileage is not enabled
+            }
             errors[key] = {
               required: true
             };
diff --git a/src/app/integrations/sage50/sage50-shared/sage50-export-settings/sage50-export-settings.component.html b/src/app/integrations/sage50/sage50-shared/sage50-export-settings/sage50-export-settings.component.html
@@ -84,6 +84,51 @@
 
                 <ng-container *ngTemplateOutlet="noValidAccountsAlert"></ng-container>
 
+            }
+
+            @if (isPerDiemEnabled && showField('defaultPerDiemAccount')) {
+                <app-configuration-select-field
+                    [form]="exportSettingsForm"
+                    [label]="'sage50ExportSettings.defaultPerDiemAccountLabel' | transloco"
+                    [subLabel]="'sage50ExportSettings.defaultPerDiemAccountSubLabel' | transloco"
+                    [formControllerName]="'defaultPerDiemAccount'"
+                    [destinationAttributes]="accounts"
+                    [destinationOptionKey]="Sage50ExportSettingDestinationOptionKey.ACCOUNT"
+                    [isOptionSearchInProgress]="isOptionSearchInProgress"
+                    [isAdvanceSearchEnabled]="true"
+                    (searchOptionsDropdown)="onAdvancedSearch($event)"
+                    [placeholder]="'sage50ExportSettings.defaultPerDiemAccountPlaceholder' | transloco"
+                    [isFieldMandatory]="true"
+                    [appName]="appName"
+                    [iconPath]="'list'"
+                    [isMultiLineOption]="true"
+                ></app-configuration-select-field>
+
+                <ng-container *ngTemplateOutlet="noValidAccountsAlert"></ng-container>
+            }
+
+            @if (isMileageEnabled && showField('defaultMileageAccount')) {
+                <app-configuration-select-field
+                    [form]="exportSettingsForm"
+                    [label]="'sage50ExportSettings.defaultMileageAccountLabel' | transloco"
+                    [subLabel]="'sage50ExportSettings.defaultMileageAccountSubLabel' | transloco"
+                    [formControllerName]="'defaultMileageAccount'"
+                    [destinationAttributes]="accounts"
+                    [destinationOptionKey]="Sage50ExportSettingDestinationOptionKey.ACCOUNT"
+                    [isOptionSearchInProgress]="isOptionSearchInProgress"
+                    [isAdvanceSearchEnabled]="true"
+                    (searchOptionsDropdown)="onAdvancedSearch($event)"
+                    [placeholder]="'sage50ExportSettings.defaultMileageAccountPlaceholder' | transloco"
+                    [isFieldMandatory]="true"
+                    [appName]="appName"
+                    [iconPath]="'list'"
+                    [isMultiLineOption]="true"
+                ></app-configuration-select-field>
+
+                <ng-container *ngTemplateOutlet="noValidAccountsAlert"></ng-container>
+            }
+
+            @if (showField('reimbursableDefaultAccountPayableAccount')) {
                 <div class="tw-p-24-px tw-pt-0">
                     <app-alert [type]="'info'" [variant]="'subtle-bordered'">
                         <p>{{ 'sage50ExportSettings.reimbursableDefaultAccountPayableAccountInfo' | transloco }}</p>
diff --git a/src/app/integrations/sage50/sage50-shared/sage50-export-settings/sage50-export-settings.component.ts b/src/app/integrations/sage50/sage50-shared/sage50-export-settings/sage50-export-settings.component.ts
@@ -112,6 +112,10 @@ export class Sage50ExportSettingsComponent implements OnInit {
 
   isCCCExportGroupEditable = true;
 
+  isPerDiemEnabled = false;
+
+  isMileageEnabled = false;
+
   showPurchasesExportWarning: boolean = false;
 
   // State
@@ -331,6 +335,8 @@ export class Sage50ExportSettingsComponent implements OnInit {
     const extraAccountOptions = [
       exportSettings?.reimbursable_default_credit_line_account,
       exportSettings?.reimbursable_default_account_payable_account,
+      exportSettings?.default_per_diem_account,
+      exportSettings?.default_mileage_account,
       exportSettings?.ccc_default_credit_line_account,
       exportSettings?.ccc_default_account_payable_account,
       exportSettings?.default_cash_account
@@ -489,6 +495,9 @@ export class Sage50ExportSettingsComponent implements OnInit {
         this.isCCCEnabled = paymentModes.includes("CREDIT_CARD");
       }
 
+      this.isPerDiemEnabled = workspaces?.[0]?.org_settings.is_per_diem_enabled ?? false;
+      this.isMileageEnabled = workspaces?.[0]?.org_settings.is_mileage_enabled ?? false;
+
       this.accounts = [
         ...accountsPayable.results,
         ...longTermLiabilities.results,
@@ -498,7 +507,7 @@ export class Sage50ExportSettingsComponent implements OnInit {
       this.vendors = vendors.results;
 
       this.exportSettingsForm = this.exportSettingService.mapApiResponseToFormGroup(
-        exportSettings, this.isReimbursableEnabled, this.isCCCEnabled
+        exportSettings, this.isReimbursableEnabled, this.isCCCEnabled, this.isPerDiemEnabled, this.isMileageEnabled
       );
 
       // Initialize tracking variable for warning dialog with current form value
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -2486,6 +2486,12 @@
     "reimbursableDefaultAccountPayableAccountLabel": "Default accounts payable account",
     "reimbursableDefaultAccountPayableAccountSubLabel": "Select the accounts payable account where invoices should be posted.",
     "reimbursableDefaultAccountPayableAccountPlaceholder": "Select accounts payable account",
+    "defaultPerDiemAccountLabel": "Default per diem account",
+    "defaultPerDiemAccountSubLabel": "Select the Sage 50 account to use when exporting per diem expenses.",
+    "defaultPerDiemAccountPlaceholder": "Select per diem account",
+    "defaultMileageAccountLabel": "Default mileage account",
+    "defaultMileageAccountSubLabel": "Select the Sage 50 account to use when exporting mileage expenses.",
+    "defaultMileageAccountPlaceholder": "Select mileage account",
     "reimbursableExpenseStateLabel": "State of export",
     "reimbursableExpenseStateSubLabel": "Choose whether to export expenses after the reimbursement is initiated (Processing) or after the reimbursement is settled (Closed).",
     "reimbursableExpenseStatePlaceholder": "Select export state",

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ import { Workspace } from "../../db/workspaces.model";`
`4`	`4`	`export interface Sage50Workspace extends Workspace {`
`5`	`5`	`onboarding_state: Sage50OnboardingState`
`6`	`6`	`org_settings: {`
`7`		`- enabled_payment_modes: ("CREDIT_CARD" \| "REIMBURSABLE")[]`
	`7`	`+ enabled_payment_modes: ("CREDIT_CARD" \| "REIMBURSABLE")[],`
	`8`	`+ is_mileage_enabled: boolean,`
	`9`	`+ is_per_diem_enabled: boolean`
`8`	`10`	`}`
`9`	`11`	`}`