@zeniai/client-epic-state 4.7.74 → 4.7.75

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 }),

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

@@ -118,7 +118,7 @@ const parseInvoiceToBillEpic = (actions$, state$) => actions$.pipe((0, operators
 }));
 exports.parseInvoiceToBillEpic = parseInvoiceToBillEpic;
 const toBillDetailLocalData = (state, billPayload, vendor, recommendedVendorId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
     const currency = {
         currencyCode: (_a = billPayload.currency_code) !== null && _a !== void 0 ? _a : '',
         currencySymbol: (_b = billPayload.currency_symbol) !== null && _b !== void 0 ? _b : '', //api not returning symbol
@@ -147,7 +147,7 @@ const toBillDetailLocalData = (state, billPayload, vendor, recommendedVendorId)
         const lineState = (0, transactionLinePayload_1.toTransactionWithAccountAndClassLine)(line, currency);
         const { accountListState, accountState, classListState, classState } = state;
         const classList = (0, classListSelector_1.getClassList)(classState, classListState);
-        const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
+        const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'billPayAccountList');
         const lineWithRecommendations = (0, initializeBillToLocalStoreEpic_1.getLineRecommendationsLocalData)(line.line_id, lineState, recommendations, accountList, classList, vendor);
         linesById[line.line_id] = Object.assign(Object.assign({}, lineWithRecommendations), { account: ((_b = lineWithRecommendations.account) === null || _b === void 0 ? void 0 : _b.accountId) === '' &&
                 vendorCategory != null
@@ -212,6 +212,7 @@ const toBillDetailLocalData = (state, billPayload, vendor, recommendedVendorId)
         isCancelled: false,
         toAccountVendorEmail: (_t = (_s = billPayload.bill_pay_info) === null || _s === void 0 ? void 0 : _s.to_account_vendor_email) !== null && _t !== void 0 ? _t : undefined,
         isCollectToAccountInfoFromVendorContact: (_v = (_u = billPayload.bill_pay_info) === null || _u === void 0 ? void 0 : _u.is_collect_to_account_info_from_vendor_contact) !== null && _v !== void 0 ? _v : false,
+        isRecurring: (_w = billPayload.is_recurring) !== null && _w !== void 0 ? _w : false,
     };
 };
 exports.toBillDetailLocalData = toBillDetailLocalData;

package/lib/view/spendManagement/billPay/editBillView/epics/saveBillDetailEpic.d.ts

@@ -3,28 +3,15 @@ import { ZeniAPI } from '../../../../../zeniAPI';
 import { RootState } from '../../../../../reducer';
 import { saveBillDetail, saveBillSuccessOrFailure } from '../editBillViewReducer';
 import { updateBillTransaction } from '../../../../../entity/billPay/billTransaction/billTransactionReducer';
+import { RecurringBillInstance } from '../editBillViewState';
+import { updateRecurringBillConfigs, updateRecurringBills } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-export declare type ActionType = ReturnType<typeof saveBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof saveBillSuccessOrFailure>;
-export declare const saveBillDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
-    payload: import("../../../../../entity/billPay/billTransaction/billTransactionPayload").BillTransactionPayload;
-    type: string;
-} | {
-    payload: {
-        messageSection: "common" | "transactionDetails_updatingPastTransactions" | "transactionDetails_transactionUpdated" | "cockpit_monthEndEmailSent" | "cockpit_monthEndEmailSave" | "people_invite_people" | "people_invite_multiple_people" | "people_delete_person" | "people_update_person" | "reimbursement_updated" | "reimbursement_deleted" | "reimbursement_cancelled_deleted" | "reimbursement_cancelled" | "reimbursement_approved" | "reimbursement_rejected" | "reimbursement_sent_for_approval" | "account_added" | "business_verification_save" | "business_verification_submit" | "business_verification_from_bills_submit" | "plaid_connection" | "unlink_deposit_account" | "reimbursement_setup" | "reimbursement_approval_create" | "reimbursement_duplicate_approval_create" | "reimbursement_approval_update" | "reimbursement_duplicate_approval_update" | "reimbursement_approval_delete" | "reimbursement_create_mileage" | "reimbursement_update_mileage" | "reimbursement_accept_term" | "reimbursement_accept_employee_term" | "bill_pay_setup" | "zeni_accounts_setup" | "bill_pay_approval_create" | "bill_pay_duplicate_approval_create" | "bill_pay_approval_update" | "bill_pay_duplicate_approval_update" | "bill_pay_approval_delete" | "bill_pay_updated" | "bill_pay_deleted" | "bill_pay_cancelled_deleted" | "bill_pay_cancelled" | "bill_pay_approved" | "real_time_approver_added" | "bill_pay_rejected" | "bill_pay_sent_for_approval" | "bill_pay_accept_term" | "zeni_account_accept_term" | "update_vendor" | "delete_bank_account" | "create_bank_account" | "create_bank_account_ach" | "create_bank_account_wire" | "create_bank_account_international" | "transfer_money" | "update_zeni_account_nickname" | "create_checking_account" | "deposit_check" | "create_vendor" | "onboarding_customer_view" | "onboarding_customer_view_complete" | "onboarding_customer_identity_verification_save" | "onboarding_customer_identity_verification_submit" | "onboarding_customer_business_verification_save" | "onboarding_customer_business_verification_submit" | "retry_bank_account_connection" | "dashboard_invite_sent" | "onboarding_info_saved" | "approve_original_merchant" | "approve_global_merchant" | "create_global_merchant" | "fetch_global_merchant_no_recommendation" | "save_vendor_renamed" | "save_vendor_sent_for_review" | "charge_card_setup" | "charge_card_accept_term";
-        messageText: "failed" | "success";
-        type: import("../../../../..").SnackbarMessageType;
-        showStatusIcon?: boolean | undefined;
-        variables?: {
-            variableName: string;
-            variableValue: string;
-        }[] | undefined;
-    };
-    type: string;
-} | {
-    payload: {
-        fetchState: import("../../../../..").FetchState;
-        billId: string | undefined;
-        error: import("../../../../../responsePayload").ZeniAPIStatus<Record<string, unknown>> | undefined;
-    };
-    type: string;
-}>;
+export declare type ActionType = ReturnType<typeof saveBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof saveBillSuccessOrFailure> | ReturnType<typeof updateRecurringBillConfigs> | ReturnType<typeof updateRecurringBills>;
+export declare const saveBillDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;
+export interface RecurringBillInstancePayload {
+    instance: number;
+    payment_date: string;
+    vendor_receive_date: string;
+    vendor_receive_date_notes: string;
+}
+export declare const toRecurringBillInstancePayload: (recurringBillInstance: RecurringBillInstance, maxPaymentProcessingDays: number) => RecurringBillInstancePayload;

package/lib/view/spendManagement/billPay/editBillView/epics/saveBillDetailEpic.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.saveBillDetailEpic = void 0;
+exports.toRecurringBillInstancePayload = exports.saveBillDetailEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const get_1 = __importDefault(require("lodash/get"));
@@ -15,11 +15,15 @@ const editBillViewPayload_1 = require("../editBillViewPayload");
 const transactionLinePayload_1 = require("../../../../../entity/transaction/payloadTypes/transactionLinePayload");
 const accountSelector_1 = require("../../../../../entity/account/accountSelector");
 const paymentAccountSelector_1 = require("../../../../../entity/paymentAccount/paymentAccountSelector");
+const recurringBillsReducer_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsReducer");
 const billDetailViewState_1 = require("../../billDetailView/billDetailViewState");
 const billPayConfigState_1 = require("../../billPayConfig/billPayConfigState");
 const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
 const billPayConfigPayload_1 = require("../../billPayConfig/billPayConfigPayload");
 const vendorSelector_1 = require("../../../../../entity/vendor/vendorSelector");
+const recurringBillsPayload_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsPayload");
+const workingDayHelper_1 = require("../../../../../commonStateTypes/workingDayHelper");
+const helpers_1 = require("../../../helpers");
 const saveBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.saveBillDetail.match), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
     const { billStageCode, billId, isLocalCurrencyEnabled, isVendorRecommendationEnabled, } = action.payload;
@@ -27,21 +31,30 @@ const saveBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
     const billDetail = billId != null
         ? state.editBillDetailViewState.editBillStateById[key]
         : state.editBillDetailViewState.newBillState;
-    const payload = prepareSaveBillPayload(state.accountState, state.billTransactionState, state.paymentAccountState, state.setupViewState, state.vendorState, billDetail, billStageCode, isVendorRecommendationEnabled, isLocalCurrencyEnabled);
-    const saveVendorApi = billId != null
-        ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`, payload)
-        : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions`, payload);
-    return saveVendorApi.pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b;
+    const payload = prepareSaveBillPayload(state.accountState, state.billTransactionState, state.paymentAccountState, state.setupViewState, state.vendorState, state.recurringBillState, billDetail, billStageCode, isVendorRecommendationEnabled, isLocalCurrencyEnabled);
+    const isRecurringBill = billDetail.billDetailLocalData.isRecurring;
+    const saveBillBaseURL = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions`;
+    const saveBillApi = billId != null
+        ? zeniAPI.putAndGetJSON(getSaveBillApiURL(saveBillBaseURL, isRecurringBill, billId), payload)
+        : zeniAPI.postAndGetJSON(getSaveBillApiURL(saveBillBaseURL, isRecurringBill), payload);
+    return saveBillApi.pipe((0, operators_1.mergeMap)((response) => {
+        var _a, _b, _c, _d;
         if ((0, responsePayload_1.isSuccessResponse)(response) &&
             ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.transactions[0]) === null || _b === void 0 ? void 0 : _b.transaction_id) != null) {
-            return (0, rxjs_1.of)((0, billTransactionReducer_1.updateBillTransaction)(response.data.transactions[0]), (0, editBillViewReducer_1.saveBillSuccessOrFailure)('Completed', action.payload.billId), (0, snackbarReducer_1.openSnackbar)({
+            const actions = [
+                (0, billTransactionReducer_1.updateBillTransaction)(response.data.transactions[0]),
+            ];
+            if (isRecurringBill) {
+                actions.push((0, recurringBillsReducer_1.updateRecurringBillConfigs)((_c = response.data.recurring_bill_configs) !== null && _c !== void 0 ? _c : []), (0, recurringBillsReducer_1.updateRecurringBills)((_d = response.data.recurring_bill_instances) !== null && _d !== void 0 ? _d : []));
+            }
+            actions.push((0, editBillViewReducer_1.saveBillSuccessOrFailure)('Completed', action.payload.billId), (0, snackbarReducer_1.openSnackbar)({
                 messageSection: billStageCode === 'pending_approval'
                     ? 'bill_pay_sent_for_approval'
                     : 'bill_pay_updated',
                 messageText: 'success',
                 type: 'success',
             }));
+            return (0, rxjs_1.from)(actions);
         }
         else {
             return (0, rxjs_1.of)((0, editBillViewReducer_1.saveBillSuccessOrFailure)('Error', action.payload.billId, response.status), (0, snackbarReducer_1.openSnackbar)({
@@ -59,9 +72,20 @@ const saveBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, editBillViewReducer_1.saveBillSuccessOrFailure)('Error', action.payload.billId, (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', `REST API call errored out ${JSON.stringify(error)}`)))));
 }));
 exports.saveBillDetailEpic = saveBillDetailEpic;
-function prepareSaveBillPayload(accountState, billTransactionState, paymentAccountState, setupViewState, vendorState, billDetail, billStageCode, isVendorRecommendationEnabled, isLocalCurrencyEnabled) {
-    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, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16;
+const getSaveBillApiURL = (saveBillBaseURL, isRecurring, billId) => {
+    if (billId != null) {
+        return isRecurring
+            ? `${saveBillBaseURL}/${billId}/recurring`
+            : `${saveBillBaseURL}/${billId}`;
+    }
+    else {
+        return isRecurring ? `${saveBillBaseURL}/recurring` : `${saveBillBaseURL}`;
+    }
+};
+function prepareSaveBillPayload(accountState, billTransactionState, paymentAccountState, setupViewState, vendorState, recurringBillState, billDetail, billStageCode, isVendorRecommendationEnabled, isLocalCurrencyEnabled) {
+    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, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
     const billId = billDetail.billId;
+    let detail;
     const withdrawFromList = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, setupViewState.accountDetails.paymentAccountIds);
     const withdrawFromAccount = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, (_c = (_b = (_a = billDetail.billDetailLocalData.paymentDetailsSection) === null || _a === void 0 ? void 0 : _a.withdrawFrom) !== null && _b !== void 0 ? _b : withdrawFromList === null || withdrawFromList === void 0 ? void 0 : withdrawFromList[0].paymentAccountId) !== null && _c !== void 0 ? _c : '');
     const recommendedVendor = billDetail.billDetailLocalData.recommendedVendorId != null
@@ -70,6 +94,7 @@ function prepareSaveBillPayload(accountState, billTransactionState, paymentAccou
     const isRecommendedVendor = isVendorRecommendationEnabled &&
         recommendedVendor != null &&
         billDetail.addBillAutoFields.tentativeVendorName != null;
+    const isRecurring = Boolean(billDetail.billDetailLocalData.isRecurring) === true;
     const payload = {
         vendor_id: isRecommendedVendor
             ? recommendedVendor.qboId
@@ -130,20 +155,71 @@ function prepareSaveBillPayload(accountState, billTransactionState, paymentAccou
             return (0, transactionLinePayload_1.toAccountAndClassLinePayload)(lineAsTransactionLinePayload);
         }),
     };
+    if (!isRecurring) {
+        payload.vendor_name = (_15 = (_14 = billDetail.billDetailLocalData.vendor) === null || _14 === void 0 ? void 0 : _14.name) !== null && _15 !== void 0 ? _15 : '';
+    }
     if (billId != null) {
-        const detail = (0, get_1.default)(billTransactionState.transactionById, billId, undefined);
-        payload.sync_token = (_14 = detail === null || detail === void 0 ? void 0 : detail.syncToken) !== null && _14 !== void 0 ? _14 : null;
-        payload.update_time = (_15 = detail === null || detail === void 0 ? void 0 : detail.updateTime.format('YYYY-MM-DD')) !== null && _15 !== void 0 ? _15 : null;
+        detail = (0, get_1.default)(billTransactionState.transactionById, billId, undefined);
+        payload.sync_token = (_16 = detail === null || detail === void 0 ? void 0 : detail.syncToken) !== null && _16 !== void 0 ? _16 : null;
+        payload.update_time = (_17 = detail === null || detail === void 0 ? void 0 : detail.updateTime.format('YYYY-MM-DD')) !== null && _17 !== void 0 ? _17 : null;
     }
     else {
         payload.are_approvals_serialized = true;
     }
     if (billStageCode === 'pending_approval' &&
-        ((_16 = billDetail.billDetailLocalData.paymentDetailsSection) === null || _16 === void 0 ? void 0 : _16.conversionRate) != null) {
+        ((_18 = billDetail.billDetailLocalData.paymentDetailsSection) === null || _18 === void 0 ? void 0 : _18.conversionRate) != null) {
         // required by platform
         payload.exchange_rate =
             1 / billDetail.billDetailLocalData.paymentDetailsSection.conversionRate;
     }
+    if (Boolean(billDetail.billDetailLocalData.isRecurring) === true) {
+        payload.is_recurring = true;
+        const recurringConfig = billDetail.billDetailLocalData.recurringConfig;
+        const recurringBillInstances = billDetail.billDetailLocalData.recurringBillInstances;
+        if (recurringConfig != null) {
+            payload.recurring_bill_config = (0, recurringBillsPayload_1.toRecurringConfigPayload)(recurringConfig);
+        }
+        if ((recurringConfig === null || recurringConfig === void 0 ? void 0 : recurringConfig.id) != null) {
+            const originalRecurringDetail = (0, get_1.default)(recurringBillState.recurringBillDetailByConfigId, recurringConfig.id);
+            const isConfigChangedForExistingBill = (0, helpers_1.isRecurringConfigChanged)(recurringConfig, originalRecurringDetail.recurringBillConfig, true);
+            payload.is_update_recurring_bill_config = isConfigChangedForExistingBill;
+            payload.is_update_future_recurring_bills =
+                recurringConfig.updateRecurringBills === 'all';
+            payload.is_update_current_bill =
+                recurringConfig.updateRecurringBills === 'all' ||
+                    ((_20 = (_19 = billDetail.billDetailLocalData.paymentDetailsSection) === null || _19 === void 0 ? void 0 : _19.paymentDate) === null || _20 === void 0 ? void 0 : _20.toString()) !==
+                        ((_21 = detail === null || detail === void 0 ? void 0 : detail.billPayInfo.paymentDate) === null || _21 === void 0 ? void 0 : _21.toString())
+                    ? true
+                    : recurringConfig.updateRecurringBills === 'current';
+            if ((isConfigChangedForExistingBill ||
+                recurringConfig.updateRecurringBills === 'all') &&
+                payload.recurring_bill_config != null) {
+                payload.recurring_bill_config.sync_token =
+                    originalRecurringDetail.recurringBillConfig.syncToken;
+            }
+            if (recurringBillInstances != null) {
+                const futureRecurringBills = recurringBillInstances
+                    .filter((instance) => Boolean(instance.readonly) === false)
+                    .slice(1)
+                    .map((instance) => {
+                    var _a, _b, _c, _d;
+                    return (0, exports.toRecurringBillInstancePayload)(instance, (_d = (_c = (_b = (_a = billDetail.billDetailLocalData.paymentDetailsSection) === null || _a === void 0 ? void 0 : _a.paymentType) === null || _b === void 0 ? void 0 : _b.maxPeriod) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : workingDayHelper_1.PAYMENT_BUSINESS_DAYS);
+                });
+                payload.future_recurring_bill_instances = futureRecurringBills;
+                if (payload.recurring_bill_config != null) {
+                    payload.recurring_bill_config.future_total_payment_cycles =
+                        futureRecurringBills === null || futureRecurringBills === void 0 ? void 0 : futureRecurringBills.length;
+                    delete payload.recurring_bill_config.total_payment_cycles;
+                }
+            }
+        }
+        else {
+            payload.recurring_bill_instances = recurringBillInstances === null || recurringBillInstances === void 0 ? void 0 : recurringBillInstances.map((instance) => {
+                var _a, _b, _c, _d;
+                return (0, exports.toRecurringBillInstancePayload)(instance, (_d = (_c = (_b = (_a = billDetail.billDetailLocalData.paymentDetailsSection) === null || _a === void 0 ? void 0 : _a.paymentType) === null || _b === void 0 ? void 0 : _b.maxPeriod) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : workingDayHelper_1.PAYMENT_BUSINESS_DAYS);
+            });
+        }
+    }
     return payload;
 }
 const getBillPaymentMethodTypePayload = (paymentType) => {
@@ -160,3 +236,13 @@ const getBillPaymentMethodTypePayload = (paymentType) => {
             : null,
     };
 };
+const toRecurringBillInstancePayload = (recurringBillInstance, maxPaymentProcessingDays) => {
+    const calculatedPaymentDate = (0, helpers_1.getPaymentDateFromVendorReceiveDate)(recurringBillInstance.vendorReceiveDate, maxPaymentProcessingDays);
+    return {
+        instance: recurringBillInstance.instance,
+        payment_date: calculatedPaymentDate.format('YYYY-MM-DD'),
+        vendor_receive_date: recurringBillInstance.vendorReceiveDate.format('YYYY-MM-DD'),
+        vendor_receive_date_notes: recurringBillInstance.vendorReceiveDateNotes,
+    };
+};
+exports.toRecurringBillInstancePayload = toRecurringBillInstancePayload;

package/lib/view/spendManagement/commonHistoryView/commonHistory.d.ts

@@ -9,6 +9,7 @@ export interface CommonHistoryView extends FetchedState {
 export declare const initialCommonHistory: CommonHistoryView;
 export interface HistoricEvent {
     eventText: string[];
+    eventSubText: string[];
     timestamp?: ZeniDate;
     updates: HistoricEventUpdate[];
 }

package/lib/view/spendManagement/commonHistoryView/commonHistoryPayload.d.ts

@@ -5,6 +5,7 @@ export interface HistoryPayload {
 }
 export interface HistoricEventPayload {
     event_text: string[];
+    event_sub_text?: string[] | null;
     timestamp?: string | null;
     updates: HistoricEventUpdatePayload[];
     metadata: HistoricEventMetaDataPayload;

package/lib/view/spendManagement/commonHistoryView/commonHistoryPayload.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toHistoricEventUpdate = exports.toHistoricEvent = void 0;
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const commonHistory_1 = require("./commonHistory");
-const toHistoricEvent = (payload) => ({
-    eventText: payload.event_text,
-    timestamp: payload.timestamp != null ? (0, zeniDayJS_1.dateLocal)(payload.timestamp) : undefined,
-    updates: payload.updates.map((eventUpdatePayload) => (0, exports.toHistoricEventUpdate)(eventUpdatePayload)),
-});
+const toHistoricEvent = (payload) => {
+    var _a;
+    return ({
+        eventText: payload.event_text,
+        eventSubText: (_a = payload.event_sub_text) !== null && _a !== void 0 ? _a : [],
+        timestamp: payload.timestamp != null ? (0, zeniDayJS_1.dateLocal)(payload.timestamp) : undefined,
+        updates: payload.updates.map((eventUpdatePayload) => (0, exports.toHistoricEventUpdate)(eventUpdatePayload)),
+    });
+};
 exports.toHistoricEvent = toHistoricEvent;
 const toHistoricEventUpdate = (payload) => ({
     title: payload.title,