@zeniai/client-epic-state 4.8.48 → 4.8.49

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

@@ -22,6 +22,7 @@ export interface BillPayReviewSelectorView extends SelectorView {
     isCollectToAccountInfoFromVendorContact: boolean;
     billPayConfigList: BillPayConfig[];
     isRecurring: boolean;
+    isInvoiceDateAutoUpdated: boolean;
     recurringBillInstance?: number;
     recurringConfig?: RecurringBillConfigLocalData;
 }

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

@@ -36,7 +36,7 @@ const getDuplicateBills = (state, billId) => {
 };
 exports.getDuplicateBills = getDuplicateBills;
 const getReviewPageBillDetail = (state, billId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const { accountListState, accountState, setupViewState, billTransactionState, classListState, editBillDetailViewState, paymentAccountState, vendorState, contactState, billPayConfigState, recurringBillState, depositAccountState, depositAccountListState, } = state;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId !== null && billId !== void 0 ? billId : '');
     const sourceBillDetail = billId != null
@@ -163,6 +163,7 @@ const getReviewPageBillDetail = (state, billId) => {
         isRecurring,
         recurringBillInstance,
         recurringConfig,
+        isInvoiceDateAutoUpdated: (_s = whatForSection.isInvoiceDateAutoUpdated) !== null && _s !== void 0 ? _s : false,
     };
 };
 exports.getReviewPageBillDetail = getReviewPageBillDetail;

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

@@ -136,4 +136,6 @@ export declare const getRecurringBillLocalData: (recurringBillState: RecurringBi
     recurringBillInstancesLocalData: RecurringBillInstance[];
     recurringConfigLocalData?: RecurringBillConfigLocalData | undefined;
 };
+export declare const getInvoiceDate: (invoiceDate: ZeniDate, bookCloseDate?: import("dayjs").Dayjs | undefined) => import("dayjs").Dayjs;
+export declare const getDueDate: (dueDate: ZeniDate, invoiceDate?: import("dayjs").Dayjs | undefined, bookCloseDate?: import("dayjs").Dayjs | undefined) => import("dayjs").Dayjs;
 export declare const getWithdrawFrom: (paymentAccountState: PaymentAccountState, depositAccountState: DepositAccountState, fromAccountId: ID, fromAccountType: string) => TransferMoneyParty | undefined;

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

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWithdrawFrom = exports.getRecurringBillLocalData = exports.getCurrentPaymentToOption = exports.toPaymentToOption = exports.getActualPaymentTypeBasedOnAccType = exports.getPaymentSection = exports.getWhatForSection = exports.getPaymentMethodType = exports.getBillPayConfigList = exports.getEditBillDetail = void 0;
+exports.getWithdrawFrom = exports.getDueDate = exports.getInvoiceDate = exports.getRecurringBillLocalData = exports.getCurrentPaymentToOption = exports.toPaymentToOption = exports.getActualPaymentTypeBasedOnAccType = exports.getPaymentSection = exports.getWhatForSection = 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");
 const bankAccountSelector_1 = require("../../../../entity/bankAccount/bankAccountSelector");
 const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
 const vendorSelector_1 = require("../../../../entity/vendor/vendorSelector");
+const zeniDayJS_1 = require("../../../../zeniDayJS");
 const accountListSelector_1 = require("../../../accountList/accountListSelector");
 const classListSelector_1 = require("../../../classList/classListSelector");
 const billDetailViewState_1 = require("../billDetailView/billDetailViewState");
@@ -131,6 +132,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
             invoiceDate: transaction === null || transaction === void 0 ? void 0 : transaction.date,
             billDueDate: transaction === null || transaction === void 0 ? void 0 : transaction.dueDate,
             memo: transaction === null || transaction === void 0 ? void 0 : transaction.memo,
+            isInvoiceDateAutoUpdated: false,
         };
         const updatesByLineId = {};
         if (accountList.fetchState === 'Completed') {
@@ -408,7 +410,7 @@ const getPaymentMethodType = (billPayConfigState, accType, paymentMethod, intern
 };
 exports.getPaymentMethodType = getPaymentMethodType;
 function getWhatForSection(updatedWhatForSection) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     return {
         invoiceNumber: (updatedWhatForSection === null || updatedWhatForSection === void 0 ? void 0 : updatedWhatForSection.invoiceNumber) != null &&
             ((_a = updatedWhatForSection.invoiceNumber) === null || _a === void 0 ? void 0 : _a.length) > 0
@@ -421,6 +423,7 @@ function getWhatForSection(updatedWhatForSection) {
             ? updatedWhatForSection.memo
             : '',
         currencyCode: (_e = updatedWhatForSection === null || updatedWhatForSection === void 0 ? void 0 : updatedWhatForSection.currencyCode) !== null && _e !== void 0 ? _e : 'USD',
+        isInvoiceDateAutoUpdated: (_f = updatedWhatForSection === null || updatedWhatForSection === void 0 ? void 0 : updatedWhatForSection.isInvoiceDateAutoUpdated) !== null && _f !== void 0 ? _f : false,
     };
 }
 exports.getWhatForSection = getWhatForSection;
@@ -554,6 +557,26 @@ const getRecurringBillLocalData = (recurringBillState, transaction) => {
     return { recurringConfigLocalData, recurringBillInstancesLocalData };
 };
 exports.getRecurringBillLocalData = getRecurringBillLocalData;
+const getInvoiceDate = (invoiceDate, bookCloseDate) => {
+    if (bookCloseDate != null && invoiceDate.isBefore(bookCloseDate)) {
+        return (0, zeniDayJS_1.dateNow)().startOf('month');
+    }
+    else {
+        return invoiceDate;
+    }
+};
+exports.getInvoiceDate = getInvoiceDate;
+const getDueDate = (dueDate, invoiceDate, bookCloseDate) => {
+    if (bookCloseDate != null &&
+        invoiceDate != null &&
+        invoiceDate.isBefore(bookCloseDate)) {
+        return (0, zeniDayJS_1.dateNow)().startOf('month');
+    }
+    else {
+        return dueDate;
+    }
+};
+exports.getDueDate = getDueDate;
 const getWithdrawFrom = (paymentAccountState, depositAccountState, fromAccountId, fromAccountType) => {
     const withdrawFromAsDepositAcc = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, fromAccountId);
     const withdrawFromAsPaymentAcc = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, fromAccountId);

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

@@ -70,6 +70,7 @@ export interface WhatForSection {
     billDueDate?: ZeniDate;
     memo?: string;
     currencyCode?: string;
+    isInvoiceDateAutoUpdated?: boolean;
 }
 export interface PaymentDetailsSection {
     internationalTransferFeeBearerPaymentMethod?: InternationalTransferFeeBearerPaymentMethod;

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

@@ -23,6 +23,7 @@ exports.initialBillDetail = {
             invoiceDate: undefined,
             billDueDate: undefined,
             memo: '',
+            isInvoiceDateAutoUpdated: false,
         },
         updatesByLineId: {},
         paymentDetailsSection: {

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

@@ -128,23 +128,29 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
                 }
             }
         }
+        const { tenantState, companyState } = state;
+        const { currentTenantId } = tenantState;
+        const companyId = currentTenantId != null
+            ? (_f = (_e = tenantState.tenantsById) === null || _e === void 0 ? void 0 : _e[currentTenantId]) === null || _f === void 0 ? void 0 : _f.companyId
+            : undefined;
+        const currentCompany = (0, companySelector_1.getCompanyByCompanyId)(companyState, companyId !== null && companyId !== void 0 ? companyId : '');
+        const bookCloseDate = currentCompany === null || currentCompany === void 0 ? void 0 : currentCompany.company.companyInfo.bookCloseDate;
         const whatForSection = {
             invoiceNumber: transaction.documentId,
-            invoiceDate: transaction.date,
-            billDueDate: transaction.dueDate,
+            billDueDate: transaction.dueDate != null && transaction.date != null
+                ? (0, editBillViewSelector_1.getDueDate)(transaction.dueDate, transaction.date, bookCloseDate)
+                : transaction.dueDate,
+            invoiceDate: (0, editBillViewSelector_1.getInvoiceDate)(transaction.date, bookCloseDate),
             memo: transaction.memo,
             currencyCode: transaction.amount.currencyCode,
+            isInvoiceDateAutoUpdated: transaction.date != null
+                ? transaction.date.isBefore(bookCloseDate)
+                : false,
         };
         const updatesByLineId = {};
-        (_e = transaction.lines) === null || _e === void 0 ? void 0 : _e.forEach((line) => {
+        (_g = transaction.lines) === null || _g === void 0 ? void 0 : _g.forEach((line) => {
             updatesByLineId[line.id] = Object.assign(Object.assign({}, line), (0, exports.getLineRecommendationsLocalData)(line.id, line, recommendations, accountList, classList, vendor));
         });
-        const { tenantState, companyState } = state;
-        const { currentTenantId } = tenantState;
-        const companyId = currentTenantId != null
-            ? (_g = (_f = tenantState.tenantsById) === null || _f === void 0 ? void 0 : _f[currentTenantId]) === null || _g === void 0 ? void 0 : _g.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)

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

@@ -188,6 +188,15 @@ const toBillDetailLocalData = (state, showVendorGptRecommendationText, billPaylo
         ? (0, zeniDayJS_1.dateNow)().isSameOrBefore(payNowCutOffTime)
         : false;
     const fromAccountType = (0, billPayConfigPayload_1.getAccountTypeSubConfigCodeKey)((0, billPayConfigState_1.toAccType)((_m = (_l = billPayload.bill_pay_info) === null || _l === void 0 ? void 0 : _l.from_account.account_type) !== null && _m !== void 0 ? _m : ''));
+    const bookCloseDate = currentCompany === null || currentCompany === void 0 ? void 0 : currentCompany.company.companyInfo.bookCloseDate;
+    const invoiceDate = Boolean(billPayload.transaction_date) === true
+        ? (0, editBillViewSelector_1.getInvoiceDate)((0, zeniDayJS_1.date)(billPayload.transaction_date), bookCloseDate)
+        : undefined;
+    const dueDate = Boolean(billPayload.due_date) === true
+        ? Boolean(billPayload.transaction_date) === true
+            ? (0, editBillViewSelector_1.getDueDate)((0, zeniDayJS_1.date)(billPayload.due_date), (0, zeniDayJS_1.date)(billPayload.transaction_date), bookCloseDate)
+            : (0, zeniDayJS_1.date)(billPayload.due_date)
+        : undefined;
     return {
         recommendedVendorId,
         showVendorGptRecommendationText,
@@ -195,14 +204,12 @@ const toBillDetailLocalData = (state, showVendorGptRecommendationText, billPaylo
         vendor: vendor,
         whatForSection: {
             invoiceNumber: billPayload.invoice_number,
-            billDueDate: billPayload.due_date != null && billPayload.due_date.length > 0
-                ? (0, zeniDayJS_1.date)(billPayload.due_date)
-                : undefined,
+            billDueDate: dueDate,
             memo: billPayload.transaction_memo,
-            invoiceDate: billPayload.transaction_date != null &&
-                billPayload.transaction_date.length > 0
-                ? (0, zeniDayJS_1.date)(billPayload.transaction_date)
-                : undefined,
+            invoiceDate: invoiceDate,
+            isInvoiceDateAutoUpdated: Boolean(billPayload.transaction_date) === true
+                ? (0, zeniDayJS_1.date)(billPayload.transaction_date).isBefore(bookCloseDate)
+                : false,
             currencyCode: billPayload.currency_code,
         },
         updatesByLineId: linesById,

package/package.json

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