@zeniai/client-epic-state 4.12.67 → 4.12.69

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

@@ -9,7 +9,7 @@ const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReduce
 const billDetailViewState_1 = require("../billDetailViewState");
 const billTransactionReducer_1 = require("../../../../../entity/billPay/billTransaction/billTransactionReducer");
 const retryOrRefundBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billDetailViewReducer_1.retryOrRefundBill.match), (0, operators_1.mergeMap)((action) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { billId, actionType } = action.payload;
     const { editBillDetailViewState } = state$.value;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
@@ -18,23 +18,27 @@ const retryOrRefundBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
     let payload;
     if (actionType === 'retry') {
         apiUrl = `${apiUrl}/payment/retry`;
-        payload = {
-            bill_pay_info: {
-                to_account: ((_b = (_a = billDetail.billDetailLocalData.paymentDetailsSection) === null || _a === void 0 ? void 0 : _a.paymentType) === null || _b === void 0 ? void 0 : _b.method.includes('international')) === true
-                    ? {
-                        payment_instrument_id: Boolean(billDetail.billDetailLocalData
-                            .isCollectToAccountInfoFromVendorContact) === false
-                            ? (_d = (_c = billDetail.billDetailLocalData.paymentDetailsSection) === null || _c === void 0 ? void 0 : _c.paymentTo) !== null && _d !== void 0 ? _d : null
-                            : null,
-                    }
-                    : {
-                        account_id: Boolean(billDetail.billDetailLocalData
-                            .isCollectToAccountInfoFromVendorContact) === false
-                            ? (_f = (_e = billDetail.billDetailLocalData.paymentDetailsSection) === null || _e === void 0 ? void 0 : _e.paymentTo) !== null && _f !== void 0 ? _f : null
-                            : null,
+        payload =
+            Boolean(billDetail.billDetailLocalData
+                .isCollectToAccountInfoFromVendorContact) === false
+                ? {
+                    bill_pay_info: {
+                        to_account: ((_b = (_a = billDetail.billDetailLocalData.paymentDetailsSection) === null || _a === void 0 ? void 0 : _a.paymentType) === null || _b === void 0 ? void 0 : _b.method.includes('international')) === true
+                            ? {
+                                payment_instrument_id: (_d = (_c = billDetail.billDetailLocalData.paymentDetailsSection) === null || _c === void 0 ? void 0 : _c.paymentTo) !== null && _d !== void 0 ? _d : null,
+                            }
+                            : {
+                                account_id: (_f = (_e = billDetail.billDetailLocalData.paymentDetailsSection) === null || _e === void 0 ? void 0 : _e.paymentTo) !== null && _f !== void 0 ? _f : null,
+                            },
                     },
-            },
-        };
+                }
+                : {
+                    bill_pay_info: {
+                        to_account_vendor_email: (_g = billDetail.billDetailLocalData.toAccountVendorEmail) !== null && _g !== void 0 ? _g : null,
+                        is_collect_to_account_info_from_vendor_contact: billDetail.billDetailLocalData
+                            .isCollectToAccountInfoFromVendorContact,
+                    },
+                };
     }
     else {
         apiUrl = `${apiUrl}/payment/refund`;

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

@@ -1,7 +1,7 @@
 import { FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { RootState } from '../../../../reducer';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
-import { BillTransaction } from '../../../../entity/billPay/billTransaction/billTransactionState';
+import { BillPayInfo, BillTransaction } from '../../../../entity/billPay/billTransaction/billTransactionState';
 import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 import { TransactionWithAccountAndClassLine } from '../../../../entity/transaction/stateTypes/transactionLine';
 import { Vendor } from '../../../../entity/vendor/vendorState';
@@ -25,6 +25,7 @@ export interface BillPayReviewSelectorView extends SelectorView {
     billPayConfigList: BillPayConfig[];
     isRecurring: boolean;
     isInvoiceDateAutoUpdated: boolean;
+    billPayInfo?: BillPayInfo;
     recurringBillInstance?: number;
     recurringConfig?: RecurringBillConfigLocalData;
     isBillMarkedForRetry?: boolean;

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

@@ -58,6 +58,7 @@ const getReviewPageBillDetail = (state, billId) => {
     let isRecurring = false;
     let recurringBillInstance;
     let recurringConfig;
+    let billPayInfo;
     let isBillMarkedForRetry = false;
     const zeniAssistRetryStatus = billId != null
         ? billDetailViewState.billDetailById[key].zeniAssist.retryStatus
@@ -68,6 +69,7 @@ const getReviewPageBillDetail = (state, billId) => {
         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;
+        billPayInfo = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo;
         if (isRecurring &&
             (transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId) != null &&
             transaction.recurringBillInstance != null) {
@@ -177,6 +179,7 @@ const getReviewPageBillDetail = (state, billId) => {
         isInvoiceDateAutoUpdated: (_y = whatForSection.isInvoiceDateAutoUpdated) !== null && _y !== void 0 ? _y : false,
         isBillMarkedForRetry,
         zeniAssistRetryStatus,
+        billPayInfo,
     };
 };
 exports.getReviewPageBillDetail = getReviewPageBillDetail;

package/lib/view/spendManagement/chargeCards/chargeCardList/issueChargeCardEpic.js

@@ -27,20 +27,17 @@ const issueChargeCardEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.cardMicroServiceBaseUrl}/1.0/cards`, { cards: payload })
         .pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b, _c;
         if ((0, responsePayload_1.isSuccessStatus)(response) && response.data != null) {
             const actions = [];
             actions.push((0, chargeCardReducer_1.updateChargeCards)(response.data.cards), (0, userReducer_1.updateAllUsers)({ users: response.data.users }), (0, userRoleReducer_1.updateUserRoles)(response.data.user_roles), (0, chargeCardListReducer_1.updateChargeCardList)({
                 chargeCardListPayload: response.data,
                 keepExistingListItems: true,
             }), (0, addressReducer_1.updateAddresses)(response.data.addresses), (0, chargeCardListReducer_1.issueChargeCardSuccessOrFailure)({ fetchState: 'Completed' }));
-            //removing the last user, because it belongs to created_by user
-            const names = response.data.users.length === 1
-                ? (_b = (_a = response.data.users[0].first_name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = response.data.users[0].last_name) === null || _c === void 0 ? void 0 : _c.trim()
-                : response.data.users
-                    .slice(0, -1)
-                    .map((user) => { var _a, _b, _c; return (_b = (_a = user.first_name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = user.last_name) === null || _c === void 0 ? void 0 : _c.trim(); })
-                    .join(', ');
+            const cardHolderIds = response.data.cards.map((card) => card.holder_user_id);
+            const names = response.data.users
+                .filter((user) => cardHolderIds.includes(user.user_id))
+                .map((user) => { var _a, _b, _c; return (_b = (_a = user.first_name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = user.last_name) === null || _c === void 0 ? void 0 : _c.trim(); })
+                .join(', ');
             actions.push((0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'issue_charge_card',
                 messageText: 'success',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.12.67",
+  "version": "4.12.69",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",