@zeniai/client-epic-state 4.10.28 → 4.10.30

package/lib/entity/customer/customerPayload.d.ts

@@ -6,7 +6,7 @@ export interface CustomerBasePayload {
     qbo_id?: string;
     logo?: URLPayload;
 }
-export declare const toCustomerBase: (payload: CustomerBasePayload) => CustomerBase;
+export declare const toCustomerBase: (payload: CustomerBasePayload, parseOutParentName: boolean) => CustomerBase;
 export declare const toCustomerBasePayload: (customer: CustomerBase | undefined) => CustomerBasePayload;
 export interface CustomerPayload extends CustomerBasePayload {
     currency_symbol: string | null;
@@ -44,4 +44,4 @@ export interface CustomerPayload extends CustomerBasePayload {
     qbo_update_time?: string;
     accounting_class_id?: string | null;
 }
-export declare const toCustomer: (payload: CustomerPayload) => Customer;
+export declare const toCustomer: (payload: CustomerPayload, parseOutParentName?: boolean) => Customer;

package/lib/entity/customer/customerPayload.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toCustomer = exports.toCustomerBasePayload = exports.toCustomerBase = void 0;
 const urlPayload_1 = require("../../commonPayloadTypes/urlPayload");
 const zeniDayJS_1 = require("../../zeniDayJS");
-const toCustomerBase = (payload) => ({
+const toCustomerBase = (payload, parseOutParentName) => ({
     id: payload.customer_id,
-    name: payload.customer_name,
+    name: parseOutParentName
+        ? removeParentName(payload.customer_name)
+        : payload.customer_name,
     qboId: payload.qbo_id,
     logo: payload.logo != null ? (0, urlPayload_1.toURL)(payload.logo) : undefined,
 });
@@ -19,8 +21,27 @@ const toCustomerBasePayload = (customer) => {
     });
 };
 exports.toCustomerBasePayload = toCustomerBasePayload;
-const toCustomer = (payload) => {
+const toCustomer = (payload, parseOutParentName = false) => {
     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;
-    return (Object.assign(Object.assign({}, (0, exports.toCustomerBase)(payload)), { addressId: (_a = payload.address_id) !== null && _a !== void 0 ? _a : undefined, lastName: (_b = payload.last_name) !== null && _b !== void 0 ? _b : undefined, paymentMethodId: (_c = payload.payment_method_id) !== null && _c !== void 0 ? _c : undefined, suffix: (_d = payload.suffix) !== null && _d !== void 0 ? _d : undefined, createTime: payload.create_time != null ? (0, zeniDayJS_1.date)(payload.create_time) : undefined, qboCreateTime: payload.qbo_create_time != null ? (0, zeniDayJS_1.date)(payload.qbo_create_time) : undefined, nameOnCheck: (_e = payload.name_on_check) !== null && _e !== void 0 ? _e : undefined, firstName: (_f = payload.first_name) !== null && _f !== void 0 ? _f : undefined, middleName: (_g = payload.middle_name) !== null && _g !== void 0 ? _g : undefined, contacts: (_h = payload.contacts) !== null && _h !== void 0 ? _h : undefined, termId: (_j = payload.term_id) !== null && _j !== void 0 ? _j : undefined, note: (_k = payload.note) !== null && _k !== void 0 ? _k : undefined, syncToken: payload.sync_token, email: (_l = payload.email) !== null && _l !== void 0 ? _l : undefined, websiteUrl: (_m = payload.website_url) !== null && _m !== void 0 ? _m : undefined, parentCustomerId: (_o = payload.parent_customer_id) !== null && _o !== void 0 ? _o : undefined, qboParentCustomerId: (_p = payload.qbo_parent_customer_id) !== null && _p !== void 0 ? _p : undefined, isBillWithParent: Boolean(payload.is_bill_with_parent), updateTime: payload.update_time != null ? (0, zeniDayJS_1.date)(payload.update_time) : undefined, accountId: (_q = payload.account_id) !== null && _q !== void 0 ? _q : undefined, phone: (_r = payload.phone) !== null && _r !== void 0 ? _r : undefined, bankAccountIds: (_s = payload.bank_account_ids) !== null && _s !== void 0 ? _s : undefined, balance: (_t = payload.balance) !== null && _t !== void 0 ? _t : undefined, isDeleted: Boolean(payload.is_deleted), tenantId: payload.tenant_id, title: (_u = payload.title) !== null && _u !== void 0 ? _u : undefined, isSubCustomer: Boolean(payload.is_sub_customer), isTaxable: Boolean(payload.is_taxable), shippingAddressId: (_v = payload.shipping_address_id) !== null && _v !== void 0 ? _v : undefined, billingAddressId: (_w = payload.billing_address_id) !== null && _w !== void 0 ? _w : undefined, currencySymbol: (_x = payload.currency_symbol) !== null && _x !== void 0 ? _x : undefined, qboUpdateTime: payload.qbo_update_time != null ? (0, zeniDayJS_1.date)(payload.qbo_update_time) : undefined, accountingClassId: (_y = payload.accounting_class_id) !== null && _y !== void 0 ? _y : undefined, currencyCode: (_z = payload.currency_code) !== null && _z !== void 0 ? _z : undefined }));
+    return (Object.assign(Object.assign({}, (0, exports.toCustomerBase)(payload, parseOutParentName)), { addressId: (_a = payload.address_id) !== null && _a !== void 0 ? _a : undefined, lastName: (_b = payload.last_name) !== null && _b !== void 0 ? _b : undefined, paymentMethodId: (_c = payload.payment_method_id) !== null && _c !== void 0 ? _c : undefined, suffix: (_d = payload.suffix) !== null && _d !== void 0 ? _d : undefined, createTime: payload.create_time != null ? (0, zeniDayJS_1.date)(payload.create_time) : undefined, qboCreateTime: payload.qbo_create_time != null ? (0, zeniDayJS_1.date)(payload.qbo_create_time) : undefined, nameOnCheck: (_e = payload.name_on_check) !== null && _e !== void 0 ? _e : undefined, firstName: (_f = payload.first_name) !== null && _f !== void 0 ? _f : undefined, middleName: (_g = payload.middle_name) !== null && _g !== void 0 ? _g : undefined, contacts: (_h = payload.contacts) !== null && _h !== void 0 ? _h : undefined, termId: (_j = payload.term_id) !== null && _j !== void 0 ? _j : undefined, note: (_k = payload.note) !== null && _k !== void 0 ? _k : undefined, syncToken: payload.sync_token, email: (_l = payload.email) !== null && _l !== void 0 ? _l : undefined, websiteUrl: (_m = payload.website_url) !== null && _m !== void 0 ? _m : undefined, parentCustomerId: (_o = payload.parent_customer_id) !== null && _o !== void 0 ? _o : undefined, qboParentCustomerId: (_p = payload.qbo_parent_customer_id) !== null && _p !== void 0 ? _p : undefined, isBillWithParent: Boolean(payload.is_bill_with_parent), updateTime: payload.update_time != null ? (0, zeniDayJS_1.date)(payload.update_time) : undefined, accountId: (_q = payload.account_id) !== null && _q !== void 0 ? _q : undefined, phone: (_r = payload.phone) !== null && _r !== void 0 ? _r : undefined, bankAccountIds: (_s = payload.bank_account_ids) !== null && _s !== void 0 ? _s : undefined, balance: (_t = payload.balance) !== null && _t !== void 0 ? _t : undefined, isDeleted: Boolean(payload.is_deleted), tenantId: payload.tenant_id, title: (_u = payload.title) !== null && _u !== void 0 ? _u : undefined, isSubCustomer: Boolean(payload.is_sub_customer), isTaxable: Boolean(payload.is_taxable), shippingAddressId: (_v = payload.shipping_address_id) !== null && _v !== void 0 ? _v : undefined, billingAddressId: (_w = payload.billing_address_id) !== null && _w !== void 0 ? _w : undefined, currencySymbol: (_x = payload.currency_symbol) !== null && _x !== void 0 ? _x : undefined, qboUpdateTime: payload.qbo_update_time != null ? (0, zeniDayJS_1.date)(payload.qbo_update_time) : undefined, accountingClassId: (_y = payload.accounting_class_id) !== null && _y !== void 0 ? _y : undefined, currencyCode: (_z = payload.currency_code) !== null && _z !== void 0 ? _z : undefined }));
 };
 exports.toCustomer = toCustomer;
+/**
+ * In case of AR Aging detail reports, the customer name comes back prepended
+ * with the parent hierarchy looking like abc:xyz:Customer123
+ * In this case we want to continue to keep just `Customer Name` as name parameter
+ * This function parses the name and discards the parent hierarchy. In this
+ * case `Customer123`
+ * @param name
+ * @returns
+ */
+const removeParentName = (name) => {
+    const allNames = name.split(':');
+    const length = allNames.length;
+    if (length === 0) {
+        return name;
+    }
+    else {
+        return allNames[length - 1];
+    }
+};

package/lib/entity/customer/customerReducer.d.ts

@@ -1,6 +1,12 @@
 import { CustomerState } from './customerState';
 import { CustomerPayload } from './customerPayload';
 export declare const initialState: CustomerState;
-export declare const updateCustomers: import("@reduxjs/toolkit").ActionCreatorWithPayload<CustomerPayload[], string>, updateCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<CustomerPayload, string>, removeCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, clearAllCustomers: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const updateCustomers: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[customersPayload: CustomerPayload[], parseOutParentName?: boolean | undefined], {
+    customersPayload: CustomerPayload[];
+    parseOutParentName: boolean | undefined;
+}, string, never, never>, updateCustomer: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[customerPayload: CustomerPayload, parseOutParentName?: boolean | undefined], {
+    customerPayload: CustomerPayload;
+    parseOutParentName: boolean | undefined;
+}, string, never, never>, removeCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, clearAllCustomers: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<CustomerState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

package/lib/entity/customer/customerReducer.js

@@ -11,15 +11,26 @@ const customer = (0, toolkit_1.createSlice)({
     name: 'customer',
     initialState: exports.initialState,
     reducers: {
-        updateCustomers(draft, action) {
-            action.payload.forEach((customerPayload) => {
-                const customer = (0, customerPayload_1.toCustomer)(customerPayload);
-                draft.byCustomerId[customer.id] = customer;
-            });
+        updateCustomers: {
+            reducer(draft, action) {
+                const customersPayload = action.payload.customersPayload;
+                customersPayload.forEach((customerPayload) => {
+                    const customer = (0, customerPayload_1.toCustomer)(customerPayload, action.payload.parseOutParentName);
+                    draft.byCustomerId[customer.id] = customer;
+                });
+            },
+            prepare(customersPayload, parseOutParentName) {
+                return { payload: { customersPayload, parseOutParentName } };
+            },
         },
-        updateCustomer(draft, action) {
-            const customer = (0, customerPayload_1.toCustomer)(action.payload);
-            draft.byCustomerId[customer.id] = customer;
+        updateCustomer: {
+            reducer(draft, action) {
+                const customer = (0, customerPayload_1.toCustomer)(action.payload.customerPayload, action.payload.parseOutParentName);
+                draft.byCustomerId[customer.id] = customer;
+            },
+            prepare(customerPayload, parseOutParentName) {
+                return { payload: { customerPayload, parseOutParentName } };
+            },
         },
         removeCustomer(draft, action) {
             delete draft.byCustomerId[action.payload];

package/lib/entity/transaction/payloadTypes/customerTransactionPayload.js

@@ -5,13 +5,12 @@ const amount_1 = require("../../../commonStateTypes/amount");
 const customerPayload_1 = require("../../customer/customerPayload");
 const paymentType_1 = require("../stateTypes/paymentType");
 const transactionType_1 = require("../stateTypes/transactionType");
-// import {CustomerPayload, mapCustomerPayloadToCustomer} from './customerPayload';
 const transactionPayload_1 = require("./transactionPayload");
 const isCustomerTransactionPayload = (payload) => (0, transactionType_1.toCustomerTransactionTypeStrict)(payload.transaction_type) != null;
 exports.isCustomerTransactionPayload = isCustomerTransactionPayload;
 const toCustomerTransaction = (payload) => {
     const transaction = (0, transactionPayload_1.toTransaction)(payload);
-    return Object.assign(Object.assign({}, transaction), { customer: payload.customer_id != null ? (0, customerPayload_1.toCustomerBase)(payload) : undefined, documentId: payload.document_id, paymentType: (0, paymentType_1.toPaymentTypeStrict)(payload.payment_type), paymentTypeName: payload.payment_type_name, paymentMethodName: payload.payment_method_name, balance: payload.balance != null
+    return Object.assign(Object.assign({}, transaction), { customer: payload.customer_id != null ? (0, customerPayload_1.toCustomerBase)(payload, false) : undefined, documentId: payload.document_id, paymentType: (0, paymentType_1.toPaymentTypeStrict)(payload.payment_type), paymentTypeName: payload.payment_type_name, paymentMethodName: payload.payment_method_name, balance: payload.balance != null
             ? (0, amount_1.toAmountWC)(payload.balance, transaction.amount)
             : undefined });
 };

package/lib/entity/transaction/payloadTypes/transactionLinePayload.js

@@ -23,7 +23,7 @@ const toTransactionWithAccountAndClassLine = (payload, currency, type = 'transac
     var _a, _b, _c, _d;
     return (Object.assign(Object.assign({}, (0, exports.toTransactionLineBase)(payload, type, currency)), { class: (0, classPayload_1.mapClassBasePayloadToClassBase)((_a = payload.line_detail.class) !== null && _a !== void 0 ? _a : {}), account: (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(payload.line_detail.account), customer: payload.line_detail.customer != null &&
             payload.line_detail.customer.customer_id != null
-            ? (0, customerPayload_1.toCustomerBase)(payload.line_detail.customer)
+            ? (0, customerPayload_1.toCustomerBase)(payload.line_detail.customer, false)
             : undefined, vendor: payload.line_detail.vendor != null &&
             payload.line_detail.vendor.vendor_id != null
             ? (0, vendorPayload_1.mapVendorBasePayloadToVendorBase)(payload.line_detail.vendor)

package/lib/view/apAgingView/apAgingReport/apAgingReducer.js

@@ -10,8 +10,8 @@ const zeniDayJS_1 = require("../../../zeniDayJS");
 const vendorState_1 = require("../../../entity/vendor/vendorState");
 exports.inititalUIState = {
     searchString: '',
-    sortKey: 'vendor',
-    sortOrder: 'ascending',
+    sortKey: 'total',
+    sortOrder: 'descending',
     downloadState: 'Not-Started',
     selectedDate: (0, zeniDayJS_1.dateNow)(),
     agingDateSelectionType: 'custom_date',

package/lib/view/arAgingView/arAgingDetail/fetchArAgingDetailEpic.js

@@ -17,7 +17,7 @@ const fetchArAgingDetailEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0,
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const actions = [
-                (0, customerReducer_1.updateCustomers)(response.data.report.customers),
+                (0, customerReducer_1.updateCustomers)(response.data.report.customers, true),
                 (0, arAgingDetailReducer_1.updateArAgingDetailOnSuccess)(response.data.report, customerId, reportDate),
             ];
             return (0, rxjs_1.from)(actions);

package/lib/view/arAgingView/arAgingReport/arAgingReducer.js

@@ -12,8 +12,8 @@ const customerState_1 = require("../../../entity/customer/customerState");
 const getNestedCustomerHierarchy_1 = require("../../../commonStateTypes/customerView/getNestedCustomerHierarchy");
 exports.inititalUIState = {
     searchString: '',
-    sortKey: 'customer',
-    sortOrder: 'ascending',
+    sortKey: 'total',
+    sortOrder: 'descending',
     downloadState: 'Not-Started',
     selectedDate: (0, zeniDayJS_1.dateNow)(),
     agingDateSelectionType: 'custom_date',

package/lib/view/arAgingView/arAgingReport/arAgingSelector.js

@@ -44,15 +44,22 @@ const getNestedAgingBalancesByCustomer = (customerState, agingBalancesByCustomer
     });
     const filteredAgingBalancesByCustomer = agingBalancesByCustomer.filter((balance) => balance.customer.name.toLowerCase().includes(searchString.toLowerCase()));
     const sortedAgingBalancesByCustomer = (0, orderBy_1.default)(filteredAgingBalancesByCustomer, (balance) => {
-        var _a;
+        var _a, _b, _c;
         switch (sortKey) {
             case 'customer':
                 return balance.customer.name.toLowerCase();
             case 'total':
-                return balance.total.amount;
+                return balance.children.length > 0
+                    ? balance.totalWithChildren.amount
+                    : balance.total.amount;
             default: {
-                const obj = balance.arAgingBalances.find((balance) => balance.period === sortKey);
-                return (_a = obj === null || obj === void 0 ? void 0 : obj.balance.amount) !== null && _a !== void 0 ? _a : 0;
+                const customerRecord = balance.arAgingBalances.find((balance) => balance.period === sortKey);
+                if (balance.children.length > 0) {
+                    return (_b = (_a = customerRecord === null || customerRecord === void 0 ? void 0 : customerRecord.totalBalance) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0;
+                }
+                else {
+                    return (_c = customerRecord === null || customerRecord === void 0 ? void 0 : customerRecord.balance.amount) !== null && _c !== void 0 ? _c : 0;
+                }
             }
         }
     }, sortOrder === 'ascending' ? 'asc' : 'desc');

package/package.json

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