@zeniai/client-epic-state 4.15.50 → 4.15.51

package/lib/entity/accountRecon/accountReconPayload.js

@@ -53,7 +53,7 @@ const toAccountReconciliationData = (payload) => {
     const variance = payload.bank_balance != null && payload.cleared_balance != null
         ? (0, amount_1.toAmount)(Math.abs(payload.cleared_balance - payload.bank_balance), payload.currency.currency_code, payload.currency.currency_symbol)
         : undefined;
-    const variancePercentage = variance != null && payload.bank_balance != null
+    const variancePercentage = variance != null && payload.bank_balance != null && payload.bank_balance !== 0
         ? (variance.amount / Math.abs(payload.bank_balance)) * 100
         : undefined;
     return {

package/lib/view/commonVendorView/transactionVendorView/epics/saveTransactionVendorEpic.js

@@ -7,6 +7,7 @@ const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer")
 const transactionSelector_1 = require("../../../../entity/transaction/transactionSelector");
 const vendorReducer_1 = require("../../../../entity/vendor/vendorReducer");
 const responsePayload_1 = require("../../../../responsePayload");
+const zeniUrl_1 = require("../../../../zeniUrl");
 const accountListSelector_1 = require("../../../accountList/accountListSelector");
 const transactionsViewReducer_1 = require("../../../expenseAutomationView/reducers/transactionsViewReducer");
 const transactionDetailReducer_1 = require("../../../transactionDetail/transactionDetailReducer");
@@ -32,7 +33,7 @@ const saveTransactionVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((
         ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/vendors/${effectiveVendorId}`, payload)
         : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/vendors`, payload);
     return saveVendorApi.pipe((0, operators_1.mergeMap)((response) => {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const actions = [
                 (0, vendorReducer_1.updateVendors)((_a = response.data.vendors) !== null && _a !== void 0 ? _a : []),
@@ -61,14 +62,16 @@ const saveTransactionVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                                 uncategorizedAccounts: uncategorizedIncomeExpense, // provide appropriate uncategorizedAccounts
                                 updatedVendor: {
                                     name: response.data.vendors[0].vendor_name,
-                                    id: response.data.vendors[0].vendor_id,
+                                    id: response.data.vendors[0].qbo_id,
+                                    logo: (0, zeniUrl_1.toZeniUrlWithoutBaseURL)((_c = (_b = response.data.vendors[0].logo) === null || _b === void 0 ? void 0 : _b.url) !== null && _c !== void 0 ? _c : ''),
                                 },
                                 selectedEntity: {
                                     name: response.data.vendors[0].vendor_name,
-                                    id: response.data.vendors[0].vendor_id,
+                                    id: response.data.vendors[0].qbo_id,
                                     type: 'vendor',
                                     zeniId: response.data.vendors[0].vendor_id,
                                     qboId: response.data.vendors[0].qbo_id,
+                                    logo: (0, zeniUrl_1.toZeniUrlWithoutBaseURL)((_e = (_d = response.data.vendors[0].logo) === null || _d === void 0 ? void 0 : _d.url) !== null && _e !== void 0 ? _e : ''),
                                 },
                             }));
                         }
@@ -82,6 +85,14 @@ const saveTransactionVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                             id: response.data.vendors[0].vendor_id,
                             qboId: response.data.vendors[0].qbo_id,
                         },
+                        entity: {
+                            name: response.data.vendors[0].vendor_name,
+                            id: response.data.vendors[0].qbo_id,
+                            type: 'vendor',
+                            zeniId: response.data.vendors[0].vendor_id,
+                            qboId: response.data.vendors[0].qbo_id,
+                            logo: (0, zeniUrl_1.toZeniUrlWithoutBaseURL)((_g = (_f = response.data.vendors[0].logo) === null || _f === void 0 ? void 0 : _f.url) !== null && _g !== void 0 ? _g : ''),
+                        },
                         resetRecommendations: true,
                     }));
                 }

package/lib/view/expenseAutomationView/helpers/saveTransactionHelper.js

@@ -9,7 +9,7 @@ const saveTransactionHelper_1 = require("../../transactionDetail/epics/saveTrans
  * @param transactionCategorizationLocalData
  */
 const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionCategorizationLocalData, transaction, uncategorizedIncomeExpense) => {
-    var _a, _b, _c, _d, _e;
+    var _a;
     const updates = {
         updatesByLineId: {},
     };
@@ -22,32 +22,17 @@ const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionC
     if ((0, vendorTransaction_1.isVendorTransaction)(transaction) === true &&
         currentSelectedEntity != null &&
         currentSelectedEntity.type === 'vendor') {
-        updates.vendorId = currentSelectedEntity.id;
+        updates.vendorId = currentSelectedEntity.qboId;
     }
     if ((0, vendorTransaction_1.isVendorTransactionWithCustomer)(transaction) === true &&
         currentSelectedEntity != null &&
         currentSelectedEntity.type === 'customer') {
-        updates.customerId = currentSelectedEntity.id;
+        updates.customerId = currentSelectedEntity.qboId;
     }
     let lastUpdatedCategory;
     let lastUpdatedClass;
-    let updatedEntityId;
-    if (currentSelectedEntity != null &&
-        currentSelectedEntity.type === 'vendor') {
-        if (((_a = transactionCategorizationLocalData.vendorUpdates) === null || _a === void 0 ? void 0 : _a.qboId) !==
-            transaction.vendorId) {
-            updatedEntityId = (_b = transactionCategorizationLocalData.vendorUpdates) === null || _b === void 0 ? void 0 : _b.qboId;
-        }
-    }
-    else {
-        if (((_c = transactionCategorizationLocalData.customerUpdates) === null || _c === void 0 ? void 0 : _c.qboId) !==
-            transaction.customerId) {
-            updatedEntityId =
-                (_d = transactionCategorizationLocalData.customerUpdates) === null || _d === void 0 ? void 0 : _d.qboId;
-        }
-    }
-    (_e = transaction.lines) === null || _e === void 0 ? void 0 : _e.forEach((line) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    (_a = transaction.lines) === null || _a === void 0 ? void 0 : _a.forEach((line) => {
+        var _a, _b, _c, _d;
         const currentSelectedEntityLine = transactionCategorizationLocalData.lineItemById[line.id]
             .selectedEntityLine;
         const entityDetails = getEntityDetails(currentSelectedEntity, transactionCategorizationLocalData.lineItemById[line.id], transactionCategorizationLocalData.vendorUpdates, transactionCategorizationLocalData.customerUpdates, currentSelectedEntityLine);
@@ -82,25 +67,6 @@ const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionC
                     ((_d = lineItem.class) === null || _d === void 0 ? void 0 : _d.qboId) !== accountLine.class.qboId;
             const recommendedAccountBase = (0, saveTransactionHelper_1.toRecommendedAccountBase)(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = (0, saveTransactionHelper_1.toRecommendedClassBase)(lineItem.amount.amount, lineItem.class);
-            let updatedLineEntityId;
-            if ((currentSelectedEntityLine === null || currentSelectedEntityLine === void 0 ? void 0 : currentSelectedEntityLine.type) === 'vendor') {
-                if (((_e = accountLine.vendor) === null || _e === void 0 ? void 0 : _e.id) != null) {
-                    updatedLineEntityId =
-                        ((_f = accountLine.vendor) === null || _f === void 0 ? void 0 : _f.id) !== ((_g = lineItem.vendor) === null || _g === void 0 ? void 0 : _g.id)
-                            ? currentSelectedEntityLine === null || currentSelectedEntityLine === void 0 ? void 0 : currentSelectedEntityLine.qboId
-                            : undefined;
-                }
-            }
-            else if (((_h = accountLine.customer) === null || _h === void 0 ? void 0 : _h.id) != null &&
-                (currentSelectedEntityLine === null || currentSelectedEntityLine === void 0 ? void 0 : currentSelectedEntityLine.type) === 'customer') {
-                updatedLineEntityId =
-                    ((_j = accountLine.customer) === null || _j === void 0 ? void 0 : _j.id) !== ((_k = lineItem.customer) === null || _k === void 0 ? void 0 : _k.id)
-                        ? currentSelectedEntityLine === null || currentSelectedEntityLine === void 0 ? void 0 : currentSelectedEntityLine.qboId
-                        : undefined;
-            }
-            else {
-                updatedLineEntityId = undefined;
-            }
             if (entityDetails != null &&
                 (hasCategoryChanged === true || hasClassChanged === true)) {
                 lastUpdatedCategory =
@@ -113,25 +79,9 @@ const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionC
                     account: lastUpdatedCategory,
                     class: lastUpdatedClass,
                 };
-                if (recommended.class != null ||
-                    recommended.account != null ||
-                    updatedEntityId != null) {
-                    const vendorIdToUpdate = (_l = transactionCategorizationLocalData.selectedEntity) === null || _l === void 0 ? void 0 : _l.id;
-                    if ((line.type === 'journal_entry_transaction_line' ||
-                        line.platformLineDetailType === 'deposit_line_detail') &&
-                        updatedLineEntityId != null) {
-                        const entityId = entityDetails.entityId;
-                        if (entityId != null) {
-                            doUpdateEntityUpdates(entityUpdates, entityId, entityDetails.entityType, recommended, false, updatedLineEntityId);
-                        }
-                    }
-                    else {
-                        let entityId = entityDetails.entityId;
-                        if (vendorIdToUpdate != null) {
-                            entityId = vendorIdToUpdate;
-                        }
-                        doUpdateEntityUpdates(entityUpdates, entityId, entityDetails.entityType, recommended, false, updatedEntityId);
-                    }
+                if (recommended.class != null || recommended.account != null) {
+                    const entityId = entityDetails.entityId;
+                    doUpdateEntityUpdates(entityUpdates, entityId, entityDetails.entityType, recommended, false, undefined);
                 }
             }
         }
@@ -169,51 +119,45 @@ const doUpdateEntityUpdates = (entityUpdates, entityId, entityType, recommendati
         entityUpdates[entityKey] = Object.assign(Object.assign({}, entityUpdate), { recommendations: recommendation });
     }
 };
-const getEntityDetails = (currentSelectedEntity, lineItemLocalData, vendorUpdates, customerUpdates, currentSelectedEntityLine) => {
-    var _a, _b, _c;
-    if (currentSelectedEntity != null) {
+const getEntityDetails = (entity, lineItemLocalData, vendorUpdates, customerUpdates, currentSelectedEntityLine) => {
+    var _a, _b, _c, _d, _e, _f;
+    if (entity != null) {
         return {
-            entityId: currentSelectedEntity.id,
-            entityType: currentSelectedEntity.type,
+            entityId: (_a = entity.qboId) !== null && _a !== void 0 ? _a : entity.id,
+            entityType: entity.type,
         };
     }
-    if (lineItemLocalData.lineEntity != null) {
+    if (vendorUpdates != null && vendorUpdates.id != null) {
         return {
-            entityId: (_a = lineItemLocalData.lineEntity.qboId) !== null && _a !== void 0 ? _a : lineItemLocalData.lineEntity.id,
-            entityType: lineItemLocalData.vendor != null ? 'vendor' : 'customer',
+            entityId: vendorUpdates.id,
+            entityType: 'vendor',
         };
     }
-    if (currentSelectedEntityLine != null &&
-        currentSelectedEntityLine.type === 'vendor') {
-        if (vendorUpdates != null && vendorUpdates.id != null) {
-            return {
-                entityId: vendorUpdates.id,
-                entityType: 'vendor',
-            };
-        }
+    if (customerUpdates != null && customerUpdates.id != null) {
+        return {
+            entityId: customerUpdates.id,
+            entityType: 'customer',
+        };
     }
-    if (currentSelectedEntityLine != null &&
-        currentSelectedEntityLine.type === 'customer') {
-        if (customerUpdates != null && customerUpdates.id != null) {
-            return {
-                entityId: customerUpdates.id,
-                entityType: 'customer',
-            };
-        }
+    if (lineItemLocalData.lineEntity != null) {
+        return {
+            entityId: (_b = lineItemLocalData.lineEntity.qboId) !== null && _b !== void 0 ? _b : lineItemLocalData.lineEntity.id,
+            entityType: lineItemLocalData.vendor != null ? 'vendor' : 'customer',
+        };
     }
-    if (((_b = lineItemLocalData.customer) === null || _b === void 0 ? void 0 : _b.id) != null &&
+    if (((_c = lineItemLocalData.customer) === null || _c === void 0 ? void 0 : _c.id) != null &&
         currentSelectedEntityLine != null &&
         currentSelectedEntityLine.type === 'customer') {
         return {
-            entityId: lineItemLocalData.customer.id,
+            entityId: (_d = currentSelectedEntityLine.qboId) !== null && _d !== void 0 ? _d : lineItemLocalData.customer.id,
             entityType: 'customer',
         };
     }
-    if (((_c = lineItemLocalData.vendor) === null || _c === void 0 ? void 0 : _c.id) != null &&
+    if (((_e = lineItemLocalData.vendor) === null || _e === void 0 ? void 0 : _e.id) != null &&
         currentSelectedEntityLine != null &&
         currentSelectedEntityLine.type === 'vendor') {
         return {
-            entityId: lineItemLocalData.vendor.id,
+            entityId: (_f = currentSelectedEntityLine.qboId) !== null && _f !== void 0 ? _f : lineItemLocalData.vendor.id,
             entityType: 'vendor',
         };
     }

package/lib/view/expenseAutomationView/selectors/reconciliationViewSelector.js

@@ -103,9 +103,11 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
                     assetTotals.varianceTotal = Object.assign(Object.assign({}, accountRecon.variance), { amount: ((_f = (_e = assetTotals.varianceTotal) === null || _e === void 0 ? void 0 : _e.amount) !== null && _f !== void 0 ? _f : 0) +
                             accountRecon.variance.amount });
                     assetTotals.variancePercentage =
-                        assetTotals.varianceTotal.amount != null
+                        assetTotals.varianceTotal.amount != null &&
+                            assetTotals.balanceTotal.amount != null &&
+                            assetTotals.balanceTotal.amount !== 0
                             ? (assetTotals.varianceTotal.amount /
-                                assetTotals.clearedTotal.amount) *
+                                assetTotals.balanceTotal.amount) *
                                 100
                             : undefined;
                 }
@@ -121,9 +123,11 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
                     liabilityTotals.varianceTotal = Object.assign(Object.assign({}, accountRecon.variance), { amount: ((_m = (_l = liabilityTotals.varianceTotal) === null || _l === void 0 ? void 0 : _l.amount) !== null && _m !== void 0 ? _m : 0) +
                             accountRecon.variance.amount });
                     liabilityTotals.variancePercentage =
-                        liabilityTotals.varianceTotal.amount != null
+                        liabilityTotals.varianceTotal.amount != null &&
+                            liabilityTotals.balanceTotal.amount != null &&
+                            liabilityTotals.balanceTotal.amount !== 0
                             ? (liabilityTotals.varianceTotal.amount /
-                                liabilityTotals.clearedTotal.amount) *
+                                liabilityTotals.balanceTotal.amount) *
                                 100
                             : undefined;
                 }

package/lib/view/transactionDetail/epics/saveTransactionHelper.js

@@ -36,22 +36,12 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
         true
         ? (_a = transactionDetailLocalData.vendorUpdates) === null || _a === void 0 ? void 0 : _a.qboId
         : undefined;
-    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) &&
-        selectedEntity != null &&
-        selectedEntity.type === 'vendor') {
-        updates.vendorId = selectedEntity.id;
-    }
-    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) &&
-        selectedEntity != null &&
-        selectedEntity.type === 'customer') {
-        updates.customerId = selectedEntity.id;
-    }
     let isBulkUpdate = false;
     let lastUpdatedCategory;
     let lastUpdatedClass;
     // single recommendation to just pick the last recommendation in the list of lines
     (_b = transaction.lines) === null || _b === void 0 ? void 0 : _b.forEach((line) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const entityDetails = getEntityDetails(selectedEntity, transactionDetailLocalData.lineItemById[line.id], transactionDetailLocalData.vendorUpdates, transactionDetailLocalData.customerUpdates);
         if (line.type === 'transaction_with_account_and_class_line' ||
             line.type === 'transaction_with_product_or_service_line' ||
@@ -127,14 +117,21 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
                     recommended.account != null ||
                     updatedEntityId != null) {
                     const vendorIdToUpdate = (_f = transactionDetailLocalData.vendorUpdates) === null || _f === void 0 ? void 0 : _f.qboId;
+                    const customerIdToUpdate = (_g = transactionDetailLocalData.customerUpdates) === null || _g === void 0 ? void 0 : _g.qboId;
                     let entityId = entityDetails.entityId;
-                    if (vendorIdToUpdate != null) {
+                    if (vendorIdToUpdate != null && (selectedEntity === null || selectedEntity === void 0 ? void 0 : selectedEntity.type) === 'vendor') {
                         entityId =
                             transactionDetailLocalData.updatePreviousTransactionsWithUpdatedVendor ===
                                 true
                                 ? entityId
                                 : vendorIdToUpdate;
                     }
+                    else {
+                        if (customerIdToUpdate != null &&
+                            (selectedEntity === null || selectedEntity === void 0 ? void 0 : selectedEntity.type) === 'customer') {
+                            entityId = customerIdToUpdate;
+                        }
+                    }
                     doUpdateEntityUpdates(entityUpdates, entityId, entityDetails.entityType, recommended, lineItem.isUpdateAllChecked, updatedEntityId);
                 }
             }
@@ -200,17 +197,17 @@ const toRecommendedClassBase = (amountValue, classBase, recommendationBase) => {
 };
 exports.toRecommendedClassBase = toRecommendedClassBase;
 const getEntityDetails = (entity, lineItemLocalData, vendorUpdates, customerUpdates) => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     if (entity != null) {
         return {
             entityId: (_a = entity.qboId) !== null && _a !== void 0 ? _a : entity.id,
             entityType: entity.type,
         };
     }
-    if ((lineItemLocalData === null || lineItemLocalData === void 0 ? void 0 : lineItemLocalData.lineEntity) != null) {
+    if (lineItemLocalData.lineEntity != null) {
         return {
-            entityId: (_c = (_b = lineItemLocalData.lineEntity) === null || _b === void 0 ? void 0 : _b.qboId) !== null && _c !== void 0 ? _c : (_d = lineItemLocalData.lineEntity) === null || _d === void 0 ? void 0 : _d.id,
-            entityType: lineItemLocalData.vendor != null ? 'vendor' : 'customer',
+            entityId: (_b = lineItemLocalData.lineEntity.qboId) !== null && _b !== void 0 ? _b : lineItemLocalData.lineEntity.id,
+            entityType: lineItemLocalData.lineEntity.type,
         };
     }
     if (customerUpdates != null &&

package/lib/view/transactionDetail/transactionDetailLocalDataHelper.js

@@ -6,7 +6,7 @@ const customerTransaction_1 = require("../../entity/transaction/stateTypes/custo
 const vendorTransaction_1 = require("../../entity/transaction/stateTypes/vendorTransaction");
 const transactionDetailState_1 = require("./transactionDetailState");
 const toTransactionDetailLocalData = (transaction, vendorId, uncategorizedIncomeExpense) => {
-    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, _m, _o, _p, _q, _r;
     const transactionLocal = Object.assign({}, transactionDetailState_1.initialSupportedTransactionDetail.transactionDetailLocalData);
     const customerId = (_a = transaction.customer) === null || _a === void 0 ? void 0 : _a.id;
     transactionLocal.memo = transaction.memo;
@@ -48,8 +48,8 @@ const toTransactionDetailLocalData = (transaction, vendorId, uncategorizedIncome
             id: vendorId,
             name: vendorName,
             type: (0, entity_1.toEntityType)('vendor'),
-            qboId: vendorId,
-            zeniId: vendorId,
+            qboId: (_p = (_o = transaction.vendor) === null || _o === void 0 ? void 0 : _o.id) !== null && _p !== void 0 ? _p : '',
+            zeniId: (_r = (_q = transaction.vendor) === null || _q === void 0 ? void 0 : _q.id) !== null && _r !== void 0 ? _r : '',
         };
     }
     else {

package/package.json

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