@zeniai/client-epic-state 4.7.74 → 4.7.75

package/lib/view/accountList/accountListReducer.js

@@ -27,6 +27,7 @@ exports.initialState = {
     byReportId: {
         accountList: exports.initialAccountList,
         reimbursementAccountList: exports.initialAccountList,
+        billPayAccountList: exports.initialAccountList,
     },
 };
 const accountList = (0, toolkit_1.createSlice)({
@@ -40,7 +41,7 @@ const accountList = (0, toolkit_1.createSlice)({
                 const existingData = draft.byReportId[action.payload.accountListKey];
                 draft.byReportId[action.payload.accountListKey] = Object.assign(Object.assign({}, existingData), { fetchState: 'In-Progress', error: undefined });
             },
-            prepare(accountListKey, fetchFullResponse = false, excludeAccountPayableAccounts = true, excludeAccountReceivableAccounts = true, isLimitedCategoryEnabled = false) {
+            prepare(accountListKey, fetchFullResponse = false, excludeAccountPayableAccounts = false, excludeAccountReceivableAccounts = false, isLimitedCategoryEnabled = false) {
                 return {
                     payload: {
                         accountListKey,

package/lib/view/accountList/accountListState.d.ts

@@ -1,7 +1,7 @@
 import { NestedAccountHeirarchyForReport } from '../../commonStateTypes/accountView/nestedAccountID';
 import { FetchedState, ID } from '../../commonStateTypes/common';
 import { AccountLabel } from '../../entity/account/accountState';
-export declare type AccountListKeyType = 'accountList' | 'reimbursementAccountList';
+export declare type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'billPayAccountList';
 export interface AccountList extends FetchedState {
     accountIds: ID[];
     accountIdsByLabel: Record<AccountLabel, ID[]>;

package/lib/view/commonVendorView/vendorView/epics/saveVendorEpic.js

@@ -108,6 +108,7 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                         paymentDetailsSection: Object.assign(Object.assign({}, billInLocalStore.billDetailLocalData
                             .paymentDetailsSection), { paymentTo: undefined, internationalTransferFeeBearerPaymentMethod: updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.preferredInternationalTransferFeeBearerPaymentMethod }),
                         isCollectToAccountInfoFromVendorContact: false,
+                        isRecurring: false,
                     },
                     billId: action.payload.billId,
                 }), (0, editBillViewReducer_1.updateRecommendedVendorId)());

package/lib/view/commonVendorView/vendorView/vendorViewSelector.js

@@ -22,7 +22,7 @@ const recommendationSelector_1 = require("../../recommendation/recommendationSel
 const getVendorView = (state, vendorIdFromUrl) => {
     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, _3;
     const { accountListState, accountState, addressViewState, bankAccountState, classListState, billPayConfigState, classState, vendorTypeListState, vendorState, vendorViewState, addressState, userState, paymentInstrumentState, } = state;
-    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
+    const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'billPayAccountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
     const vendorTypeList = vendorTypeListState.vendorTypes;
     const ownerList = (0, userSelector_1.getUsersByUserIds)(state.userState, state.ownerListState.ownerIds);
@@ -112,7 +112,7 @@ const getVendorView = (state, vendorIdFromUrl) => {
             (configDetails.method.includes('international') === true &&
                 configDetails.isEnabled === true));
     }, false);
-    const accountsHeirarchyList = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, 'accountList');
+    const accountsHeirarchyList = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, 'billPayAccountList');
     const classHeirarchyList = (0, classListSelector_1.getNestedClassListHeirarchy)(classListState);
     const loggedInUserVerification = Object.assign(Object.assign({}, vendorViewState.loggedInUserVerification), { phone: (_1 = vendorViewState.loggedInUserVerification.phone) !== null && _1 !== void 0 ? _1 : (_3 = (0, userSelector_1.getUserByUserId)(userState, (_2 = vendorViewState.loggedInUserVerification.userId) !== null && _2 !== void 0 ? _2 : '')) === null || _3 === void 0 ? void 0 : _3.phone });
     return Object.assign(Object.assign({}, bankAccount), { bankAccountCreationState: {

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewPayload.d.ts

@@ -8,6 +8,7 @@ import { UserPayload } from '../../../../entity/user/userPayload';
 import { ZeniAPIResponse } from '../../../../responsePayload';
 import { VendorPayload } from '../../../../entity/vendor/vendorPayload';
 import { PaymentInstrumentPayload } from '../../../../entity/paymentInstrument/paymentInstrumentPayload';
+import { RecurringBillConfigResponsePayload, RecurringBillDataPayload } from '../../../../entity/billPay/recurringBills/recurringBillsPayload';
 export interface ApproveOrRejectBillPayload {
     approval_rules: ApprovalRulePayload[];
     users: UserPayload[];
@@ -20,6 +21,8 @@ export interface BillDetailViewPayload extends ApproveOrRejectBillPayload {
     payment_accounts: PaymentAccountPayload[];
     accounts: AccountPayload[];
     vendors: VendorPayload[];
+    recurring_bill_configs: RecurringBillConfigResponsePayload[];
+    recurring_bills: RecurringBillDataPayload[];
     query: BillDetailQuery;
     query_definitions: Record<string, unknown>;
 }

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.d.ts

@@ -18,6 +18,7 @@ import { ActivityRealTimeApprovalSelectorView } from '../../realTimeApprovalView
 import { UserAndRole } from '../../../companyView/types/userAndRole';
 import { Class } from '../../../../entity/class/classState';
 import { PaymentInstrument } from '../../../../entity/paymentInstrument/paymentInstrument';
+import { RecurringBillConfig, RecurringBillData } from '../../../../entity/billPay/recurringBills/recurringBillsState';
 export interface BillDetailViewSelector extends SelectorView {
     transactionDetails: BillTransaction | undefined;
     createdBy: User | undefined;
@@ -43,6 +44,9 @@ export interface BillDetailViewSelector extends SelectorView {
     approvalType?: BillApprovalType;
     paymentMethodType?: BillPayConfig;
     latestApprovedDate?: ZeniDate;
+    isRecurring: boolean;
+    recurringBillInstances?: RecurringBillData[];
+    recurringBillConfigDetail?: RecurringBillConfig;
 }
 export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
@@ -56,6 +60,7 @@ export interface ActorActivityWithUser {
     userId: ID;
     type: string;
     subType?: string;
+    isRecurringAutoApprove: boolean;
 }
 export interface BillActivity {
     approvalRuleId?: ID;

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.js

@@ -83,8 +83,8 @@ const getBillActivities = (state, billId, billStageCode) => {
 };
 exports.getBillActivities = getBillActivities;
 const getBillDetailView = (state, billId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    const { accountState, bankAccountState, paymentInstrumentState, billDetailViewState, billTransactionState, paymentAccountState, userState, billPayConfigState, userRoleState, classListState, classState, commonHistoryState, realTimeApprovalState, entityApprovalStatusState, billPaySetupApproverViewState, vendorState, } = state;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    const { accountState, bankAccountState, paymentInstrumentState, billDetailViewState, billTransactionState, paymentAccountState, userState, billPayConfigState, userRoleState, classListState, classState, commonHistoryState, realTimeApprovalState, entityApprovalStatusState, billPaySetupApproverViewState, vendorState, recurringBillState, } = state;
     const { approverListState } = billPaySetupApproverViewState;
     const detailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId !== null && billId !== void 0 ? billId : '');
     const billTransactionDetails = (0, get_1.default)(billDetailViewState.billDetailById, detailKey, undefined);
@@ -184,6 +184,14 @@ const getBillDetailView = (state, billId) => {
         reportId: 'class_list',
     });
     const currentVendorDetails = (0, get_1.default)(vendorState.vendorByID, (_o = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.vendorId) !== null && _o !== void 0 ? _o : '', undefined);
+    const isRecurring = (_p = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _p !== void 0 ? _p : false;
+    let recurringBillConfigDetail = undefined;
+    let recurringBillInstances = undefined;
+    if (isRecurring && (transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId) != null) {
+        const recurringBillDetail = (0, get_1.default)(recurringBillState.recurringBillDetailByConfigId, transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId, undefined);
+        recurringBillConfigDetail = recurringBillDetail === null || recurringBillDetail === void 0 ? void 0 : recurringBillDetail.recurringBillConfig;
+        recurringBillInstances = recurringBillDetail === null || recurringBillDetail === void 0 ? void 0 : recurringBillDetail.recurringBillInstances;
+    }
     return {
         fetchState: fetchState.fetchState,
         error: fetchState.error,
@@ -212,6 +220,9 @@ const getBillDetailView = (state, billId) => {
         approvalType,
         paymentMethodType: paymentMethodWithBillFees,
         latestApprovedDate: (0, helpers_1.getLatestApprovalDate)(billActivities),
+        isRecurring,
+        recurringBillInstances,
+        recurringBillConfigDetail,
     };
 };
 exports.getBillDetailView = getBillDetailView;

package/lib/view/spendManagement/billPay/billDetailView/epics/cancelAndDeleteBillEpic.d.ts

@@ -5,7 +5,8 @@ import { cancelAndDeleteBill, cancelAndDeleteBillSuccessOrFailure } from '../bil
 import { removeTransactionIdFromBillTabList } from '../../billList/billListReducer';
 import { removeBillTransaction } from '../../../../../entity/billPay/billTransaction/billTransactionReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-export declare type ActionType = ReturnType<typeof cancelAndDeleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof cancelAndDeleteBillSuccessOrFailure> | ReturnType<typeof removeTransactionIdFromBillTabList>;
+import { removeRecurringBill } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
+export declare type ActionType = ReturnType<typeof cancelAndDeleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof cancelAndDeleteBillSuccessOrFailure> | ReturnType<typeof removeTransactionIdFromBillTabList> | ReturnType<typeof removeRecurringBill>;
 export declare const cancelAndDeleteBillEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
     payload: import("../../../../../entity/billPay/billTransaction/billTransactionPayload").BillTransactionPayload;
     type: string;

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

@@ -9,22 +9,30 @@ const responsePayload_1 = require("../../../../../responsePayload");
 const billTransactionReducer_1 = require("../../../../../entity/billPay/billTransaction/billTransactionReducer");
 const billDetailViewState_1 = require("../billDetailViewState");
 const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
+const recurringBillsReducer_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsReducer");
 const cancelAndDeleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billDetailViewReducer_1.cancelAndDeleteBill.match), (0, operators_1.mergeMap)((action) => {
+    var _a;
     const query = {
         bill_pay_provider: 'zeni',
         is_delete_bill: action.payload.isDeleteBill,
     };
     const { billTransactionState } = state$.value;
     const transaction = billTransactionState.transactionById[action.payload.billId];
-    return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}/cancel-payment`, query)
-        .pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b;
+    const isRecurring = (_a = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _a !== void 0 ? _a : false;
+    const recurringConfigId = transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId;
+    let cancelApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
+    if (isRecurring === true) {
+        cancelApiUrl = `${cancelApiUrl}/recurring/cancel-payment`;
+    }
+    else {
+        cancelApiUrl = `${cancelApiUrl}/cancel-payment`;
+    }
+    return zeniAPI.putAndGetJSON(cancelApiUrl, query).pipe((0, operators_1.mergeMap)((response) => {
+        var _a;
         if (action.payload.isDeleteBill === true &&
             (0, responsePayload_1.isSuccessStatus)(response)) {
-            const actions = [
-                (0, billDetailViewReducer_1.cancelAndDeleteBillSuccessOrFailure)('Completed', action.payload.billId, action.payload.isDeleteBill),
-            ];
+            const actions = [];
+            actions.push((0, billDetailViewReducer_1.cancelAndDeleteBillSuccessOrFailure)('Completed', action.payload.billId, action.payload.isDeleteBill));
             if (transaction != null) {
                 actions.push((0, billListReducer_1.removeTransactionIdFromBillTabList)({
                     billId: action.payload.billId,
@@ -32,6 +40,9 @@ const cancelAndDeleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                 }));
             }
             actions.push((0, billTransactionReducer_1.removeBillTransaction)((0, billDetailViewState_1.getBillTransactionDetailKey)(action.payload.billId)));
+            if (isRecurring === true && recurringConfigId != null) {
+                actions.push((0, recurringBillsReducer_1.removeRecurringBill)(recurringConfigId));
+            }
             actions.push((0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'bill_pay_cancelled_deleted',
                 messageText: 'success',
@@ -41,7 +52,7 @@ const cancelAndDeleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
         }
         else if ((0, responsePayload_1.isSuccessResponse)(response) &&
             response.data != null &&
-            ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.transactions[0]) === null || _b === void 0 ? void 0 : _b.transaction_id) != null) {
+            ((_a = response.data.transactions[0]) === null || _a === void 0 ? void 0 : _a.transaction_id) != null) {
             return (0, rxjs_1.of)((0, billTransactionReducer_1.updateBillTransaction)(response.data.transactions[0]), (0, billDetailViewReducer_1.cancelAndDeleteBillSuccessOrFailure)('Completed', action.payload.billId, action.payload.isDeleteBill), (0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'bill_pay_cancelled',
                 messageText: 'success',

package/lib/view/spendManagement/billPay/billDetailView/epics/deleteBillEpic.d.ts

@@ -5,5 +5,6 @@ import { deleteBill, deleteBillSuccessOrFailure } from '../billDetailViewReducer
 import { removeTransactionIdFromBillTabList } from '../../billList/billListReducer';
 import { removeBillTransaction } from '../../../../../entity/billPay/billTransaction/billTransactionReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-export declare type ActionType = ReturnType<typeof deleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof removeTransactionIdFromBillTabList> | ReturnType<typeof deleteBillSuccessOrFailure>;
+import { removeRecurringBill } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
+export declare type ActionType = ReturnType<typeof deleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof removeTransactionIdFromBillTabList> | ReturnType<typeof deleteBillSuccessOrFailure> | ReturnType<typeof removeRecurringBill>;
 export declare const deleteBillEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

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

@@ -9,20 +9,27 @@ const responsePayload_1 = require("../../../../../responsePayload");
 const billTransactionReducer_1 = require("../../../../../entity/billPay/billTransaction/billTransactionReducer");
 const billDetailViewState_1 = require("../billDetailViewState");
 const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
+const recurringBillsReducer_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsReducer");
 const deleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billDetailViewReducer_1.deleteBill.match), (0, operators_1.mergeMap)((action) => {
+    var _a;
     const query = {
         transaction_type: 'bill',
         bill_pay_provider: 'zeni',
     };
     const { billTransactionState } = state$.value;
     const transaction = billTransactionState.transactionById[action.payload.billId];
+    const isRecurring = (_a = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _a !== void 0 ? _a : false;
+    const recurringConfigId = transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId;
+    let deleteApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
+    if (isRecurring === true) {
+        deleteApiUrl = `${deleteApiUrl}/recurring`;
+    }
     return zeniAPI
-        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}?query=${encodeURIComponent(JSON.stringify(query))}`)
+        .deleteAndGetJSON(`${deleteApiUrl}?query=${encodeURIComponent(JSON.stringify(query))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessStatus)(response)) {
-            const actions = [
-                (0, billDetailViewReducer_1.deleteBillSuccessOrFailure)('Completed', action.payload.billId),
-            ];
+            const actions = [];
+            actions.push((0, billDetailViewReducer_1.deleteBillSuccessOrFailure)('Completed', action.payload.billId));
             if (transaction != null) {
                 actions.push((0, billListReducer_1.removeTransactionIdFromBillTabList)({
                     billId: action.payload.billId,
@@ -30,6 +37,9 @@ const deleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                 }));
             }
             actions.push((0, billTransactionReducer_1.removeBillTransaction)((0, billDetailViewState_1.getBillTransactionDetailKey)(action.payload.billId)));
+            if (isRecurring === true && recurringConfigId != null) {
+                actions.push((0, recurringBillsReducer_1.removeRecurringBill)(recurringConfigId));
+            }
             actions.push((0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'bill_pay_deleted',
                 messageText: 'success',

package/lib/view/spendManagement/billPay/billDetailView/epics/fetchBillDetailEpic.d.ts

@@ -20,7 +20,8 @@ import { fetchVendorsList } from '../../../../vendorList/vendorListReducer';
 import { fetchDuplicateBill } from '../../billPayReview/billPayReviewReducer';
 import { updatePaymentInstruments } from '../../../../../entity/paymentInstrument/paymentInstrumentReducer';
 import { convertAmountToHomeCurrency } from '../../editBillView/editBillViewReducer';
-export declare type ActionType = ReturnType<typeof fetchBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof updateBillDetailFetchState> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof removeBillDetail> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof updateBillDetail> | ReturnType<typeof updateClasses> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateAddresses> | ReturnType<typeof fetchEntityHistory> | ReturnType<typeof fetchVendorsList> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof convertAmountToHomeCurrency> | ReturnType<typeof waitForVendorByNameThenUpdateBillDetail>;
+import { updateRecurringBillConfigs, updateRecurringBills } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
+export declare type ActionType = ReturnType<typeof fetchBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof updateBillDetailFetchState> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof removeBillDetail> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof updateBillDetail> | ReturnType<typeof updateClasses> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateAddresses> | ReturnType<typeof fetchEntityHistory> | ReturnType<typeof fetchVendorsList> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof convertAmountToHomeCurrency> | ReturnType<typeof waitForVendorByNameThenUpdateBillDetail> | ReturnType<typeof updateRecurringBillConfigs> | ReturnType<typeof updateRecurringBills>;
 export declare const fetchBillDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const waitForVendorByNameThenUpdateBillDetailEpic: (actions$: ActionsObservable<ActionType>, _: StateObservable<RootState>) => Observable<{
     payload: {

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 : [];
+}