@zeniai/client-epic-state 4.8.11 → 4.8.13

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

@@ -21,8 +21,11 @@ const paymentInstrumentReducer_1 = require("../../../../entity/paymentInstrument
 const classSelectorV2_1 = require("../../../../entity/class/classSelectorV2");
 const editBillViewState_1 = require("../../../spendManagement/billPay/editBillView/editBillViewState");
 const currencyHelper_1 = require("../../../../commonStateTypes/currencyHelper");
+const zeniDayJS_1 = require("../../../../zeniDayJS");
+const workingDayHelper_1 = require("../../../../commonStateTypes/workingDayHelper");
+const companySelector_1 = require("../../../../entity/company/companySelector");
 const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(vendorViewReducer_1.saveVendor.match), (0, operators_1.mergeMap)((action) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const state = state$.value;
     const newlySelectedVendor = (_b = (_a = state.vendorViewState.newVendorState) === null || _a === void 0 ? void 0 : _a.vendorDetailLocalData) === null || _b === void 0 ? void 0 : _b.vendorId;
     const vendorDetailsUpdated = action.payload.vendorId != null
@@ -32,6 +35,16 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
     const effectiveVendorId = (_c = action.payload.vendorId) !== null && _c !== void 0 ? _c : newlySelectedVendor;
     const payload = (0, vendorViewPayload_1.prepareEditVendorPayload)(state, vendorDetailsUpdated !== null && vendorDetailsUpdated !== void 0 ? vendorDetailsUpdated : vendorViewReducer_1.initialVendorDetailLocalData, effectiveVendorId);
     let billInLocalStore = state.editBillDetailViewState.newBillState;
+    const { tenantState, companyState } = state;
+    const { currentTenantId } = tenantState;
+    const companyId = currentTenantId != null
+        ? (_e = (_d = tenantState.tenantsById) === null || _d === void 0 ? void 0 : _d[currentTenantId]) === null || _e === void 0 ? void 0 : _e.companyId
+        : undefined;
+    const currentCompany = (0, companySelector_1.getCompanyByCompanyId)(companyState, companyId !== null && companyId !== void 0 ? companyId : '');
+    const payNowCutOffTime = currentCompany === null || currentCompany === void 0 ? void 0 : currentCompany.company.companyBillPayInfo.payNowCutOffTimeByMethod.ach;
+    const isPayNowEnabled = payNowCutOffTime != null
+        ? (0, zeniDayJS_1.dateNow)().isSameOrBefore(payNowCutOffTime)
+        : false;
     if (action.payload.billId != null) {
         const billDetailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(action.payload.billId);
         billInLocalStore =
@@ -42,9 +55,9 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
     const saveVendorApi = effectiveVendorId != null
         ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/vendors/${effectiveVendorId}`, payload)
         : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/vendors`, payload);
-    const userId = (_e = (_d = state.tenantState.loggedInUser) === null || _d === void 0 ? void 0 : _d.userId) !== null && _e !== void 0 ? _e : '';
+    const userId = (_g = (_f = state.tenantState.loggedInUser) === null || _f === void 0 ? void 0 : _f.userId) !== null && _g !== void 0 ? _g : '';
     return saveVendorApi.pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const updatedVendor = ((_a = response.data) === null || _a === void 0 ? void 0 : _a.vendors[0]) != null
                 ? (0, vendorPayload_1.mapVendorPayloadToVendor)((_b = response.data) === null || _b === void 0 ? void 0 : _b.vendors[0])
@@ -106,7 +119,11 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                         updatesByLineId: updatedLines,
                         whatForSection: Object.assign(Object.assign({}, billInLocalStore.billDetailLocalData.whatForSection), { currencyCode: updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.vendorCurrencyCode }),
                         paymentDetailsSection: Object.assign(Object.assign({}, billInLocalStore.billDetailLocalData
-                            .paymentDetailsSection), { paymentTo: undefined, internationalTransferFeeBearerPaymentMethod: updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.preferredInternationalTransferFeeBearerPaymentMethod }),
+                            .paymentDetailsSection), { paymentTo: undefined, internationalTransferFeeBearerPaymentMethod: updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.preferredInternationalTransferFeeBearerPaymentMethod, paymentDate: (_t = (_s = billInLocalStore.billDetailLocalData
+                                .paymentDetailsSection) === null || _s === void 0 ? void 0 : _s.paymentDate) !== null && _t !== void 0 ? _t : 
+                            //in case paymentDate is not present in the billDetailLocalData, then today/next working date will be considered.
+                            //this is done beacuse we are doing similar calcualtion in getDefaultValues of editBillDetailPage.
+                            (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()) }),
                         isCollectToAccountInfoFromVendorContact: false,
                         isRecurring: false,
                     },
@@ -128,7 +145,7 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
             return (0, rxjs_1.from)(actions);
         }
         else {
-            if (((_s = response.data) === null || _s === void 0 ? void 0 : _s.error_code) === 1001) {
+            if (((_u = response.data) === null || _u === void 0 ? void 0 : _u.error_code) === 1001) {
                 return (0, rxjs_1.of)((0, vendorViewReducer_1.saveVendorSuccessOrFailure)('Error', action.payload.vendorId, response.status, true), (0, vendorViewReducer_1.fetchUserDetails)({ userId: userId }));
             }
             return (0, rxjs_1.of)((0, vendorViewReducer_1.saveVendorSuccessOrFailure)('Error', action.payload.vendorId, response.status), (0, snackbarReducer_1.openSnackbar)({

package/lib/view/scheduleView/scheduleListView/scheduleListHelper.js

@@ -197,7 +197,9 @@ const countStatusForDuration = (statusCode) => {
 const getDurationOfMonthOutTotalMonth = (jeSchedule) => {
     let totalDurationCompleted = 0;
     const scheduledEntries = jeSchedule.scheduledJournalEntry;
-    if (jeSchedule.status.code === 'ongoing' && scheduledEntries.length > 0) {
+    const allowedJEScheduleStatus = ['ongoing', 'completed'];
+    if (allowedJEScheduleStatus.includes(jeSchedule.status.code) === true &&
+        scheduledEntries.length > 0) {
         totalDurationCompleted = scheduledEntries.filter((scheduledEntry) => countStatusForDuration(scheduledEntry.status.code)).length;
     }
     return totalDurationCompleted;

package/lib/view/vendorReviewView/common/payload/commonTypes.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toGlobalMerchantsBasePayload = exports.toVendorReviewViewRecommendationPayload = exports.toNonExistingRecommendationGlobalMerchantBasePayload = exports.toUserPayload = void 0;
-const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globalMerchantPayload");
 /**
@@ -69,19 +68,25 @@ const toVendorReviewViewRecommendationPayload = (recommendations, nonExistingRec
             global_merchants: recommendationEntities,
         };
     });
-    const allRecommendations = recommendationsPayload.length > 0
-        ? recommendationsPayload
-        : nonExistingRecommendationsPayload;
+    const allRecommendations = [
+        {
+            global_merchants: [
+                ...recommendationsPayload[0].global_merchants,
+                ...nonExistingRecommendationsPayload[0].global_merchants,
+            ],
+        },
+    ];
     return allRecommendations;
 };
 exports.toVendorReviewViewRecommendationPayload = toVendorReviewViewRecommendationPayload;
 const toGlobalMerchantsBasePayload = (vendorsRecommendationsPayload) => {
-    var _a, _b;
-    let globalMerchantBasePayload = [];
-    if (((_b = (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        globalMerchantBasePayload = (0, flatMap_1.default)(vendorsRecommendationsPayload.map((vendorsRecoomendation) => vendorsRecoomendation
-            .global_merchants));
-    }
+    var _a;
+    const globalMerchantBasePayload = [];
+    (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalMerchantPayload) => {
+        if (globalMerchantPayload.global_merchant_id != null) {
+            globalMerchantBasePayload.push(globalMerchantPayload);
+        }
+    });
     return globalMerchantBasePayload;
 };
 exports.toGlobalMerchantsBasePayload = toGlobalMerchantsBasePayload;

package/lib/view/vendorReviewView/common/state/commonTypes.js

@@ -67,15 +67,17 @@ const toNonExistingGlobalMerchantBase = (globalMerchantPayload) => {
 };
 exports.toNonExistingGlobalMerchantBase = toNonExistingGlobalMerchantBase;
 const toAllRecommendationsFromPayload = (recommendationsPayload) => {
-    var _a, _b;
-    let recommendations = [];
-    let nonExistingRecommendations = [];
-    if (((_b = (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        recommendations = (0, exports.toRecommendationsFromPayload)(recommendationsPayload);
-    }
-    else {
-        nonExistingRecommendations = (0, exports.toNonExistingRecommendationsFromPayload)(recommendationsPayload);
-    }
+    var _a;
+    const recommendations = [];
+    const nonExistingRecommendations = [];
+    (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalmerchant) => {
+        if (globalmerchant.global_merchant_id != null) {
+            recommendations.push((0, globalMerchantPayload_1.toGlobalMerchantBase)(globalmerchant));
+        }
+        else {
+            nonExistingRecommendations.push((0, exports.toNonExistingGlobalMerchantBase)(globalmerchant));
+        }
+    });
     const recommendationIds = recommendations.map((recommendation) => recommendation.globalMerchantId);
     return {
         recommendationIds,

package/lib/view/vendorReviewView/vendorFirstReviewView/epics/fetchVendorFirstReviewViewEpic.js

@@ -82,17 +82,13 @@ exports.mapUsersPayloadFromVendorFirstReviewViewResponse = mapUsersPayloadFromVe
 const mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = (vendorsResponse) => {
     const globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            mapVendorRecommendationsToGlobalMerchantBasePayload(vendor.recommendations, globalMerchantBasePayload);
-        }
+        var _a;
+        const existingMerchants = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.filter((merchant) => merchant.global_merchant_id != null);
+        mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(existingMerchants, globalMerchantBasePayload);
     });
     return globalMerchantBasePayload;
 };
 exports.mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse;
-const mapVendorRecommendationsToGlobalMerchantBasePayload = (recommendations, globalMerchantBasePayload) => {
-    recommendations.forEach((recommendation) => mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(recommendation.global_merchants, globalMerchantBasePayload));
-};
 const mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload = (entities, globalMerchantBasePayload) => {
     entities.forEach((entity) => globalMerchantBasePayload.push(entity));
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewReducer.js

@@ -83,8 +83,9 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
                         const isRecommendationSelected = selectedGlobalMerchantId != null &&
                             (selectedGlobalMerchantId ===
                                 vendorLocalData.recommendationIds[0] ||
-                                selectedGlobalMerchantId ===
-                                    ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName));
+                                (vendorLocalData.recommendationIds.length === 0 &&
+                                    selectedGlobalMerchantId ===
+                                        ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName)));
                         const isRetainSelected = selectedGlobalMerchantId != null &&
                             selectedGlobalMerchantId === vendorLocalData.vendorId;
                         currentSelection =
@@ -244,7 +245,7 @@ const mapPayloadToVendorFirstReviewView = (payload) => {
         },
         currentSelection: null,
         recommendationIds,
-        recommendedNonExistingGlobalMerchants: recommendationIds.length === 0 ? nonExistingRecommendations : [],
+        recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
         lastUpdatedVendorNameByUserId: (_a = payload.last_updated_vendor_name_by_user) === null || _a === void 0 ? void 0 : _a.user_id,
     };
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewSelector.js

@@ -19,10 +19,10 @@ const getVendorFirstReviewView = (state) => {
         const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.vendorId);
         const users = (0, userSelector_1.getUsersByUserIds)(userState, userIds);
         let recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, vendorLocalData.recommendationIds);
-        recommendations =
-            recommendations.length > 0
-                ? recommendations
-                : vendorLocalData.recommendedNonExistingGlobalMerchants;
+        recommendations = [
+            ...recommendations,
+            ...vendorLocalData.recommendedNonExistingGlobalMerchants,
+        ];
         let selectedVendor;
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.selectedVendorId);
         if (vendor != null) {

package/lib/view/vendorReviewView/vendorGlobalReviewView/epics/fetchVendorGlobalReviewViewEpic.js

@@ -71,15 +71,12 @@ exports.toUsersPayload = toUsersPayload;
 const mapGlobalReviewPayloadToGlobalMerchantsBasePayload = (vendorsResponse) => {
     let globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            globalMerchantBasePayload = [
-                ...new Set([
-                    ...globalMerchantBasePayload,
-                    ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
-                ]),
-            ];
-        }
+        globalMerchantBasePayload = [
+            ...new Set([
+                ...globalMerchantBasePayload,
+                ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
+            ]),
+        ];
     });
     return globalMerchantBasePayload;
 };

package/package.json

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