@zeniai/client-epic-state 4.7.74 → 4.7.76

package/lib/view/spendManagement/billPay/billDetailView/epics/fetchBillDetailEpic.js

@@ -27,6 +27,7 @@ const commonHistoryReducer_1 = require("../../../commonHistoryView/commonHistory
 const vendorListReducer_1 = require("../../../../vendorList/vendorListReducer");
 const billPayReviewReducer_1 = require("../../billPayReview/billPayReviewReducer");
 const paymentInstrumentReducer_1 = require("../../../../../entity/paymentInstrument/paymentInstrumentReducer");
+const recurringBillsReducer_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsReducer");
 const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billDetailViewReducer_1.fetchBillDetail.match), (0, operators_1.mergeMap)((action) => {
     const { billId, cacheOverride, isShowDeletedBillsEnabled } = action.payload;
     const detailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
@@ -71,6 +72,8 @@ const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                     : [];
                 const fetchActions = [
                     ...getVendorPreviousBillsActions(response.data.transaction),
+                    (0, recurringBillsReducer_1.updateRecurringBillConfigs)(response.data.recurring_bill_configs),
+                    (0, recurringBillsReducer_1.updateRecurringBills)(response.data.recurring_bills),
                     (0, billTransactionReducer_1.updateBillTransaction)(response.data.transaction),
                     (0, paymentAccountReducer_1.updatePaymentAccounts)(response.data.payment_accounts),
                     (0, accountReducer_1.updateAccounts)((_j = response.data.accounts) !== null && _j !== void 0 ? _j : [], 'bill_pay'),
@@ -91,8 +94,8 @@ const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                     // end: save all vendor related entities
                 ];
                 if (vendorInResponse == null &&
-                    response.data.transaction.candidate_vendor_name != null
-                    && response.data.transaction.candidate_vendor_name.length > 0) {
+                    response.data.transaction.candidate_vendor_name != null &&
+                    response.data.transaction.candidate_vendor_name.length > 0) {
                     fetchActions.push((0, vendorListReducer_1.fetchVendorsList)((_l = response.data) === null || _l === void 0 ? void 0 : _l.transaction.candidate_vendor_name));
                     fetchActions.push((0, billDetailViewReducer_1.waitForVendorByNameThenUpdateBillDetail)(billId, response.data, (_m = response.data.vendors[0]) === null || _m === void 0 ? void 0 : _m.vendor_id));
                 }

package/lib/view/spendManagement/billPay/billList/billListPayload.d.ts

@@ -6,6 +6,7 @@ import { VendorPayload } from '../../../../entity/vendor/vendorPayload';
 import { ZeniAPIResponse } from '../../../../responsePayload';
 import { ID } from '../../../../commonStateTypes/common';
 import { UserPayload } from '../../../../entity/user/userPayload';
+import { RecurringBillConfigResponsePayload } from '../../../../entity/billPay/recurringBills/recurringBillsPayload';
 export interface BillListPayload {
     customers: CustomerPayload[];
     query_definitions: Record<string, unknown>;
@@ -15,6 +16,7 @@ export interface BillListPayload {
     vendors: VendorPayload[];
     accounts: AccountBasePayload[];
     users: UserPayload[];
+    recurring_bill_configs: RecurringBillConfigResponsePayload[];
     query: {
         start_date: string;
         end_date: string;

package/lib/view/spendManagement/billPay/billList/billListSelector.d.ts

@@ -9,8 +9,11 @@ import { UserState } from '../../../../entity/user/userState';
 import { EntityApprovalStatusState } from '../../../../entity/entityApprovalStatus/entityApprovalStatusState';
 import { SortOrder } from '../../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { Approvers } from '../../../../entity/approvalRule/approvalRuleState';
+import { RecurringBillConfig } from '../../../../entity/billPay/recurringBills/recurringBillsState';
 export interface BillTransactionView extends BillTransaction {
     approvers: Approvers;
+    isRecurring: boolean;
+    recurringBillConfig?: RecurringBillConfig;
 }
 export interface BillListReport extends SelectorView {
     billOrder: EntityOrder;

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -15,7 +15,7 @@ const approvalRuleState_1 = require("../../../../entity/approvalRule/approvalRul
 const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
 const getBillList = (state, currentTimePeriod) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-    const { billListState, billTransactionState, billPayConfigState, entityApprovalStatusState, userState, } = state;
+    const { billListState, billTransactionState, billPayConfigState, entityApprovalStatusState, userState, recurringBillState, } = state;
     const key = (0, billListState_1.getBillListKey)(currentTimePeriod, billListState.currentTab);
     const pendingApprovalKey = (0, billListState_1.getBillListKey)(currentTimePeriod, 'pending_approval');
     const billPayBotEmail = (0, billPayConfigSelector_1.getBillPayConfigBotEmail)(billPayConfigState);
@@ -106,7 +106,15 @@ const getBillList = (state, currentTimePeriod) => {
         if (entityApprovalStatusState.entityApprovalStatusById[transaction.entityApprovalId] != null) {
             approvers = (0, exports.getApproversOrRejectors)(transaction, entityApprovalStatusState, userState);
         }
-        return Object.assign(Object.assign({}, transaction), { approvers });
+        const isRecurring = transaction.isRecurring;
+        let recurringBillDetail = undefined;
+        if (isRecurring && transaction.recurringBillConfigId != null) {
+            recurringBillDetail = (0, get_1.default)(recurringBillState.recurringBillDetailByConfigId, transaction.recurringBillConfigId, undefined);
+        }
+        const recurringBillConfig = recurringBillDetail === null || recurringBillDetail === void 0 ? void 0 : recurringBillDetail.recurringBillConfig;
+        return Object.assign(Object.assign({}, transaction), { approvers,
+            isRecurring,
+            recurringBillConfig });
     });
     transactionsView = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('bill_pay', transactionsView, billListState.filters);
     const TransactionsPendingForMyApprovalLength = pendingApprovalTransactionIDs.length;

package/lib/view/spendManagement/billPay/billList/fetchBillListPerTabEpic.d.ts

@@ -6,5 +6,6 @@ import { updateBillTransactions } from '../../../../entity/billPay/billTransacti
 import { RootState } from '../../../../reducer';
 import { updateEntityApprovalStatus } from '../../../../entity/entityApprovalStatus/entityApprovalStatusReducer';
 import { updateAllUsers } from '../../../../entity/user/userReducer';
-export declare type ActionType = ReturnType<typeof fetchBillListPerTab> | ReturnType<typeof updateBillTransactions> | ReturnType<typeof updateBillListByStatus> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateBillListFailure> | ReturnType<typeof updateEntityApprovalStatus>;
+import { updateRecurringBillConfigs, updateRecurringBills } from '../../../../entity/billPay/recurringBills/recurringBillsReducer';
+export declare type ActionType = ReturnType<typeof fetchBillListPerTab> | ReturnType<typeof updateBillTransactions> | ReturnType<typeof updateBillListByStatus> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateBillListFailure> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof updateRecurringBillConfigs> | ReturnType<typeof updateRecurringBills>;
 export declare const fetchBillListPerTabEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/billList/fetchBillListPerTabEpic.js

@@ -9,6 +9,7 @@ const billListReducer_1 = require("./billListReducer");
 const billTransactionReducer_1 = require("../../../../entity/billPay/billTransaction/billTransactionReducer");
 const entityApprovalStatusReducer_1 = require("../../../../entity/entityApprovalStatus/entityApprovalStatusReducer");
 const userReducer_1 = require("../../../../entity/user/userReducer");
+const recurringBillsReducer_1 = require("../../../../entity/billPay/recurringBills/recurringBillsReducer");
 const fetchBillListPerTabEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billListReducer_1.fetchBillListPerTab.match), (0, operators_1.mergeMap)((action) => {
     const { period, tab, isShowDeletedBillsEnabled } = action.payload;
     const queryParam = {
@@ -30,7 +31,8 @@ const fetchBillListPerTabEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [];
             updateActions.push((0, userReducer_1.updateAllUsers)({ users: (_a = response.data.users) !== null && _a !== void 0 ? _a : [] })),
-                updateActions.push((0, billTransactionReducer_1.updateBillTransactions)(response.data.transactions));
+                updateActions.push((0, recurringBillsReducer_1.updateRecurringBillConfigs)(response.data.recurring_bill_configs));
+            updateActions.push((0, billTransactionReducer_1.updateBillTransactions)(response.data.transactions));
             updateActions.push((0, billListReducer_1.updateBillListByStatus)({
                 billList: response.data,
                 tab: tab,

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.d.ts

@@ -5,6 +5,7 @@ import { BillTransaction } from '../../../../entity/billPay/billTransaction/bill
 import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 import { TransactionWithAccountAndClassLine } from '../../../../entity/transaction/stateTypes/transactionLine';
 import { Vendor } from '../../../../entity/vendor/vendorState';
+import { RecurringBillConfigLocalData } from '../editBillView/editBillViewState';
 import { PaymentDetailsSectionView } from '../editBillView/editBillViewSelector';
 import { Amount } from '../../../../commonStateTypes/amount';
 import { BillPayConfig } from '../billPayConfig/billPayConfigState';
@@ -20,6 +21,9 @@ export interface BillPayReviewSelectorView extends SelectorView {
     toAccountVendorEmail?: string;
     isCollectToAccountInfoFromVendorContact: boolean;
     billPayConfigList: BillPayConfig[];
+    isRecurring: boolean;
+    recurringBillInstance?: number;
+    recurringConfig?: RecurringBillConfigLocalData;
 }
 export interface DuplicateBillsSelectorView extends SelectorView {
     bills: BillTransaction[];

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -35,8 +35,8 @@ const getDuplicateBills = (state, billId) => {
 };
 exports.getDuplicateBills = getDuplicateBills;
 const getReviewPageBillDetail = (state, billId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    const { accountListState, accountState, setupViewState, billTransactionState, classListState, editBillDetailViewState, paymentAccountState, vendorState, contactState, billPayConfigState, } = state;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    const { accountListState, accountState, setupViewState, billTransactionState, classListState, editBillDetailViewState, paymentAccountState, vendorState, contactState, billPayConfigState, recurringBillState, } = state;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId !== null && billId !== void 0 ? billId : '');
     const sourceBillDetail = billId != null
         ? (_a = editBillDetailViewState.editBillStateById) === null || _a === void 0 ? void 0 : _a[key]
@@ -49,18 +49,31 @@ const getReviewPageBillDetail = (state, billId) => {
     const withdrawFromList = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, setupViewState.accountDetails.paymentAccountIds);
     let fetchState = 'Not-Started';
     let sourceBillDetailFetchState = 'Not-Started';
-    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
+    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'billPayAccountList');
     let toAccountVendorEmail = undefined;
     let isCollectToAccountInfoFromVendorContact = false;
+    let isRecurring = false;
+    let recurringBillInstance;
+    let recurringConfig;
     if (billId != null) {
         const transaction = (0, get_1.default)(billTransactionState.transactionById, billId, undefined);
         toAccountVendorEmail = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.toAccountVendorEmail;
         isCollectToAccountInfoFromVendorContact =
             (_b = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.isCollectToAccountInfoFromVendorContact) !== null && _b !== void 0 ? _b : false;
+        isRecurring = (_c = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _c !== void 0 ? _c : false;
+        if (isRecurring &&
+            (transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId) != null &&
+            transaction.recurringBillInstance != null) {
+            recurringBillInstance = (_d = transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillInstance) !== null && _d !== void 0 ? _d : 1;
+            const recurringBillDetail = (0, get_1.default)(recurringBillState.recurringBillDetailByConfigId, transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId, undefined);
+            if (recurringBillDetail != null) {
+                recurringConfig = Object.assign({}, recurringBillDetail.recurringBillConfig);
+            }
+        }
         if (sourceBillDetail != null) {
             sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)([
                 sourceBillDetail.fetchStatus,
-                accountListState.byReportId['accountList'],
+                accountListState.byReportId['billPayAccountList'],
                 classListState,
             ]).fetchState;
         }
@@ -90,6 +103,12 @@ const getReviewPageBillDetail = (state, billId) => {
         isCollectToAccountInfoFromVendorContact =
             sourceBillDetail.billDetailLocalData
                 .isCollectToAccountInfoFromVendorContact;
+        isRecurring = (_e = sourceBillDetail.billDetailLocalData.isRecurring) !== null && _e !== void 0 ? _e : false;
+        recurringConfig = sourceBillDetail.billDetailLocalData.recurringConfig;
+        if (isRecurring) {
+            recurringBillInstance =
+                (_g = (_f = sourceBillDetail.billDetailLocalData.recurringConfig) === null || _f === void 0 ? void 0 : _f.currentInstance) !== null && _g !== void 0 ? _g : 1;
+        }
         //add paymentToOption on initial bill load for collect from email
         if (isCollectToAccountInfoFromVendorContact &&
             toAccountVendorEmail != null &&
@@ -102,7 +121,7 @@ const getReviewPageBillDetail = (state, billId) => {
         }
     }
     const lineDetailSection = {};
-    const lineDetailSectionUpdatesByLineId = (_d = (_c = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData) === null || _c === void 0 ? void 0 : _c.updatesByLineId) !== null && _d !== void 0 ? _d : {};
+    const lineDetailSectionUpdatesByLineId = (_j = (_h = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData) === null || _h === void 0 ? void 0 : _h.updatesByLineId) !== null && _j !== void 0 ? _j : {};
     if (accountList.fetchState === 'Completed') {
         Object.keys(lineDetailSectionUpdatesByLineId).forEach((lineId) => {
             var _a;
@@ -120,9 +139,9 @@ const getReviewPageBillDetail = (state, billId) => {
     const { bills, fetchState: duplicateBillFetchState } = (0, exports.getDuplicateBills)(state, billId);
     fetchState = duplicateBillFetchState;
     const totalAmount = {
-        amount: (_f = (_e = sourceBillDetail.billDetailLocalData.totalAmount) === null || _e === void 0 ? void 0 : _e.amount) !== null && _f !== void 0 ? _f : 0,
-        currencyCode: (_h = (_g = sourceBillDetail.billDetailLocalData.totalAmount) === null || _g === void 0 ? void 0 : _g.currencyCode) !== null && _h !== void 0 ? _h : 'USD',
-        currencySymbol: (_k = (_j = sourceBillDetail.billDetailLocalData.totalAmount) === null || _j === void 0 ? void 0 : _j.currencySymbol) !== null && _k !== void 0 ? _k : '$',
+        amount: (_l = (_k = sourceBillDetail.billDetailLocalData.totalAmount) === null || _k === void 0 ? void 0 : _k.amount) !== null && _l !== void 0 ? _l : 0,
+        currencyCode: (_o = (_m = sourceBillDetail.billDetailLocalData.totalAmount) === null || _m === void 0 ? void 0 : _m.currencyCode) !== null && _o !== void 0 ? _o : 'USD',
+        currencySymbol: (_q = (_p = sourceBillDetail.billDetailLocalData.totalAmount) === null || _p === void 0 ? void 0 : _p.currencySymbol) !== null && _q !== void 0 ? _q : '$',
     };
     return {
         version: 0,
@@ -135,9 +154,12 @@ const getReviewPageBillDetail = (state, billId) => {
         paymentDetailsSection,
         file: file,
         billPayConfigList: (0, editBillViewSelector_1.getBillPayConfigList)(billPayConfigState),
-        saveStatus: (_l = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.saveStatus) !== null && _l !== void 0 ? _l : undefined,
+        saveStatus: (_r = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.saveStatus) !== null && _r !== void 0 ? _r : undefined,
         toAccountVendorEmail,
         isCollectToAccountInfoFromVendorContact,
+        isRecurring,
+        recurringBillInstance,
+        recurringConfig,
     };
 };
 exports.getReviewPageBillDetail = getReviewPageBillDetail;

package/lib/view/spendManagement/billPay/editBillView/editBillViewPayload.d.ts

@@ -9,6 +9,7 @@ import { VendorPayload } from '../../../../entity/vendor/vendorPayload';
 import { ZeniAPIResponse } from '../../../../responsePayload';
 import { TransactionWithAccountAndClassLine } from '../../../../entity/transaction/stateTypes/transactionLine';
 import { LineItemRecommendationsLocalData } from './editBillViewSelector';
+import { RecurringBillConfigResponsePayload, RecurringBillDataPayload } from '../../../../entity/billPay/recurringBills/recurringBillsPayload';
 export interface BillDetailPayload {
     transaction: BillTransactionPayload;
     bank_accounts: BankAccountPayload[];
@@ -27,6 +28,9 @@ export interface BillDetailQuery {
 }
 export interface BillSavePayload {
     transactions: BillTransactionPayload[];
+    recurring_bill_configs?: RecurringBillConfigResponsePayload[] | null;
+    recurring_bill_instances?: RecurringBillDataPayload[] | null;
+    future_recurring_bill_instances?: RecurringBillDataPayload[] | null;
 }
 export declare type BillDetailResponse = ZeniAPIResponse<BillDetailPayload>;
 export declare type BillSaveResponse = ZeniAPIResponse<BillSavePayload>;

package/lib/view/spendManagement/billPay/editBillView/editBillViewReducer.js

@@ -6,6 +6,7 @@ const toolkit_1 = require("@reduxjs/toolkit");
 const editBillViewState_1 = require("./editBillViewState");
 const billDetailViewState_1 = require("../billDetailView/billDetailViewState");
 const amount_1 = require("../../../../commonStateTypes/amount");
+const helpers_1 = require("../../helpers");
 exports.initialState = {
     newBillState: editBillViewState_1.initialBillDetail,
     editBillStateById: {},
@@ -82,14 +83,23 @@ const editBillView = (0, toolkit_1.createSlice)({
             },
         },
         saveBillUpdatesToLocalStore(draft, action) {
+            const recurringLocalConfig = action.payload.billDetailLocalData.recurringConfig;
             if (action.payload.billId != null) {
                 const billId = action.payload.billId;
                 const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
+                const prevRecurringConfig = draft.editBillStateById[key].billDetailLocalData.recurringConfig;
                 draft.editBillStateById[key].billDetailLocalData = Object.assign(Object.assign({}, draft.editBillStateById[key].billDetailLocalData), action.payload.billDetailLocalData);
                 draft.editBillStateById[key].billId = billId;
+                if (recurringLocalConfig != null) {
+                    doUpdateRecurringBillLocalData(draft.editBillStateById[key].billDetailLocalData, recurringLocalConfig, prevRecurringConfig);
+                }
             }
             else {
+                const prevRecurringConfig = draft.newBillState.billDetailLocalData.recurringConfig;
                 draft.newBillState.billDetailLocalData = Object.assign(Object.assign({}, draft.newBillState.billDetailLocalData), action.payload.billDetailLocalData);
+                if (recurringLocalConfig != null) {
+                    doUpdateRecurringBillLocalData(draft.newBillState.billDetailLocalData, recurringLocalConfig, prevRecurringConfig);
+                }
             }
         },
         discardBillUpdatesInLocalStore(draft, action) {
@@ -303,3 +313,10 @@ const editBillView = (0, toolkit_1.createSlice)({
 });
 _a = editBillView.actions, exports.fetchEditBillDetailPage = _a.fetchEditBillDetailPage, exports.fetchBillAndInitializeLocalStore = _a.fetchBillAndInitializeLocalStore, exports.fetchVendorByNameAndParseInvoice = _a.fetchVendorByNameAndParseInvoice, exports.initializeBillToLocalStore = _a.initializeBillToLocalStore, exports.saveBillUpdatesToLocalStore = _a.saveBillUpdatesToLocalStore, exports.discardBillUpdatesInLocalStore = _a.discardBillUpdatesInLocalStore, exports.saveBillDetail = _a.saveBillDetail, exports.saveBillSuccessOrFailure = _a.saveBillSuccessOrFailure, exports.updateEditBillFetchStateCompleted = _a.updateEditBillFetchStateCompleted, exports.parseInvoiceToBill = _a.parseInvoiceToBill, exports.clearEditBillViewDetail = _a.clearEditBillViewDetail, exports.waitForBillDetailThenInitializeLocalStore = _a.waitForBillDetailThenInitializeLocalStore, exports.waitForVendorByNameThenParsetoLocalStore = _a.waitForVendorByNameThenParsetoLocalStore, exports.updateInternationalTransferFeeBearerPaymentMethodInLocalData = _a.updateInternationalTransferFeeBearerPaymentMethodInLocalData, exports.updateShowAutofill = _a.updateShowAutofill, exports.updateAddBillAutoFields = _a.updateAddBillAutoFields, exports.updateBillUploadFetchState = _a.updateBillUploadFetchState, exports.updateRecommendedVendorId = _a.updateRecommendedVendorId, exports.updateSuggestedVendorIdFromParsedInvoice = _a.updateSuggestedVendorIdFromParsedInvoice, exports.updateVendorContact = _a.updateVendorContact, exports.updateVendorContactSuccessOrFailure = _a.updateVendorContactSuccessOrFailure, exports.convertAmountToHomeCurrency = _a.convertAmountToHomeCurrency, exports.currencyConversionValueSuccessOrFailure = _a.currencyConversionValueSuccessOrFailure, exports.updateHomeCurrencyConversion = _a.updateHomeCurrencyConversion;
 exports.default = editBillView.reducer;
+function doUpdateRecurringBillLocalData(billDetail, currentConfig, prevConfig) {
+    var _a, _b, _c, _d;
+    const recurringBillDetail = (0, helpers_1.updateRecurringBillDetails)(currentConfig, prevConfig, billDetail.recurringBillInstances, (_a = billDetail.totalAmount) === null || _a === void 0 ? void 0 : _a.amount);
+    billDetail.recurringConfig = Object.assign({ id: (_b = prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.id) !== null && _b !== void 0 ? _b : (_c = billDetail.recurringConfig) === null || _c === void 0 ? void 0 : _c.id }, recurringBillDetail.recurringConfig);
+    billDetail.recurringBillInstances =
+        (_d = recurringBillDetail.recurringInstances) !== null && _d !== void 0 ? _d : [];
+}

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.d.ts

@@ -2,7 +2,7 @@ import { FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { RootState } from '../../../../reducer';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
 import { Amount } from '../../../../commonStateTypes/amount';
-import { BillPayInfo, BillPaymentMethod, BillStageCodeType, InternationalTransferFeeBearerPaymentMethod } from '../../../../entity/billPay/billTransaction/billTransactionState';
+import { BillPayInfo, BillPaymentMethod, BillStageCodeType, BillTransaction, InternationalTransferFeeBearerPaymentMethod } from '../../../../entity/billPay/billTransaction/billTransactionState';
 import { PaymentAccount } from '../../../../entity/paymentAccount/paymentAccountState';
 import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 import { TransactionWithAccountAndClassLine } from '../../../../entity/transaction/stateTypes/transactionLine';
@@ -11,7 +11,7 @@ import { ZeniDate } from '../../../../zeniDayJS';
 import { AccountListSelectorView } from '../../../accountList/accountListSelector';
 import { ClassListSelectorView } from '../../../classList/classListSelector';
 import { PreviousBillsSelectorView } from '../previousBills/previousBillsSelector';
-import { AddBillAutoFields, WhatForSection, PaymentModeType, PaymentMode } from './editBillViewState';
+import { AddBillAutoFields, WhatForSection, PaymentModeType, PaymentMode, RecurringBillConfigLocalData, RecurringBillInstance } from './editBillViewState';
 import { BillActivity } from '../billDetailView/billDetailViewSelector';
 import { BillPaySetupApproverView } from '../billPaySetupApproverView/billPaySetupApproverViewSelectorTypes';
 import { User } from '../../../../entity/user/userState';
@@ -25,6 +25,7 @@ import { RecommendationByLineId } from '../../../../entity/transaction/stateType
 import { VendorDetailLocalData } from '../../../commonVendorView/vendorView/vendorViewState';
 import { AccountBase, RecommendedAccountBase } from '../../../../entity/account/accountState';
 import { ClassBase, RecommendedClassBase } from '../../../../entity/class/classState';
+import { RecurringBillState } from '../../../../entity/billPay/recurringBills/recurringBillsState';
 export declare type PaymentToOption = {
     id: ID;
     type: PaymentModeType;
@@ -98,6 +99,9 @@ export interface EditBillDetailSelectorView extends SelectorView {
     recommendationByLineID?: RecommendationByLineId;
     vendorDetailLocalData?: VendorDetailLocalData;
     recommendedVendor?: Vendor;
+    isRecurring: boolean;
+    recurringConfig?: RecurringBillConfigLocalData;
+    recurringBillInstances?: RecurringBillInstance[];
 }
 export interface EditBillInitialDetails {
     vendor?: Vendor;
@@ -120,3 +124,7 @@ export interface PaymentDetailsSectionView {
     internationalTransferFeeBearerPaymentMethod?: InternationalTransferFeeBearerPaymentMethod;
     conversionRate?: number;
 }
+export declare const getRecurringBillLocalData: (recurringBillState: RecurringBillState, transaction: BillTransaction) => {
+    recurringBillInstancesLocalData: RecurringBillInstance[];
+    recurringConfigLocalData?: RecurringBillConfigLocalData | undefined;
+};

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentPaymentToOption = exports.toPaymentToOption = exports.getPaymentMethodType = exports.getBillPayConfigList = exports.getEditBillDetail = void 0;
+exports.getRecurringBillLocalData = exports.getCurrentPaymentToOption = exports.toPaymentToOption = exports.getPaymentMethodType = exports.getBillPayConfigList = exports.getEditBillDetail = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const has_1 = __importDefault(require("lodash/has"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
@@ -28,8 +28,8 @@ const billPayReviewSelector_1 = require("../billPayReview/billPayReviewSelector"
 const paymentInstrumentSelector_1 = require("../../../../entity/paymentInstrument/paymentInstrumentSelector");
 const billPayConfigPayload_1 = require("../billPayConfig/billPayConfigPayload");
 const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
-    const { accountListState, accountState, bankAccountState, billDetailViewState, setupViewState, billTransactionState, billPayConfigState, classListState, classState, editBillDetailViewState, paymentAccountState, vendorState, tenantState, companyState, userState, commonHistoryState, contactState, paymentInstrumentState, } = state;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
+    const { accountListState, accountState, bankAccountState, billDetailViewState, setupViewState, billTransactionState, billPayConfigState, classListState, classState, editBillDetailViewState, paymentAccountState, vendorState, tenantState, companyState, userState, commonHistoryState, contactState, paymentInstrumentState, recurringBillState, } = state;
     let transaction = null;
     let recommendations = {};
     if (billId != null) {
@@ -85,10 +85,13 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
         paymentDetailsSection: getPaymentSection(state, withdrawFromList, {}),
         totalAmount: sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData.totalAmount,
     };
-    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
+    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'billPayAccountList');
     let billPayInfo = undefined;
     let toAccountVendorEmail = undefined;
     let isCollectToAccountInfoFromVendorContact = false;
+    let isRecurring = false;
+    let recurringConfig;
+    let recurringBillInstances;
     if (billId != null) {
         const transaction = (0, get_1.default)(billTransactionState.transactionById, billId, undefined);
         isDeleted = (_f = transaction === null || transaction === void 0 ? void 0 : transaction.isDeleted) !== null && _f !== void 0 ? _f : false;
@@ -147,17 +150,24 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
             if (billViewState != null) {
                 fetchState = (0, reduceFetchState_1.reduceFetchState)([
                     billViewState,
-                    accountListState.byReportId.accountList,
+                    accountListState.byReportId.billPayAccountList,
                     classListState,
                 ]).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = (0, billDetailViewSelector_1.getBillActivities)(state, billId, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.stage.code);
             }
         }
+        //recurringBill Details
+        isRecurring = (_r = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _r !== void 0 ? _r : false;
+        if (isRecurring && transaction != null) {
+            const { recurringConfigLocalData, recurringBillInstancesLocalData } = (0, exports.getRecurringBillLocalData)(recurringBillState, transaction);
+            recurringConfig = recurringConfigLocalData;
+            recurringBillInstances = recurringBillInstancesLocalData;
+        }
     }
     else {
         fetchState = (0, reduceFetchState_1.reduceFetchState)([
-            accountListState.byReportId['accountList'],
+            accountListState.byReportId.billPayAccountList,
             classListState,
         ]).fetchState;
     }
@@ -177,9 +187,9 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
                 ? (0, vendorSelector_1.getVendorByVendorId)(vendorState, updatedRecord.vendor.id)
                 : undefined;
         file = updatedRecord.file != null ? updatedRecord.file : undefined;
-        const bankAccInBill = (0, bankAccountSelector_1.getBankAccountByBankAccountId)(bankAccountState, (_s = (_r = updatedRecord.paymentDetailsSection) === null || _r === void 0 ? void 0 : _r.paymentTo) !== null && _s !== void 0 ? _s : '');
-        const vendorBankAccounts = (0, bankAccountSelector_1.getBankAccountsByBankAccountIds)(bankAccountState, (_t = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.bankAccountIds) !== null && _t !== void 0 ? _t : []);
-        const vendorPaymentInstruments = (0, paymentInstrumentSelector_1.getPaymentInstrumentsByIds)(paymentInstrumentState, (_u = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.paymentInstrumentIds) !== null && _u !== void 0 ? _u : []);
+        const bankAccInBill = (0, bankAccountSelector_1.getBankAccountByBankAccountId)(bankAccountState, (_t = (_s = updatedRecord.paymentDetailsSection) === null || _s === void 0 ? void 0 : _s.paymentTo) !== null && _t !== void 0 ? _t : '');
+        const vendorBankAccounts = (0, bankAccountSelector_1.getBankAccountsByBankAccountIds)(bankAccountState, (_u = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.bankAccountIds) !== null && _u !== void 0 ? _u : []);
+        const vendorPaymentInstruments = (0, paymentInstrumentSelector_1.getPaymentInstrumentsByIds)(paymentInstrumentState, (_v = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.paymentInstrumentIds) !== null && _v !== void 0 ? _v : []);
         const isBankAccInBillExistInVendor = bankAccInBill != null
             ? vendorBankAccounts
                 .map((bankAc) => bankAc.bankAccountId)
@@ -229,6 +239,10 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
             (recommendedVendor === null || recommendedVendor === void 0 ? void 0 : recommendedVendor.vendorCurrencyCode) != null) {
             whatForSection.currencyCode = recommendedVendor.vendorCurrencyCode;
         }
+        isRecurring = (_w = sourceBillDetail.billDetailLocalData.isRecurring) !== null && _w !== void 0 ? _w : false;
+        recurringConfig = sourceBillDetail.billDetailLocalData.recurringConfig;
+        recurringBillInstances =
+            sourceBillDetail.billDetailLocalData.recurringBillInstances;
         //add paymentToOption on initial bill load for collect from email
         if (isCollectToAccountInfoFromVendorContact &&
             toAccountVendorEmail != null &&
@@ -245,7 +259,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
     }
     const vendorContactSaveStatus = editBillDetailViewState.updateVendorContactState;
     const lineDetailSection = {};
-    const lineDetailSectionUpdatesByLineId = (_w = (_v = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData) === null || _v === void 0 ? void 0 : _v.updatesByLineId) !== null && _w !== void 0 ? _w : {};
+    const lineDetailSectionUpdatesByLineId = (_y = (_x = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData) === null || _x === void 0 ? void 0 : _x.updatesByLineId) !== null && _y !== void 0 ? _y : {};
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
     if (accountList.fetchState === 'Completed') {
         Object.keys(lineDetailSectionUpdatesByLineId).forEach((lineId) => {
@@ -263,16 +277,16 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
         });
     }
     const billHistory = (0, commonHistorySelector_1.getActivityHistory)(commonHistoryState, billId !== null && billId !== void 0 ? billId : '', 'bill_pay');
-    const accountsHeirarchyList = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, 'accountList');
+    const accountsHeirarchyList = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, 'billPayAccountList');
     const classHeirarchyList = (0, classListSelector_1.getNestedClassListHeirarchy)(classListState);
     const duplicateBills = (0, billPayReviewSelector_1.getDuplicateBills)(state, billId);
     return {
         recommendedVendor,
         duplicateBills,
         fetchState: fetchState,
-        saveStatus: (_x = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.saveStatus) !== null && _x !== void 0 ? _x : undefined,
-        error: (_z = (_y = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.fetchStatus) === null || _y === void 0 ? void 0 : _y.error) !== null && _z !== void 0 ? _z : undefined,
-        uploadStatus: (_0 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.uploadFetchState) !== null && _0 !== void 0 ? _0 : undefined,
+        saveStatus: (_z = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.saveStatus) !== null && _z !== void 0 ? _z : undefined,
+        error: (_1 = (_0 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.fetchStatus) === null || _0 === void 0 ? void 0 : _0.error) !== null && _1 !== void 0 ? _1 : undefined,
+        uploadStatus: (_2 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.uploadFetchState) !== null && _2 !== void 0 ? _2 : undefined,
         version: 0,
         createdBy,
         createTime,
@@ -308,6 +322,9 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
         classHeirarchyList,
         latestApprovedDate: (0, helpers_1.getLatestApprovalDate)(billActivities),
         recommendationByLineID: recommendations,
+        isRecurring,
+        recurringBillInstances,
+        recurringConfig,
     };
 };
 exports.getEditBillDetail = getEditBillDetail;
@@ -459,3 +476,31 @@ function getCurrentPaymentToOption(state, id) {
     return selectedOption != null ? toPaymentToOption(selectedOption) : undefined;
 }
 exports.getCurrentPaymentToOption = getCurrentPaymentToOption;
+const getRecurringBillLocalData = (recurringBillState, transaction) => {
+    let recurringConfigLocalData = undefined;
+    let recurringBillInstancesLocalData = [];
+    let recurringBillDetail = undefined;
+    if (transaction.recurringBillConfigId != null) {
+        recurringBillDetail = (0, get_1.default)(recurringBillState.recurringBillDetailByConfigId, transaction.recurringBillConfigId, undefined);
+    }
+    if (recurringBillDetail != null) {
+        const { recurringBillInstances: currentRecurringBillInstances, recurringBillConfig, } = recurringBillDetail;
+        recurringBillInstancesLocalData = [...currentRecurringBillInstances]
+            .map((recurringBill) => ({
+            instance: recurringBill.instance,
+            amount: recurringBill.amount,
+            stage: recurringBill.stage,
+            paymentDate: recurringBill.paymentDate,
+            vendorReceiveDate: recurringBill.vendorReceiveDate,
+            vendorReceiveDateNotes: recurringBill.vendorReceiveDateNotes,
+            readonly: transaction.recurringBillInstance != null
+                ? recurringBill.instance < transaction.recurringBillInstance
+                : false,
+            transactionId: recurringBill.transactionId,
+        }))
+            .sort((a, b) => a.instance - b.instance);
+        recurringConfigLocalData = Object.assign(Object.assign({}, recurringBillConfig), { currentInstance: transaction.recurringBillInstance });
+    }
+    return { recurringConfigLocalData, recurringBillInstancesLocalData };
+};
+exports.getRecurringBillLocalData = getRecurringBillLocalData;

package/lib/view/spendManagement/billPay/editBillView/editBillViewState.d.ts

@@ -11,6 +11,8 @@ import { InternationalTransferFeeBearerPaymentMethod } from '../../../../entity/
 import { PaymentInstrument } from '../../../../entity/paymentInstrument/paymentInstrument';
 import { BankAccount } from '../../../../entity/bankAccount/bankAccount';
 import { Contact } from '../../../../entity/billPay/contact/contact';
+import { RecurringBillFrequency } from '../../../../entity/billPay/recurringBills/recurringBillsState';
+import { BillStage } from '../../../../entity/billPay/billTransaction/billTransactionState';
 export interface EditBillDetail {
     fetchStatus: FetchStateAndError;
     saveStatus: FetchStateAndError;
@@ -28,6 +30,16 @@ export interface EditBillDetailViewState {
     editBillStateById: Record<BillTransactionDetailKey, EditBillDetail>;
     updateVendorContactState: FetchStateAndError;
 }
+export interface RecurringBillInstance {
+    instance: number;
+    vendorReceiveDate: ZeniDate;
+    vendorReceiveDateNotes: string;
+    amount?: number;
+    stage?: BillStage;
+    readonly?: boolean;
+    paymentDate?: ZeniDate;
+    transactionId?: ID;
+}
 export interface BillDetailLocalData {
     vendor?: Vendor;
     candidateVendorname?: string;
@@ -42,6 +54,9 @@ export interface BillDetailLocalData {
     isCollectToAccountInfoFromVendorContact: boolean;
     currencyConversionState?: FetchStateAndError;
     recommendedVendorId?: ID;
+    isRecurring: boolean;
+    recurringConfig?: RecurringBillConfigLocalData;
+    recurringBillInstances?: RecurringBillInstance[];
 }
 export interface WhatForSection {
     invoiceNumber?: string;
@@ -73,3 +88,16 @@ export declare const PAYMENT_MODE_TYPE: readonly ["BankAccount", "Contact", "Pay
 export declare const toPaymentModeType: (v: string) => "BankAccount" | "Contact" | "PaymentInstrument";
 export declare type PaymentModeType = ReturnType<typeof toPaymentModeType>;
 export declare type PaymentMode = BankAccount | PaymentInstrument | Contact;
+export declare type EditRecurringBillType = 'current' | 'all';
+export interface RecurringBillConfigLocalData {
+    isApprovalRequired: boolean;
+    frequency?: RecurringBillFrequency;
+    totalPaymentCycles: number;
+    id?: ID;
+    startDate?: ZeniDate;
+    endDate?: ZeniDate;
+    currentInstance?: number;
+    endDateSelectorOptionType?: 'date' | 'payments';
+    isActive: boolean;
+    updateRecurringBills?: EditRecurringBillType;
+}

package/lib/view/spendManagement/billPay/editBillView/editBillViewState.js

@@ -35,6 +35,7 @@ exports.initialBillDetail = {
         isCancelled: false,
         toAccountVendorEmail: undefined,
         isCollectToAccountInfoFromVendorContact: false,
+        isRecurring: false,
     },
     showSkipAutofill: true,
     addBillAutoFields: {

package/lib/view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic.js

@@ -16,7 +16,7 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
     const billDetailActions = [];
     const state = state$.value;
     if (cacheOverride == true) {
-        billDetailActions.push((0, accountListReducer_1.fetchAccountList)('accountList', true));
+        billDetailActions.push((0, accountListReducer_1.fetchAccountList)('billPayAccountList', true, true, true));
         billDetailActions.push((0, classListReducer_1.fetchClassList)());
         billDetailActions.push((0, vendorTypeListReducer_1.fetchVendorTypeList)());
         billDetailActions.push((0, ownerListReducer_1.fetchOwnerList)());
@@ -35,10 +35,10 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
             state.ownerListState.hasValidState() === false) {
             billDetailActions.push((0, ownerListReducer_1.fetchOwnerList)());
         }
-        const accountList = state.accountListState.byReportId.accountList;
+        const accountList = state.accountListState.byReportId['billPayAccountList'];
         if (accountList.hasValidState() === false &&
             accountList.fetchState !== 'In-Progress') {
-            billDetailActions.push((0, accountListReducer_1.fetchAccountList)('accountList', true));
+            billDetailActions.push((0, accountListReducer_1.fetchAccountList)('billPayAccountList', true, true, true));
         }
         const classList = state.classListState;
         if (classList.hasValidState() === false &&

package/lib/view/spendManagement/billPay/editBillView/epics/initializeBillToLocalStoreEpic.js

@@ -94,8 +94,8 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
     const editBillState = (0, get_1.default)(state.editBillDetailViewState.editBillStateById, detailKey, undefined);
     const billDetail = (0, get_1.default)(state.billDetailViewState.billDetailById, detailKey, undefined);
     const transaction = (0, get_1.default)(state.billTransactionState.transactionById, billId, undefined);
-    const { accountListState, accountState, classListState, classState } = state;
-    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
+    const { accountListState, accountState, classListState, classState, recurringBillState, } = state;
+    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'billPayAccountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
     const recommendations = transaction === null || transaction === void 0 ? void 0 : transaction.recommendations;
     /* check vendor info is present in local store or not.
@@ -155,6 +155,14 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
         const candidateVendorname = transaction.candidateVendorName;
         const toAccountVendorEmail = transaction.billPayInfo.toAccountVendorEmail;
         const isCollectToAccountInfoFromVendorContact = transaction.billPayInfo.isCollectToAccountInfoFromVendorContact;
+        const isRecurring = transaction.isRecurring;
+        let recurringConfig;
+        let recurringBillInstances = undefined;
+        if (isRecurring) {
+            const { recurringConfigLocalData, recurringBillInstancesLocalData } = (0, editBillViewSelector_1.getRecurringBillLocalData)(recurringBillState, transaction);
+            recurringConfig = recurringConfigLocalData;
+            recurringBillInstances = recurringBillInstancesLocalData;
+        }
         const billDetailLocalData = {
             vendor,
             whatForSection,
@@ -166,6 +174,9 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
             candidateVendorname,
             toAccountVendorEmail,
             isCollectToAccountInfoFromVendorContact,
+            isRecurring,
+            recurringConfig,
+            recurringBillInstances,
         };
         const actions = [
             (0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({ billDetailLocalData, billId }),