@zeniai/client-epic-state 4.9.66 → 4.9.69

package/lib/entity/billPay/billTransaction/billTransactionPayload.d.ts

@@ -4,22 +4,25 @@ import { BillPayInfo, BillStage, BillTransaction, BillAccount, BillPaymentMethod
 export interface BillTransactionPayload extends VendorTransactionPayload {
     bill_pay_info: BillPayInfoPayload;
     entity_approval_id: ID;
+    total_fee: number;
+    is_deleted: boolean;
+    deletion_info: DeletionInfoPayload;
+    update_time: string;
+    is_recurring: boolean;
+    recurring_bill_config_id: string | null;
+    recurring_bill_instance: number | null;
+    home_currency_amount: number;
+    home_currency_code: string;
+    home_currency_symbol: string;
     class_id?: ID | null;
     class_name?: string | null;
     qbo_class_id?: ID | null;
     transaction_reference_id?: ID | null;
-    update_time: string;
     invoice_number?: string;
     created_by_user_id?: ID | null;
-    total_fee: number;
-    is_deleted: boolean;
-    deletion_info: DeletionInfoPayload;
     last_updated_by_user_id?: string;
     candidate_vendor_name?: string;
     tax?: number;
-    is_recurring: boolean;
-    recurring_bill_config_id: string | null;
-    recurring_bill_instance: number | null;
     discount?: number;
 }
 export interface BillPayInfoPayload {

package/lib/entity/billPay/billTransaction/billTransactionPayload.js

@@ -9,7 +9,7 @@ const billTransactionState_1 = require("./billTransactionState");
 const billPayConfigPayload_1 = require("../../../view/spendManagement/billPay/billPayConfig/billPayConfigPayload");
 const toBillTransaction = (payload) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    return (Object.assign(Object.assign({}, (0, vendorTransactionPayload_1.toVendorTransaction)(payload)), { billPayInfo: (0, exports.toBillPayInfo)(payload.bill_pay_info), classId: (_a = payload.class_id) !== null && _a !== void 0 ? _a : '', className: (_b = payload.class_name) !== null && _b !== void 0 ? _b : '', qboClassId: (_c = payload.qbo_class_id) !== null && _c !== void 0 ? _c : '', transactionReferenceId: (_d = payload.transaction_reference_id) !== null && _d !== void 0 ? _d : '', entityApprovalId: payload.entity_approval_id, updateTime: (0, zeniDayJS_1.date)(payload.update_time), createdBy: (_e = payload.created_by_user_id) !== null && _e !== void 0 ? _e : '', candidateVendorName: (_f = payload.candidate_vendor_name) !== null && _f !== void 0 ? _f : '', bookCloseDate: payload.book_close_date != null ? (0, zeniDayJS_1.date)(payload.book_close_date) : undefined, lastUpdatedByUserId: (_g = payload.last_updated_by_user_id) !== null && _g !== void 0 ? _g : '', paymentProcessingTotalFee: (0, amount_1.toAmount)((_h = payload.total_fee) !== null && _h !== void 0 ? _h : 0, payload.currency_code, payload.currency_symbol), isDeleted: payload.is_deleted, deletionInfo: (0, exports.toDeletionInfo)(payload.deletion_info), isRecurring: payload.is_recurring, recurringBillConfigId: (_j = payload.recurring_bill_config_id) !== null && _j !== void 0 ? _j : undefined, recurringBillInstance: (_k = payload.recurring_bill_instance) !== null && _k !== void 0 ? _k : undefined }));
+    return (Object.assign(Object.assign({}, (0, vendorTransactionPayload_1.toVendorTransaction)(payload)), { billPayInfo: (0, exports.toBillPayInfo)(payload.bill_pay_info), classId: (_a = payload.class_id) !== null && _a !== void 0 ? _a : '', className: (_b = payload.class_name) !== null && _b !== void 0 ? _b : '', qboClassId: (_c = payload.qbo_class_id) !== null && _c !== void 0 ? _c : '', transactionReferenceId: (_d = payload.transaction_reference_id) !== null && _d !== void 0 ? _d : '', entityApprovalId: payload.entity_approval_id, updateTime: (0, zeniDayJS_1.date)(payload.update_time), createdBy: (_e = payload.created_by_user_id) !== null && _e !== void 0 ? _e : '', candidateVendorName: (_f = payload.candidate_vendor_name) !== null && _f !== void 0 ? _f : '', bookCloseDate: payload.book_close_date != null ? (0, zeniDayJS_1.date)(payload.book_close_date) : undefined, lastUpdatedByUserId: (_g = payload.last_updated_by_user_id) !== null && _g !== void 0 ? _g : '', paymentProcessingTotalFee: (0, amount_1.toAmount)((_h = payload.total_fee) !== null && _h !== void 0 ? _h : 0, payload.currency_code, payload.currency_symbol), isDeleted: payload.is_deleted, deletionInfo: (0, exports.toDeletionInfo)(payload.deletion_info), isRecurring: payload.is_recurring, recurringBillConfigId: (_j = payload.recurring_bill_config_id) !== null && _j !== void 0 ? _j : undefined, recurringBillInstance: (_k = payload.recurring_bill_instance) !== null && _k !== void 0 ? _k : undefined, totalAmountInUSD: (0, amount_1.toAmount)(payload.home_currency_amount, payload.home_currency_code, payload.home_currency_symbol) }));
 };
 exports.toBillTransaction = toBillTransaction;
 const toBillPayInfo = (payload) => {

package/lib/entity/billPay/billTransaction/billTransactionState.d.ts

@@ -12,7 +12,6 @@ export interface BillTransaction extends VendorTransaction {
     transactionReferenceId: ID;
     entityApprovalId: ID;
     updateTime: ZeniDate;
-    bookCloseDate?: ZeniDate;
     createdBy: ID;
     paymentProcessingTotalFee: Amount;
     candidateVendorName: string;
@@ -20,8 +19,10 @@ export interface BillTransaction extends VendorTransaction {
     isDeleted: boolean;
     deletionInfo: DeletionInfo;
     isRecurring: boolean;
+    totalAmountInUSD: Amount;
     recurringBillConfigId?: ID;
     recurringBillInstance?: number;
+    bookCloseDate?: ZeniDate;
 }
 export interface BillPayInfo {
     stage: BillStage;

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.js

@@ -42,7 +42,7 @@ const getScheduleDetailsView = (state, scheduleType) => {
     const scheduleDetailAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleDetailAccountTypes);
     const allAccountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, accountTypes.accountListKey);
     const filteredAccounts = allAccountList.accounts.filter((account) => scheduleDetailAccountIds.includes(account.accountId));
-    const depreciationCategoryIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, ['fixed_assets', 'other_assets'] // This will always be for fixed assets list
+    const depreciationCategoryIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, ['fixed_assets'] // This will always be for fixed assets list
     );
     const accountLabel = (0, scheduleListHelper_1.getAccountLabelForScheduleType)('fixed_assets');
     const fixedAssetLabelAccountIds = accountLabel != null

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

@@ -229,7 +229,7 @@ const getAccountsTypesForScheduleList = (scheduleType) => {
         case 'fixed_assets':
             return {
                 accountListKey: 'schedulesAccountList',
-                allowedAccountList: ['fixed_assets', 'other_assets'],
+                allowedAccountList: ['fixed_assets'],
             };
         default:
             return {
@@ -263,7 +263,6 @@ const getAccountsTypesForScheduleEpics = () => {
             'cogs',
             'expenses',
             'other_expense',
-            'other_assets',
         ],
     };
 };

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -375,7 +375,7 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                 }
                 break;
             case 'amount':
-                if (Boolean(transaction.amount) === true) {
+                if (Boolean(transaction.totalAmountInUSD) === true) {
                     transactionsWithSortKeyValue.push(transaction);
                 }
                 else
@@ -413,7 +413,7 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
             case 'status':
                 return getStatusPerTab(transaction);
             case 'amount':
-                return (_b = transaction.amount.amount) !== null && _b !== void 0 ? _b : 0;
+                return (_b = transaction.totalAmountInUSD.amount) !== null && _b !== void 0 ? _b : 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
         }

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

@@ -1,6 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { parseInvoiceToBill, saveBillUpdatesToLocalStore, updateAddBillAutoFields, updateBillUploadFetchState, updateShowAutofill } from '../editBillViewReducer';
+import { convertAmountToHomeCurrency, parseInvoiceToBill, saveBillUpdatesToLocalStore, updateAddBillAutoFields, updateBillUploadFetchState, updateShowAutofill } from '../editBillViewReducer';
 import { RootState } from '../../../../../reducer';
 import { fetchClassList } from '../../../../classList/classListReducer';
 import { BillTransactionPayload } from '../../../../../entity/billPay/billTransaction/billTransactionPayload';
@@ -8,7 +8,7 @@ import { AddBillAutoFields, BillDetailLocalData } from '../editBillViewState';
 import { Vendor } from '../../../../../entity/vendor/vendorState';
 import { fetchPreviousBills } from '../../previousBills/previousBillsReducer';
 import { fetchDuplicateBill } from '../../billPayReview/billPayReviewReducer';
-export declare type ActionType = ReturnType<typeof parseInvoiceToBill> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof updateShowAutofill> | ReturnType<typeof updateAddBillAutoFields> | ReturnType<typeof updateBillUploadFetchState>;
+export declare type ActionType = ReturnType<typeof parseInvoiceToBill> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof updateShowAutofill> | ReturnType<typeof updateAddBillAutoFields> | ReturnType<typeof updateBillUploadFetchState> | ReturnType<typeof convertAmountToHomeCurrency>;
 export declare const parseInvoiceToBillEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
 export declare const toBillDetailLocalData: (state: RootState, showVendorGptRecommendationText: boolean, billPayload: Partial<BillTransactionPayload>, vendor: Vendor | undefined, recommendedVendorId?: string | undefined) => BillDetailLocalData;
 export declare const getAutoFieldsData: (finalBill: BillDetailLocalData, isVendorWithNewCurrency: boolean, tentativeVendorName?: string | undefined, currencyInInvoice?: string | undefined, vendorCurrency?: string | undefined) => AddBillAutoFields;

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

@@ -29,7 +29,7 @@ const billTransactionState_1 = require("../../../../../entity/billPay/billTransa
 const workingDayHelper_1 = require("../../../../../commonStateTypes/workingDayHelper");
 const companySelector_1 = require("../../../../../entity/company/companySelector");
 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;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const { invoiceProcessingPayload, isVendorRecommendationFeatureEnabled } = action.payload;
     const state = state$.value;
     const showSkipAutofill = state.editBillDetailViewState.newBillState.showSkipAutofill;
@@ -101,10 +101,28 @@ const parseInvoiceToBillEpic = (actions$, state$) => actions$.pipe((0, operators
         const finalBill = Object.assign(Object.assign({}, (0, exports.toBillDetailLocalData)(state, showVendorGptRecommendationText, invoiceProcessingPayload.bills[0], finalVendor, recommendedVendorId)), { file: file });
         const addBillAutoFields = (0, exports.getAutoFieldsData)(finalBill, isVendorWithNewCurrency, vendorNameFromInvoice, currencyInInvoice, vendorCurrency);
         if (finalVendor != null) {
-            return (0, rxjs_1.of)((0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({ billDetailLocalData: finalBill }), (0, previousBillsReducer_1.fetchPreviousBills)(finalVendor.qboId, false), (0, billPayReviewReducer_1.fetchDuplicateBill)(finalVendor.name, finalVendor.id, (_e = (_d = finalBill.totalAmount) === null || _d === void 0 ? void 0 : _d.amount) !== null && _e !== void 0 ? _e : 0, (_f = finalBill.whatForSection) === null || _f === void 0 ? void 0 : _f.invoiceNumber), (0, editBillViewReducer_1.updateShowAutofill)(false), (0, editBillViewReducer_1.updateAddBillAutoFields)(addBillAutoFields), (0, editBillViewReducer_1.updateBillUploadFetchState)({
-                fetchState: 'Completed',
-                error: undefined,
-            }));
+            let actions = [];
+            if (finalVendor.vendorCurrencyCode != null &&
+                finalVendor.vendorCurrencyCode !== 'USD') {
+                actions.push((0, editBillViewReducer_1.convertAmountToHomeCurrency)(true, {
+                    amount: (_e = (_d = finalBill.totalAmount) === null || _d === void 0 ? void 0 : _d.amount) !== null && _e !== void 0 ? _e : 0,
+                    currencyCode: finalVendor.vendorCurrencyCode,
+                    currencySymbol: finalVendor.vendorCurrencySymbol,
+                }, 'USD'));
+            }
+            actions = [
+                ...actions,
+                (0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({ billDetailLocalData: finalBill }),
+                (0, previousBillsReducer_1.fetchPreviousBills)(finalVendor.qboId, false),
+                (0, billPayReviewReducer_1.fetchDuplicateBill)(finalVendor.name, finalVendor.id, (_g = (_f = finalBill.totalAmount) === null || _f === void 0 ? void 0 : _f.amount) !== null && _g !== void 0 ? _g : 0, (_h = finalBill.whatForSection) === null || _h === void 0 ? void 0 : _h.invoiceNumber),
+                (0, editBillViewReducer_1.updateShowAutofill)(false),
+                (0, editBillViewReducer_1.updateAddBillAutoFields)(addBillAutoFields),
+                (0, editBillViewReducer_1.updateBillUploadFetchState)({
+                    fetchState: 'Completed',
+                    error: undefined,
+                }),
+            ];
+            return (0, rxjs_1.from)(actions);
         }
         else {
             const actions = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.9.66",
+  "version": "4.9.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",