@zeniai/client-epic-state 4.14.5 → 4.14.7

package/lib/view/spendManagement/billPay/billPayConfig/billPayConfigState.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCAL_CURRENCY_INTERNATIONAL_METHOD_SUBTEXT = exports.SWIFT_OUR_INTERNATIONAL_METHOD_SUBTEXT = exports.NEW_INTERNATIONAL_METHOD_SUBTEXT = exports.BILL_NEW_PAYMENT_METHODS = exports.toAccountTypeSubConfigCodeKeyType = exports.toAccType = exports.ACCOUNT_TYPE_CODES = exports.toBillPaymentSubConfigCodeType = exports.toBillPaymentSubConfigCodeKeyType = exports.INTERNATIONAL_SUB_CODES = exports.INTERNATIONAL_CODES = exports.toBillPaymentWireSubMethodCodeType = exports.BILL_PAYMENT_WIRE_SUB_CODES = exports.toPaymentAchSubMethodCodeType = exports.PAYMENT_ACH_SUB_CODES = exports.toBillPaymentMethodCodeType = exports.BILL_PAYMENT_METHOD_CODE = exports.toDynamicFeeType = exports.getBillPayConfigMethodKey = exports.getBillPayConfigKey = void 0;
+exports.LOCAL_CURRENCY_INTERNATIONAL_METHOD_SUBTEXT = exports.SWIFT_OUR_INTERNATIONAL_METHOD_SUBTEXT = exports.NEW_INTERNATIONAL_METHOD_SUBTEXT = exports.BILL_NEW_PAYMENT_METHODS = exports.toAccountTypeSubConfigCodeKeyType = exports.toAccType = exports.ACCOUNT_TYPE_CODES = exports.toBillPaymentSubConfigCodeType = exports.toBillPaymentSubConfigCodeKeyType = exports.INTERNATIONAL_SUB_CODES = exports.INTERNATIONAL_CODES = exports.toBillPaymentOutsideZeniSubMethodCodeType = exports.BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES = exports.toBillPaymentWireSubMethodCodeType = exports.BILL_PAYMENT_WIRE_SUB_CODES = exports.toPaymentAchSubMethodCodeType = exports.PAYMENT_ACH_SUB_CODES = exports.toBillPaymentMethodCodeType = exports.BILL_PAYMENT_METHOD_CODE = exports.toDynamicFeeType = exports.getBillPayConfigMethodKey = exports.getBillPayConfigKey = void 0;
 const common_1 = require("../../../../commonStateTypes/common");
 const stringToUnion_1 = require("../../../../commonStateTypes/stringToUnion");
 const getBillPayConfigKey = (method, subMethod) => {
@@ -10,7 +10,7 @@ const getBillPayConfigKey = (method, subMethod) => {
 exports.getBillPayConfigKey = getBillPayConfigKey;
 const getBillPayConfigMethodKey = (method, subMethod, accType, internationalMethod, internationalSubMethod) => {
     const keys = ['billPay', method, subMethod];
-    if (accType != null) {
+    if (method !== 'outside-zeni' && accType != null) {
         keys.push(accType);
     }
     if (internationalMethod != null) {
@@ -25,7 +25,11 @@ exports.getBillPayConfigMethodKey = getBillPayConfigMethodKey;
 const DYNAMIC_FEE_TYPE = ['percent', 'fixed'];
 const toDynamicFeeType = (v) => (0, stringToUnion_1.stringToUnion)(v, DYNAMIC_FEE_TYPE);
 exports.toDynamicFeeType = toDynamicFeeType;
-exports.BILL_PAYMENT_METHOD_CODE = ['ach', 'wire'];
+exports.BILL_PAYMENT_METHOD_CODE = [
+    'ach',
+    'wire',
+    'outside-zeni',
+];
 const toBillPaymentMethodCodeType = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.BILL_PAYMENT_METHOD_CODE);
 exports.toBillPaymentMethodCodeType = toBillPaymentMethodCodeType;
 exports.PAYMENT_ACH_SUB_CODES = ['standard', 'same-day'];
@@ -44,6 +48,11 @@ const BILL_PAYMENT_WIRE_SUB_CODES_KEYS = [
     'international',
 ];
 const toBillPaymentWireSubMethodCodeKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, BILL_PAYMENT_WIRE_SUB_CODES_KEYS);
+exports.BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES = ['outside-zeni'];
+const toBillPaymentOutsideZeniSubMethodCodeType = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES);
+exports.toBillPaymentOutsideZeniSubMethodCodeType = toBillPaymentOutsideZeniSubMethodCodeType;
+const BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES_KEYS = ['outsideZeni'];
+const toBillPaymentOutsideZeniSubMethodCodeKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES_KEYS);
 exports.INTERNATIONAL_CODES = [
     'usd-to-local-currency',
     'usd-to-usd',
@@ -58,9 +67,14 @@ const toInternationalSubMethodCodeKeyType = (v) => (0, stringToUnion_1.stringToU
 const toBillPaymentSubConfigCodeKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, [
     ...PAYMENT_ACH_SUB_CODES_KEYS,
     ...BILL_PAYMENT_WIRE_SUB_CODES_KEYS,
+    ...BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES_KEYS,
 ]);
 exports.toBillPaymentSubConfigCodeKeyType = toBillPaymentSubConfigCodeKeyType;
-const toBillPaymentSubConfigCodeType = (v) => (0, stringToUnion_1.stringToUnion)(v, [...exports.PAYMENT_ACH_SUB_CODES, ...exports.BILL_PAYMENT_WIRE_SUB_CODES]);
+const toBillPaymentSubConfigCodeType = (v) => (0, stringToUnion_1.stringToUnion)(v, [
+    ...exports.PAYMENT_ACH_SUB_CODES,
+    ...exports.BILL_PAYMENT_WIRE_SUB_CODES,
+    ...exports.BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES,
+]);
 exports.toBillPaymentSubConfigCodeType = toBillPaymentSubConfigCodeType;
 exports.ACCOUNT_TYPE_CODES = [
     'deposit_account',

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

@@ -5,7 +5,7 @@ import { BillPayInfo, BillTransaction } from '../../../../entity/billPay/billTra
 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 { RecurringBillConfigLocalData, OutsideZeniPaymentLocalData } from '../editBillView/editBillViewState';
 import { PaymentDetailsSectionView } from '../editBillView/editBillViewSelector';
 import { Amount } from '../../../../commonStateTypes/amount';
 import { BillPayConfig } from '../billPayConfig/billPayConfigState';
@@ -29,6 +29,7 @@ export interface BillPayReviewSelectorView extends SelectorView {
     recurringBillInstance?: number;
     recurringConfig?: RecurringBillConfigLocalData;
     isBillMarkedForRetry?: boolean;
+    outsideZeniPaymentInfo?: OutsideZeniPaymentLocalData;
 }
 export interface DuplicateBillsSelectorView extends SelectorView {
     bills: BillTransaction[];

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

@@ -158,6 +158,7 @@ const getReviewPageBillDetail = (state, billId) => {
         currencyCode: (_u = (_t = sourceBillDetail.billDetailLocalData.recipientTotalAmount) === null || _t === void 0 ? void 0 : _t.currencyCode) !== null && _u !== void 0 ? _u : 'USD',
         currencySymbol: (_w = (_v = sourceBillDetail.billDetailLocalData.recipientTotalAmount) === null || _v === void 0 ? void 0 : _v.currencySymbol) !== null && _w !== void 0 ? _w : '$',
     };
+    const outsideZeniPaymentInfo = sourceBillDetail.billDetailLocalData.outsideZeniPaymentLocalData;
     return {
         version: 0,
         duplicateBillTransactions: bills,
@@ -180,6 +181,7 @@ const getReviewPageBillDetail = (state, billId) => {
         isBillMarkedForRetry,
         zeniAssistRetryStatus,
         billPayInfo,
+        outsideZeniPaymentInfo,
     };
 };
 exports.getReviewPageBillDetail = getReviewPageBillDetail;

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

@@ -1,5 +1,5 @@
 import { ZeniAPIStatus } from '../../../../responsePayload';
-import { AddBillAutoFields, EditBillDetailViewState, BillDetailLocalData } from './editBillViewState';
+import { AddBillAutoFields, EditBillDetailViewState, BillDetailLocalData, OutsideZeniPaymentLocalData } from './editBillViewState';
 import { FetchState, FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { InvoiceProcessingPayload } from './editBillViewPayload';
 import { AmountPayload } from '../../../../entity/reimbursement/reimbursementPayload';
@@ -26,11 +26,10 @@ export declare const fetchEditBillDetailPage: import("@reduxjs/toolkit").ActionC
     billId?: string | undefined;
 }, string>, discardBillUpdatesInLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     billId?: string | undefined;
-}, string>, saveBillDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[billStageCode: "paid" | "pending_approval" | "scheduled" | "draft", isVendorRecommendationEnabled: boolean, billId?: string | undefined, isLocalCurrencyEnabled?: boolean | undefined], {
+}, string>, saveBillDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[billStageCode: "paid" | "pending_approval" | "scheduled" | "draft", isForMarkAsPaid: boolean, billId?: string | undefined], {
     billStageCode: "paid" | "pending_approval" | "scheduled" | "draft";
-    isVendorRecommendationEnabled: boolean;
+    isForMarkAsPaid: boolean;
     billId: string | undefined;
-    isLocalCurrencyEnabled: boolean | undefined;
 }, string, never, never>, saveBillSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchState: FetchState, billId?: string | undefined, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
     fetchState: FetchState;
     billId: string | undefined;
@@ -77,6 +76,11 @@ export declare const fetchEditBillDetailPage: import("@reduxjs/toolkit").ActionC
     billId: string | undefined;
 }, string, never, never>, markBillForRetry: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     billId: ID;
+}, string>, updateOutsideZeniPaymentLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    data: OutsideZeniPaymentLocalData;
+    billId?: string | undefined;
+}, string>, discardOutsideZeniPaymentLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    billId?: string | undefined;
 }, string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<EditBillDetailViewState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.markBillForRetry = exports.waitForVendorByIdThenSaveBillUpdatetoLocalStore = exports.fetchVendorAndUpdateBillLocalData = exports.updateHomeCurrencyConversion = exports.currencyConversionValueSuccessOrFailure = exports.convertAmountToHomeCurrency = exports.updateVendorContactSuccessOrFailure = exports.updateVendorContact = exports.updateSuggestedVendorIdFromParsedInvoice = exports.updateRecommendedVendorId = exports.updateBillUploadFetchState = exports.updateAddBillAutoFields = exports.updateShowAutofill = exports.updateInternationalTransferFeeBearerPaymentMethodInLocalData = exports.waitForVendorByNameThenParsetoLocalStore = exports.waitForBillDetailThenInitializeLocalStore = exports.clearEditBillViewDetail = exports.parseInvoiceToBill = exports.updateEditBillFetchStateCompleted = exports.saveBillSuccessOrFailure = exports.saveBillDetail = exports.discardBillUpdatesInLocalStore = exports.saveBillUpdatesToLocalStore = exports.initializeBillToLocalStore = exports.fetchVendorByNameAndParseInvoice = exports.fetchBillAndInitializeLocalStore = exports.fetchEditBillDetailPage = exports.initialState = void 0;
+exports.discardOutsideZeniPaymentLocalData = exports.updateOutsideZeniPaymentLocalData = exports.markBillForRetry = exports.waitForVendorByIdThenSaveBillUpdatetoLocalStore = exports.fetchVendorAndUpdateBillLocalData = exports.updateHomeCurrencyConversion = exports.currencyConversionValueSuccessOrFailure = exports.convertAmountToHomeCurrency = exports.updateVendorContactSuccessOrFailure = exports.updateVendorContact = exports.updateSuggestedVendorIdFromParsedInvoice = exports.updateRecommendedVendorId = exports.updateBillUploadFetchState = exports.updateAddBillAutoFields = exports.updateShowAutofill = exports.updateInternationalTransferFeeBearerPaymentMethodInLocalData = exports.waitForVendorByNameThenParsetoLocalStore = exports.waitForBillDetailThenInitializeLocalStore = exports.clearEditBillViewDetail = exports.parseInvoiceToBill = exports.updateEditBillFetchStateCompleted = exports.saveBillSuccessOrFailure = exports.saveBillDetail = exports.discardBillUpdatesInLocalStore = exports.saveBillUpdatesToLocalStore = exports.initializeBillToLocalStore = exports.fetchVendorByNameAndParseInvoice = exports.fetchBillAndInitializeLocalStore = exports.fetchEditBillDetailPage = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const editBillViewState_1 = require("./editBillViewState");
 const billDetailViewState_1 = require("../billDetailView/billDetailViewState");
@@ -131,6 +131,29 @@ const editBillView = (0, toolkit_1.createSlice)({
                 delete draft.newBillState.suggestedVendorIdFromParsedInvoice;
             }
         },
+        updateOutsideZeniPaymentLocalData(draft, action) {
+            const { billId, data } = action.payload;
+            if (billId != null) {
+                const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
+                draft.editBillStateById[key].billDetailLocalData.outsideZeniPaymentLocalData = Object.assign({}, data);
+            }
+            else {
+                draft.newBillState.billDetailLocalData.outsideZeniPaymentLocalData = Object.assign({}, data);
+            }
+        },
+        discardOutsideZeniPaymentLocalData(draft, action) {
+            const { billId } = action.payload;
+            if (billId != null) {
+                const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
+                delete draft.editBillStateById[key].billDetailLocalData
+                    .outsideZeniPaymentLocalData;
+            }
+            else {
+                draft.newBillState = editBillViewState_1.initialBillDetail;
+                delete draft.newBillState.billDetailLocalData
+                    .outsideZeniPaymentLocalData;
+            }
+        },
         // Fire this action to save the latest bill data in ZENI Platform.
         saveBillDetail: {
             reducer(draft, action) {
@@ -149,13 +172,12 @@ const editBillView = (0, toolkit_1.createSlice)({
                         } });
                 }
             },
-            prepare(billStageCode, isVendorRecommendationEnabled, billId, isLocalCurrencyEnabled) {
+            prepare(billStageCode, isForMarkAsPaid, billId) {
                 return {
                     payload: {
                         billStageCode,
-                        isVendorRecommendationEnabled,
+                        isForMarkAsPaid,
                         billId,
-                        isLocalCurrencyEnabled,
                     },
                 };
             },
@@ -349,7 +371,7 @@ 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.fetchVendorAndUpdateBillLocalData = _a.fetchVendorAndUpdateBillLocalData, exports.waitForVendorByIdThenSaveBillUpdatetoLocalStore = _a.waitForVendorByIdThenSaveBillUpdatetoLocalStore, exports.markBillForRetry = _a.markBillForRetry;
+_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.fetchVendorAndUpdateBillLocalData = _a.fetchVendorAndUpdateBillLocalData, exports.waitForVendorByIdThenSaveBillUpdatetoLocalStore = _a.waitForVendorByIdThenSaveBillUpdatetoLocalStore, exports.markBillForRetry = _a.markBillForRetry, exports.updateOutsideZeniPaymentLocalData = _a.updateOutsideZeniPaymentLocalData, exports.discardOutsideZeniPaymentLocalData = _a.discardOutsideZeniPaymentLocalData;
 exports.default = editBillView.reducer;
 function doUpdateRecurringBillLocalData(billDetail, currentConfig, prevConfig) {
     var _a, _b, _c, _d;

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

@@ -12,7 +12,7 @@ import { ClassListSelectorView } from '../../../classList/classListSelector';
 import { PreviousBillsSelectorView } from '../previousBills/previousBillsSelector';
 import { AddBillAutoFields, PaymentDetailsSection, WhatForSection, PaymentModeType, PaymentMode, RecurringBillConfigLocalData, RecurringBillInstance } from './editBillViewState';
 import { BillActivity } from '../billDetailView/billDetailViewSelector';
-import { BillPaySetupApproverView } from '../billPaySetupApproverView/billPaySetupApproverViewSelectorTypes';
+import { ApprovalRuleWithUser, BillPaySetupApproverView } from '../billPaySetupApproverView/billPaySetupApproverViewSelectorTypes';
 import { User } from '../../../../entity/user/userState';
 import { BillPayConfig, BillPayConfigState, AccountTypeSubConfigCodeKeyType } from '../billPayConfig/billPayConfigState';
 import { ActivityHistorySelectorView } from '../../commonHistoryView/commonHistorySelector';
@@ -27,6 +27,7 @@ import { ClassBase, RecommendedClassBase } from '../../../../entity/class/classS
 import { RecurringBillState } from '../../../../entity/billPay/recurringBills/recurringBillsState';
 import { FundingAccount } from '../../commonSetup/setupViewSelector';
 import { AllowedValueWithCode } from '../../../../commonStateTypes/allowedValue';
+import { LoggedInUser } from '../../../../entity/tenant/tenantState';
 export declare type PaymentToOption = {
     id: ID;
     type: PaymentModeType;
@@ -120,7 +121,7 @@ export interface EditBillInitialDetails {
 }
 export declare const getEditBillDetail: (state: RootState, isVendorRecommendationFeatureEnabled: boolean, isZeniAccountsEnabled: boolean, billId?: string | undefined) => EditBillDetailSelectorView;
 export declare const getBillPayConfigList: (billPayConfigState: BillPayConfigState) => BillPayConfig[];
-export declare const getPaymentMethodType: (billPayConfigState: BillPayConfigState, accType: AccountTypeSubConfigCodeKeyType, paymentMethod?: BillPaymentMethod | undefined, internationalTransferFeeBearerPaymentMethod?: "swift_our" | "swift_sha" | undefined) => BillPayConfig | undefined;
+export declare const getPaymentMethodType: (billPayConfigState: BillPayConfigState, accType?: "depositAccount" | "paymentAccount" | undefined, paymentMethod?: BillPaymentMethod | undefined, internationalTransferFeeBearerPaymentMethod?: "swift_our" | "swift_sha" | undefined) => BillPayConfig | undefined;
 export declare function getWhatForSection(updatedWhatForSection: WhatForSection | undefined): WhatForSection;
 export declare function getPaymentSection(state: RootState, withdrawFromList: FundingAccount[], updatedPaymentSection: PaymentDetailsSection, companyId?: string, billPayInfo?: BillPayInfo): PaymentDetailsSectionView;
 export declare function toPaymentToOption(paymentMode: PaymentMode): PaymentToOption;
@@ -148,3 +149,4 @@ export declare const getDefaultWithdrawFromAccount: (state: RootState, depositAc
     accountId: ID;
     accountType: AccountTypeSubConfigCodeKeyType;
 } | undefined) => FundingAccount | undefined;
+export declare const checkIfCreatorIsApprover: (billAmount: number, approvalRules: ApprovalRuleWithUser[], signedInUser?: LoggedInUser | undefined) => boolean;

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.getDefaultWithdrawFromAccount = exports.getWithdrawFrom = exports.getDueDate = exports.getInvoiceDate = exports.getRecurringBillLocalData = exports.toPaymentToOption = exports.getPaymentSection = exports.getWhatForSection = exports.getPaymentMethodType = exports.getBillPayConfigList = exports.getEditBillDetail = void 0;
+exports.checkIfCreatorIsApprover = exports.getDefaultWithdrawFromAccount = exports.getWithdrawFrom = exports.getDueDate = exports.getInvoiceDate = exports.getRecurringBillLocalData = exports.toPaymentToOption = 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");
@@ -406,6 +406,10 @@ const getBillPayConfigList = (billPayConfigState) => {
                 });
                 break;
             }
+            case 'outside-zeni': {
+                billPayConfigState_1.BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES.forEach((subCode) => billPayConfigKeys.push((0, billPayConfigState_1.getBillPayConfigMethodKey)(code, (0, billPayConfigPayload_1.getBillPaymentSubConfigCodeKey)(subCode))));
+                break;
+            }
         }
     });
     return (0, billPayConfigSelector_1.getBillPayConfigByKeys)(billPayConfigState, billPayConfigKeys);
@@ -455,7 +459,11 @@ function getPaymentSection(state, withdrawFromList, updatedPaymentSection, compa
             : (0, exports.getWithdrawFrom)(state, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountId, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountType, companyId !== null && companyId !== void 0 ? companyId : '', state.billPayConfigState.lastSelectedFromAccount);
     const withdrawFromAccountingName = undefined;
     const availablePaymentOptions = state.billPayConfigState.fetchState === 'Completed'
-        ? (0, exports.getBillPayConfigList)(state.billPayConfigState).filter((option) => { var _a; return option.method.includes((_a = withdrawFrom === null || withdrawFrom === void 0 ? void 0 : withdrawFrom.accType) !== null && _a !== void 0 ? _a : ''); })
+        ? (0, exports.getBillPayConfigList)(state.billPayConfigState).filter((option) => {
+            var _a;
+            return (0, helpers_1.isPaymentMethodOutsideZeni)(option.method) ||
+                option.method.includes((_a = withdrawFrom === null || withdrawFrom === void 0 ? void 0 : withdrawFrom.accType) !== null && _a !== void 0 ? _a : '');
+        })
         : [];
     const isSinglePaymentTypeOption = availablePaymentOptions.length === 1;
     return {
@@ -664,3 +672,26 @@ const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSe
     return undefined;
 };
 exports.getDefaultWithdrawFromAccount = getDefaultWithdrawFromAccount;
+const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
+    let isCreatorAlsoApprover = false;
+    const approvalRule = approvalRules.find((rule) => {
+        const { max, min } = rule.criteria[0].range;
+        return (billAmount > min.amount &&
+            ((max === null || max === void 0 ? void 0 : max.amount) != null ? billAmount <= (max === null || max === void 0 ? void 0 : max.amount) : true));
+    });
+    if (approvalRule != null) {
+        const requireApprovalSteps = approvalRule.steps.filter((step) => step.action === 'require_approval');
+        if (requireApprovalSteps.length === 1) {
+            const requiredStep = requireApprovalSteps[0];
+            const stepOperator = requiredStep.operator;
+            if (stepOperator === 'or' || stepOperator === 'is') {
+                const approvers = requiredStep.actors;
+                if (approvers.some((user) => user.userId === (signedInUser === null || signedInUser === void 0 ? void 0 : signedInUser.userId))) {
+                    isCreatorAlsoApprover = true;
+                }
+            }
+        }
+    }
+    return isCreatorAlsoApprover;
+};
+exports.checkIfCreatorIsApprover = checkIfCreatorIsApprover;

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

@@ -7,7 +7,7 @@ import { Vendor } from '../../../../entity/vendor/vendorState';
 import { ZeniDate } from '../../../../zeniDayJS';
 import { BillTransactionDetailKey } from '../billDetailView/billDetailViewState';
 import { LineItemOnlyRecommendationsLocalData, LineItemRecommendationsLocalData } from './editBillViewSelector';
-import { InternationalTransferFeeBearerPaymentMethod, BillStage } from '../../../../entity/billPay/billTransaction/billTransactionState';
+import { InternationalTransferFeeBearerPaymentMethod, BillStage, OutsideZeniPaymentModeType } from '../../../../entity/billPay/billTransaction/billTransactionState';
 import { PaymentInstrument } from '../../../../entity/paymentInstrument/paymentInstrument';
 import { BankAccount } from '../../../../entity/bankAccount/bankAccount';
 import { Contact } from '../../../../entity/billPay/contact/contact';
@@ -66,6 +66,7 @@ export interface BillDetailLocalData {
     isRecurring: boolean;
     recurringConfig?: RecurringBillConfigLocalData;
     recurringBillInstances?: RecurringBillInstance[];
+    outsideZeniPaymentLocalData?: OutsideZeniPaymentLocalData;
 }
 export interface WhatForSection {
     invoiceNumber?: string;
@@ -111,4 +112,8 @@ export interface RecurringBillConfigLocalData {
     isActive: boolean;
     updateRecurringBills?: EditRecurringBillType;
 }
+export interface OutsideZeniPaymentLocalData {
+    paymentMode?: OutsideZeniPaymentModeType;
+    paymentDate?: ZeniDate;
+}
 export {};

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

@@ -17,6 +17,7 @@ const classListSelector_1 = require("../../../../classList/classListSelector");
 const workingDayHelper_1 = require("../../../../../commonStateTypes/workingDayHelper");
 const zeniDayJS_1 = require("../../../../../zeniDayJS");
 const companySelector_1 = require("../../../../../entity/company/companySelector");
+const helpers_1 = require("../../../helpers");
 const isClassRecommendation = (recommendations, classObj) => {
     if (classObj == null) {
         return false;
@@ -90,7 +91,7 @@ const getLineRecommendationsLocalData = (lineId, line, recommendations, accountL
 };
 exports.getLineRecommendationsLocalData = getLineRecommendationsLocalData;
 const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.initializeBillToLocalStore.match), (0, operators_1.mergeMap)((action) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const { billId } = action.payload;
     const state = state$.value;
     const detailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
@@ -158,10 +159,12 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
         const isPayNowEnabled = payNowCutOffTime != null
             ? (0, zeniDayJS_1.dateNow)().isSameOrBefore(payNowCutOffTime)
             : false;
+        const paymentDate = (_h = transaction.billPayInfo.paymentDate) !== null && _h !== void 0 ? _h : (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString());
         const paymentDetailsSection = {
-            paymentType: (0, editBillViewSelector_1.getPaymentMethodType)(state.billPayConfigState, (_h = transaction.billPayInfo.fromAccount.billAccountType) !== null && _h !== void 0 ? _h : 'depositAccount', transaction.billPayInfo.billPaymentMethodType, transaction.billPayInfo.internationalTransferFeeBearerPaymentMethod),
-            paymentDate: (_j = transaction.billPayInfo.paymentDate) !== null && _j !== void 0 ? _j : (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()),
-            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(state, (_k = transaction.billPayInfo.fromAccount.billAccountId) !== null && _k !== void 0 ? _k : '', (_l = transaction.billPayInfo.fromAccount.billAccountType) !== null && _l !== void 0 ? _l : '', companyId),
+            paymentType: (0, editBillViewSelector_1.getPaymentMethodType)(state.billPayConfigState, transaction.billPayInfo.fromAccount.billAccountType, //Check default conditions if any
+            transaction.billPayInfo.billPaymentMethodType, transaction.billPayInfo.internationalTransferFeeBearerPaymentMethod),
+            paymentDate,
+            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(state, (_j = transaction.billPayInfo.fromAccount.billAccountId) !== null && _j !== void 0 ? _j : '', (_k = transaction.billPayInfo.fromAccount.billAccountType) !== null && _k !== void 0 ? _k : '', companyId),
             paymentTo: transaction.billPayInfo.toAccount.billAccountId != null &&
                 transaction.billPayInfo.toAccount.billAccountId.length > 0
                 ? transaction.billPayInfo.toAccount.billAccountId
@@ -171,7 +174,7 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
         const totalAmount = transaction.amount;
         const recipientTotalAmount = transaction.recipientTotalAmount;
         const isCancelled = transaction.billPayInfo.isCancelled;
-        const file = (_m = transaction.attachments) === null || _m === void 0 ? void 0 : _m[0];
+        const file = (_l = transaction.attachments) === null || _l === void 0 ? void 0 : _l[0];
         const candidateVendorname = transaction.candidateVendorName;
         const toAccountVendorEmail = transaction.billPayInfo.toAccountVendorEmail;
         const isCollectToAccountInfoFromVendorContact = transaction.billPayInfo.isCollectToAccountInfoFromVendorContact;
@@ -183,6 +186,13 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
             recurringConfig = recurringConfigLocalData;
             recurringBillInstances = recurringBillInstancesLocalData;
         }
+        const isPaymentOutsideZeni = (0, helpers_1.isPaymentMethodOutsideZeni)(transaction.billPayInfo.billPaymentMethodType.code);
+        const outsideZeniPaymentLocalData = isPaymentOutsideZeni
+            ? {
+                paymentMode: transaction.billPayInfo.outsideZeniTransactionPaymentMode,
+                paymentDate: transaction.billPayInfo.paymentDate,
+            }
+            : undefined;
         const billDetailLocalData = {
             showVendorGptRecommendationText: false,
             vendor,
@@ -199,6 +209,7 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
             isRecurring,
             recurringConfig,
             recurringBillInstances,
+            outsideZeniPaymentLocalData,
         };
         const actions = [
             (0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({ billDetailLocalData, billId }),

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

@@ -28,6 +28,7 @@ const billPayConfigPayload_1 = require("../../billPayConfig/billPayConfigPayload
 const billTransactionState_1 = require("../../../../../entity/billPay/billTransaction/billTransactionState");
 const workingDayHelper_1 = require("../../../../../commonStateTypes/workingDayHelper");
 const companySelector_1 = require("../../../../../entity/company/companySelector");
+const helpers_1 = require("../../../helpers");
 const parseInvoiceToBillEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.parseInvoiceToBill.match), (0, operators_1.mergeMap)((action) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const { invoiceProcessingPayload, isVendorRecommendationFeatureEnabled } = action.payload;
@@ -144,7 +145,7 @@ const parseInvoiceToBillEpic = (actions$, state$) => actions$.pipe((0, operators
 }));
 exports.parseInvoiceToBillEpic = parseInvoiceToBillEpic;
 const toBillDetailLocalData = (state, showVendorGptRecommendationText, billPayload, vendor, recommendedVendorId) => {
-    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;
+    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;
     const currency = {
         currencyCode: (_a = billPayload.recipient_currency_code) !== null && _a !== void 0 ? _a : '',
         currencySymbol: (_b = billPayload.recipient_currency_symbol) !== null && _b !== void 0 ? _b : '', //api not returning symbol
@@ -225,6 +226,18 @@ const toBillDetailLocalData = (state, showVendorGptRecommendationText, billPaylo
             ? (0, billPayConfigPayload_1.getInternationalSubConfigCodeKey)(internationalSubCode)
             : undefined))
         : undefined;
+    const isPaymentOutsideZeni = (0, helpers_1.isPaymentMethodOutsideZeni)(paymentMethodCode !== null && paymentMethodCode !== void 0 ? paymentMethodCode : '');
+    const outsideZeniPaymentMode = (_o = billPayload.bill_pay_info) === null || _o === void 0 ? void 0 : _o.outside_zeni_transaction_payment_mode;
+    const outsideZeniPaymentLocalData = isPaymentOutsideZeni
+        ? {
+            paymentMode: outsideZeniPaymentMode != null
+                ? (0, billTransactionState_1.toOutsideZeniPaymentModeType)(outsideZeniPaymentMode)
+                : undefined,
+            paymentDate: ((_p = billPayload.bill_pay_info) === null || _p === void 0 ? void 0 : _p.payment_date) != null
+                ? (0, zeniDayJS_1.date)((_q = billPayload.bill_pay_info) === null || _q === void 0 ? void 0 : _q.payment_date)
+                : undefined,
+        }
+        : undefined;
     return {
         recommendedVendorId,
         showVendorGptRecommendationText,
@@ -245,30 +258,31 @@ const toBillDetailLocalData = (state, showVendorGptRecommendationText, billPaylo
         paymentDetailsSection: {
             paymentTo: undefined,
             paymentType: paymentType,
-            paymentDate: ((_o = billPayload.bill_pay_info) === null || _o === void 0 ? void 0 : _o.payment_date) != null
-                ? (0, zeniDayJS_1.date)((_p = billPayload.bill_pay_info) === null || _p === void 0 ? void 0 : _p.payment_date)
+            paymentDate: ((_r = billPayload.bill_pay_info) === null || _r === void 0 ? void 0 : _r.payment_date) != null
+                ? (0, zeniDayJS_1.date)((_s = billPayload.bill_pay_info) === null || _s === void 0 ? void 0 : _s.payment_date)
                 : (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()),
-            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(state, (_r = (_q = billPayload.bill_pay_info) === null || _q === void 0 ? void 0 : _q.from_account.account_id) !== null && _r !== void 0 ? _r : '', (_t = (_s = billPayload.bill_pay_info) === null || _s === void 0 ? void 0 : _s.from_account.account_type) !== null && _t !== void 0 ? _t : ''),
-            internationalTransferFeeBearerPaymentMethod: ((_u = billPayload.bill_pay_info) === null || _u === void 0 ? void 0 : _u.international_transfer_fee_bearer_payment_method) != null
-                ? (0, billTransactionState_1.toInternationalTransferFeeBearerPaymentMethod)((_v = billPayload.bill_pay_info) === null || _v === void 0 ? void 0 : _v.international_transfer_fee_bearer_payment_method)
+            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(state, (_u = (_t = billPayload.bill_pay_info) === null || _t === void 0 ? void 0 : _t.from_account.account_id) !== null && _u !== void 0 ? _u : '', (_w = (_v = billPayload.bill_pay_info) === null || _v === void 0 ? void 0 : _v.from_account.account_type) !== null && _w !== void 0 ? _w : ''),
+            internationalTransferFeeBearerPaymentMethod: ((_x = billPayload.bill_pay_info) === null || _x === void 0 ? void 0 : _x.international_transfer_fee_bearer_payment_method) != null
+                ? (0, billTransactionState_1.toInternationalTransferFeeBearerPaymentMethod)((_y = billPayload.bill_pay_info) === null || _y === void 0 ? void 0 : _y.international_transfer_fee_bearer_payment_method)
                 : undefined,
         },
         totalAmount: billPayload.amount != null
             ? (0, amount_1.toAmountWC)(billPayload.amount, {
-                currencyCode: (_w = billPayload.currency_code) !== null && _w !== void 0 ? _w : 'USD',
-                currencySymbol: (_x = billPayload.currency_symbol) !== null && _x !== void 0 ? _x : '$',
+                currencyCode: (_z = billPayload.currency_code) !== null && _z !== void 0 ? _z : 'USD',
+                currencySymbol: (_0 = billPayload.currency_symbol) !== null && _0 !== void 0 ? _0 : '$',
             })
             : undefined,
         recipientTotalAmount: billPayload.recipient_total_amount != null
             ? (0, amount_1.toAmountWC)(billPayload.recipient_total_amount, {
-                currencyCode: (_y = billPayload.recipient_currency_code) !== null && _y !== void 0 ? _y : 'USD',
-                currencySymbol: (_z = billPayload.recipient_currency_symbol) !== null && _z !== void 0 ? _z : '$',
+                currencyCode: (_1 = billPayload.recipient_currency_code) !== null && _1 !== void 0 ? _1 : 'USD',
+                currencySymbol: (_2 = billPayload.recipient_currency_symbol) !== null && _2 !== void 0 ? _2 : '$',
             })
             : undefined,
         isCancelled: false,
-        toAccountVendorEmail: (_1 = (_0 = billPayload.bill_pay_info) === null || _0 === void 0 ? void 0 : _0.to_account_vendor_email) !== null && _1 !== void 0 ? _1 : undefined,
-        isCollectToAccountInfoFromVendorContact: (_3 = (_2 = billPayload.bill_pay_info) === null || _2 === void 0 ? void 0 : _2.is_collect_to_account_info_from_vendor_contact) !== null && _3 !== void 0 ? _3 : false,
-        isRecurring: (_4 = billPayload.is_recurring) !== null && _4 !== void 0 ? _4 : false,
+        toAccountVendorEmail: (_4 = (_3 = billPayload.bill_pay_info) === null || _3 === void 0 ? void 0 : _3.to_account_vendor_email) !== null && _4 !== void 0 ? _4 : undefined,
+        isCollectToAccountInfoFromVendorContact: (_6 = (_5 = billPayload.bill_pay_info) === null || _5 === void 0 ? void 0 : _5.is_collect_to_account_info_from_vendor_contact) !== null && _6 !== void 0 ? _6 : false,
+        isRecurring: (_7 = billPayload.is_recurring) !== null && _7 !== void 0 ? _7 : false,
+        outsideZeniPaymentLocalData,
     };
 };
 exports.toBillDetailLocalData = toBillDetailLocalData;

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

@@ -10,12 +10,12 @@ import { AccountState } from '../../../../../entity/account/accountState';
 import { PaymentAccountState } from '../../../../../entity/paymentAccount/paymentAccountState';
 import { updateRecurringBillConfigs, updateRecurringBills } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
 import { RecurringBillState } from '../../../../../entity/billPay/recurringBills/recurringBillsState';
-import { PaymentAchSubConfigCodeType, BillPaymentConfigCodeType, BillPaymentWireSubConfigCodeType } from '../../billPayConfig/billPayConfigState';
+import { BillPaymentConfigCodeType, BillPaymentSubConfigCodeType } from '../../billPayConfig/billPayConfigState';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { RecurringBillConfigBodyPayload } from '../../../../../entity/billPay/recurringBills/recurringBillsPayload';
 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 declare function prepareSaveBillPayload(accountState: AccountState, billTransactionState: BillTransactionState, paymentAccountState: PaymentAccountState, recurringBillState: RecurringBillState, billDetail: EditBillDetail, billStageCode: BillStageCodeType): Partial<SaveBillPayload>;
+export declare function prepareSaveBillPayload(accountState: AccountState, billTransactionState: BillTransactionState, paymentAccountState: PaymentAccountState, recurringBillState: RecurringBillState, billDetail: EditBillDetail, billStageCode: BillStageCodeType, isForMarkAsPaid: boolean): Partial<SaveBillPayload>;
 interface SaveBillPayload {
     vendor_id: string;
     vendor_name?: string | null;
@@ -45,11 +45,15 @@ interface SaveBillPayload {
         bill_payment_method_type: {
             code: BillPaymentConfigCodeType | null;
             name: string;
-            sub_code: PaymentAchSubConfigCodeType | BillPaymentWireSubConfigCodeType | null;
+            sub_code: BillPaymentSubConfigCodeType | null;
         };
         to_account_vendor_email?: string | null;
         is_collect_to_account_info_from_vendor_contact?: boolean;
         international_transfer_fee_bearer_payment_method?: string | null;
+        outside_zeni_transaction_payment_mode?: string | null;
+        bill_payment_status: {
+            code: string | null;
+        };
     };
     document_id: string;
     transaction_memo: string;