@zeniai/client-epic-state 4.10.7 → 4.10.8

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

@@ -1,47 +1,54 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearApAging = exports.updateApAgingOnSuccess = exports.updateApAgingOnFailure = exports.updateApAgingUIState = exports.fetchApAging = exports.initialState = exports.inititalUIState = void 0;
+exports.clearApAging = exports.updateApAgingOnSuccess = exports.updateApAgingOnFailure = exports.updateApAgingUIState = exports.fetchApAging = exports.initialStateAgingBalances = exports.initialState = exports.inititalUIState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const apAgingPayload_1 = require("./apAgingPayload");
 const agingBalance_1 = require("../../../commonStateTypes/agingBalance/agingBalance");
 const viewAndReportPayloadv2_1 = require("../../../commonPayloadTypes/v2/viewAndReportPayloadv2");
+const zeniDayJS_1 = require("../../../zeniDayJS");
 const vendorState_1 = require("../../../entity/vendor/vendorState");
 exports.inititalUIState = {
     searchString: '',
     sortKey: 'vendor',
     sortOrder: 'ascending',
     downloadState: 'Not-Started',
-    selectedDate: undefined,
+    selectedDate: (0, zeniDayJS_1.dateNow)(),
+    agingDateSelectionType: 'custom_date',
 };
 exports.initialState = {
     reportId: 'accounts_payable_aging',
     reportTitle: 'AP Aging',
     firstMonthOfFY: 1,
-    apAgingBalancesByVendorId: {},
     fetchState: 'Not-Started',
     error: undefined,
     uiState: exports.inititalUIState,
-    apAgingTotals: [],
+    apAgingBalancesByDate: {},
     agingPeriods: [],
     bookCloseDate: undefined,
     dataAvailable: undefined,
     currency: vendorState_1.defaultVendorCurrency,
 };
+exports.initialStateAgingBalances = {
+    apAgingBalancesByVendorId: {},
+    apAgingTotals: [],
+};
 const apAging = (0, toolkit_1.createSlice)({
     name: 'apAging',
     initialState: exports.initialState,
     reducers: {
         fetchApAging: {
             reducer(draft, action) {
-                const { cacheOverride } = action.payload;
-                if (cacheOverride) {
+                const { cacheOverride, reportDate } = action.payload;
+                const key = (0, agingBalance_1.getAgingBalancesKey)(reportDate);
+                const record = draft.apAgingBalancesByDate[key];
+                draft.uiState.selectedDate = reportDate;
+                if (cacheOverride || record == null) {
                     draft.fetchState = 'In-Progress';
                     draft.error = undefined;
                 }
             },
-            prepare(cacheOverride = false, // eslint-disable-line @typescript-eslint/no-inferrable-types
-            reportDate) {
+            prepare(reportDate, cacheOverride = false) {
                 return {
                     payload: {
                         cacheOverride,
@@ -51,25 +58,25 @@ const apAging = (0, toolkit_1.createSlice)({
             },
         },
         updateApAgingOnSuccess: {
-            prepare(data) {
+            prepare(reportDate, data) {
                 return {
                     payload: {
+                        reportDate,
                         data,
                     },
                 };
             },
             reducer(draft, action) {
-                const { data } = action.payload;
-                draft.fetchState = 'Completed';
-                draft.error = undefined;
+                const { data, reportDate } = action.payload;
                 const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(data);
                 draft.firstMonthOfFY = report.firstMonthOfFY;
-                draft.currency = report.currency;
                 draft.bookCloseDate = report.bookCloseDate;
                 draft.dataAvailable = report.dataAvailable;
-                draft.apAgingBalancesByVendorId = (0, apAgingPayload_1.toApAgingDataByVendorId)(data);
-                draft.apAgingTotals = (0, apAgingPayload_1.toApAgingTotals)(data);
+                doUpdateApAgingBalancesByDate(draft.apAgingBalancesByDate, reportDate, data);
                 draft.agingPeriods = data.aging_periods.map((elem) => (0, agingBalance_1.toAgingPeriod)(elem));
+                draft.uiState.selectedDate = reportDate;
+                draft.fetchState = 'Completed';
+                draft.error = undefined;
             },
         },
         updateApAgingUIState(draft, action) {
@@ -88,6 +95,10 @@ const apAging = (0, toolkit_1.createSlice)({
             if (action.payload.selectedDate != null) {
                 draft.uiState.selectedDate = action.payload.selectedDate;
             }
+            if (action.payload.agingDateSelectionType != null) {
+                draft.uiState.agingDateSelectionType =
+                    action.payload.agingDateSelectionType;
+            }
         },
         updateApAgingOnFailure: {
             reducer(draft, action) {
@@ -105,3 +116,11 @@ const apAging = (0, toolkit_1.createSlice)({
 });
 _a = apAging.actions, exports.fetchApAging = _a.fetchApAging, exports.updateApAgingUIState = _a.updateApAgingUIState, exports.updateApAgingOnFailure = _a.updateApAgingOnFailure, exports.updateApAgingOnSuccess = _a.updateApAgingOnSuccess, exports.clearApAging = _a.clearApAging;
 exports.default = apAging.reducer;
+const doUpdateApAgingBalancesByDate = (draft, reportDate, data) => {
+    const key = (0, agingBalance_1.getAgingBalancesKey)(reportDate);
+    const agingBalances = {
+        apAgingBalancesByVendorId: (0, apAgingPayload_1.toApAgingDataByVendorId)(data),
+        apAgingTotals: (0, apAgingPayload_1.toApAgingTotals)(data),
+    };
+    draft[key] = agingBalances;
+};

package/lib/view/apAgingView/apAgingReport/apAgingSelector.d.ts

@@ -10,7 +10,7 @@ export interface AgingBalancesByVendor {
     apAgingBalances: AgingBalance[];
 }
 export interface ApAgingReport extends SelectorReport {
-    agingBalancesByVendor: AgingBalancesByVendor[];
+    agingBalances: AgingBalancesByVendor[];
     totalBalances: AgingBalance[];
     apAgingUIState: AgingReportUIState;
     agingPeriods: AgingPeriod[];

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

@@ -5,18 +5,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getApAgingReport = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const keys_1 = __importDefault(require("lodash/keys"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const keys_1 = __importDefault(require("lodash/keys"));
+const agingBalance_1 = require("../../../commonStateTypes/agingBalance/agingBalance");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
 exports.getApAgingReport = (0, toolkit_1.createSelector)((state) => state.apAgingState, (state) => state.vendorState, (apAgingState, vendorState) => {
-    const { reportId, reportTitle, fetchState, uiState, firstMonthOfFY, apAgingTotals, apAgingBalancesByVendorId, agingPeriods, currency, } = apAgingState;
-    const { searchString, sortOrder, sortKey } = uiState;
-    const agingBalancesByVendor = (0, keys_1.default)(apAgingBalancesByVendorId).map((vendorId) => {
+    const { reportId, reportTitle, fetchState, uiState, firstMonthOfFY, agingPeriods, currency, } = apAgingState;
+    const { searchString, sortOrder, sortKey, selectedDate } = uiState;
+    const balancesKey = (0, agingBalance_1.getAgingBalancesKey)(selectedDate);
+    const apAgingBalancesByDate = apAgingState.apAgingBalancesByDate[balancesKey];
+    const apAgingBalancesByVendorId = apAgingBalancesByDate != null
+        ? apAgingBalancesByDate.apAgingBalancesByVendorId
+        : {};
+    const apAgingTotals = apAgingBalancesByDate != null
+        ? apAgingBalancesByDate.apAgingTotals
+        : [];
+    const agingBalances = getAgingBalancesByVendor(vendorState, apAgingBalancesByVendorId, currency, searchString, sortKey, sortOrder);
+    return {
+        agingBalances,
+        reportId,
+        reportTitle,
+        fetchState,
+        firstMonthOfFY,
+        agingPeriods,
+        apAgingUIState: uiState,
+        totalBalances: apAgingTotals,
+    };
+});
+const getAgingBalancesByVendor = (vendorState, agingBalancesByVendorId, currency, searchString, sortKey, sortOrder) => {
+    const agingBalancesByVendor = (0, keys_1.default)(agingBalancesByVendorId).map((vendorId) => {
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorId);
         if (vendor == null) {
             throw new Error(`Vendor with ${vendorId} doesn't exist`);
         }
-        const apAgingBalances = apAgingBalancesByVendorId[vendorId];
+        const apAgingBalances = agingBalancesByVendorId[vendorId];
         const { currencyCode, currencySymbol } = currency;
         const vendorTotal = apAgingBalances.reduce((prev, curr) => {
             return prev + curr.balance.amount;
@@ -45,14 +67,5 @@ exports.getApAgingReport = (0, toolkit_1.createSelector)((state) => state.apAgin
             }
         }
     }, sortOrder === 'ascending' ? 'asc' : 'desc');
-    return {
-        agingBalancesByVendor: sortedAgingBalancesByVendor,
-        reportId,
-        reportTitle,
-        fetchState,
-        firstMonthOfFY,
-        agingPeriods,
-        apAgingUIState: uiState,
-        totalBalances: apAgingTotals,
-    };
-});
+    return sortedAgingBalancesByVendor;
+};

package/lib/view/apAgingView/apAgingReport/apAgingState.d.ts

@@ -1,10 +1,13 @@
 import { ReportV2 } from '../../../commonStateTypes/v2/viewAndReport';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
-import { AgingBalance, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
+import { AgingBalance, AgingBalancesKey, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
 import { AgingReportUIState } from '../../../commonStateTypes/viewAndReport/agingReportStateTypes';
-export interface ApAgingState extends ReportV2, FetchStateAndError {
+export interface APAgingBalancesByAgingBalancesKey {
     apAgingBalancesByVendorId: Record<ID, AgingBalance[]>;
-    uiState: AgingReportUIState;
     apAgingTotals: AgingBalance[];
+}
+export interface ApAgingState extends ReportV2, FetchStateAndError {
+    apAgingBalancesByDate: Record<AgingBalancesKey, APAgingBalancesByAgingBalancesKey>;
+    uiState: AgingReportUIState;
     agingPeriods: AgingPeriod[];
 }

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

@@ -6,23 +6,27 @@ const operators_1 = require("rxjs/operators");
 const vendorReducer_1 = require("../../../entity/vendor/vendorReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const apAgingReducer_1 = require("./apAgingReducer");
+const agingBalance_1 = require("../../../commonStateTypes/agingBalance/agingBalance");
+const formatZeniDateFY_1 = require("../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const fetchApAgingEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(apAgingReducer_1.fetchApAging.match), (0, operators_1.switchMap)((action) => {
-    var _a;
-    const state = state$.value;
-    const { reportDate } = action.payload;
+    const { reportDate, cacheOverride } = action.payload;
     const queryParam = {
         is_employee_allowed: true,
-        report_date: reportDate != null
-            ? reportDate.format('YYYY-MM-DD')
-            : (_a = state.apAgingState.uiState.selectedDate) === null || _a === void 0 ? void 0 : _a.date.format('YYYY-MM-DD'),
+        report_date: reportDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT),
     };
+    const apAgingState = state$.value.apAgingState;
+    const key = (0, agingBalance_1.getAgingBalancesKey)(reportDate);
+    if (apAgingState.apAgingBalancesByDate[key] != null &&
+        cacheOverride === false) {
+        return (0, rxjs_1.from)([]);
+    }
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/2.0/reports/accounts_payable_aging?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const actions = [
                 (0, vendorReducer_1.updateVendors)(response.data.report.vendors, 'merge'),
-                (0, apAgingReducer_1.updateApAgingOnSuccess)(response.data.report),
+                (0, apAgingReducer_1.updateApAgingOnSuccess)(reportDate, response.data.report),
             ];
             return (0, rxjs_1.from)(actions);
         }

package/lib/view/arAgingView/arAgingDetail/arAgingDetailSelector.d.ts

@@ -2,7 +2,7 @@ import { RootState } from '../../../reducer';
 import { AgingBalance, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
 import { ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import { Customer } from '../../../entity/customer/customer';
+import { Customer } from '../../../entity/customer/customerState';
 import { AgingDetailReportUIState, AgingDetailReportInvoice } from '../../../commonStateTypes/viewAndReport/agingReportStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
 export interface ArAgingDetail extends SelectorView {

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

@@ -12,13 +12,20 @@ const toArAgingDataByCustomerId = (data) => {
         const agingPeriod = (0, agingBalance_1.toAgingPeriod)(period);
         const customerIds = (0, keys_1.default)(data[agingPeriod].customers);
         customerIds.forEach((id) => {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             const agingBalance = {
                 balance: {
                     amount: (_b = (_a = data[agingPeriod].customers[id].amount) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 0,
                     currencyCode: data.currency.currency_code,
                     currencySymbol: data.currency.currency_symbol,
                 },
+                totalBalance: ((_c = data[agingPeriod].customers[id].amount) === null || _c === void 0 ? void 0 : _c.total_value) != null
+                    ? {
+                        amount: (_e = (_d = data[agingPeriod].customers[id].amount) === null || _d === void 0 ? void 0 : _d.total_value) !== null && _e !== void 0 ? _e : 0,
+                        currencyCode: data.currency.currency_code,
+                        currencySymbol: data.currency.currency_symbol,
+                    }
+                    : undefined,
                 period: agingPeriod,
             };
             if (result[id] != null) {

package/lib/view/arAgingView/arAgingReport/arAgingReducer.d.ts

@@ -1,16 +1,22 @@
-import { ArAgingState } from './arAgingState';
+import { ARAgingBalancesByAgingBalancesKey, ArAgingState, ArAgingUIState } from './arAgingState';
 import { ArAgingPayload } from './arAgingPayload';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { AgingReportUIState } from '../../../commonStateTypes/viewAndReport/agingReportStateTypes';
-export declare const inititalUIState: AgingReportUIState;
+import { ID } from '../../../commonStateTypes/common';
+export declare const inititalUIState: ArAgingUIState;
 export declare const initialState: ArAgingState;
-export declare const fetchArAging: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined, reportDate?: import("dayjs").Dayjs | undefined], {
-    cacheOverride: boolean;
-    reportDate: import("dayjs").Dayjs | undefined;
+export declare const initialStateAgingBalances: ARAgingBalancesByAgingBalancesKey;
+export declare const fetchArAging: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reportDate: import("dayjs").Dayjs, cacheOverride?: any], {
+    cacheOverride: any;
+    reportDate: import("dayjs").Dayjs;
 }, string, never, never>, updateArAgingUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<Partial<AgingReportUIState>, string>, updateArAgingOnFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], {
     error: ZeniAPIStatus<Record<string, unknown>>;
-}, string, never, never>, updateArAgingOnSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[data: ArAgingPayload], {
+}, string, never, never>, updateArAgingOnSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reportDate: import("dayjs").Dayjs, data: ArAgingPayload], {
+    reportDate: import("dayjs").Dayjs;
     data: ArAgingPayload;
-}, string, never, never>, clearArAging: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+}, string, never, never>, updateArAgingNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    nodeId: ID;
+    isCollapsed: boolean;
+}, string>, clearArAging: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<ArAgingState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

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

@@ -1,30 +1,41 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearArAging = exports.updateArAgingOnSuccess = exports.updateArAgingOnFailure = exports.updateArAgingUIState = exports.fetchArAging = exports.initialState = exports.inititalUIState = void 0;
+exports.clearArAging = exports.updateArAgingNodeCollapseState = exports.updateArAgingOnSuccess = exports.updateArAgingOnFailure = exports.updateArAgingUIState = exports.fetchArAging = exports.initialStateAgingBalances = exports.initialState = exports.inititalUIState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const arAgingPayload_1 = require("./arAgingPayload");
 const agingBalance_1 = require("../../../commonStateTypes/agingBalance/agingBalance");
 const viewAndReportPayloadv2_1 = require("../../../commonPayloadTypes/v2/viewAndReportPayloadv2");
+const zeniDayJS_1 = require("../../../zeniDayJS");
+const customerPayload_1 = require("../../../entity/customer/customerPayload");
+const customerState_1 = require("../../../entity/customer/customerState");
+const getNestedCustomerHierarchy_1 = require("../../../commonStateTypes/customerView/getNestedCustomerHierarchy");
 exports.inititalUIState = {
     searchString: '',
     sortKey: 'customer',
     sortOrder: 'ascending',
     downloadState: 'Not-Started',
-    selectedDate: undefined,
+    selectedDate: (0, zeniDayJS_1.dateNow)(),
+    agingDateSelectionType: 'custom_date',
+    nodeCollapseState: {},
 };
 exports.initialState = {
     reportId: 'accounts_receivable_aging',
     reportTitle: 'AR Aging',
     firstMonthOfFY: 1,
-    arAgingBalancesByCustomerId: {},
+    arAgingBalancesByDate: {},
     fetchState: 'Not-Started',
     error: undefined,
     uiState: exports.inititalUIState,
-    arAgingTotals: [],
     agingPeriods: [],
     bookCloseDate: undefined,
     dataAvailable: undefined,
+    currency: customerState_1.defaultCustomerCurrency,
+};
+exports.initialStateAgingBalances = {
+    arAgingBalancesByCustomerId: {},
+    arAgingTotals: [],
+    nestedCustomerHierarchy: [],
 };
 const arAging = (0, toolkit_1.createSlice)({
     name: 'arAging',
@@ -32,14 +43,16 @@ const arAging = (0, toolkit_1.createSlice)({
     reducers: {
         fetchArAging: {
             reducer(draft, action) {
-                const { cacheOverride } = action.payload;
-                if (cacheOverride) {
+                const { cacheOverride, reportDate } = action.payload;
+                const key = (0, agingBalance_1.getAgingBalancesKey)(reportDate);
+                const record = draft.arAgingBalancesByDate[key];
+                draft.uiState.selectedDate = reportDate;
+                if (cacheOverride || record == null) {
                     draft.fetchState = 'In-Progress';
                     draft.error = undefined;
                 }
             },
-            prepare(cacheOverride = false, // eslint-disable-line @typescript-eslint/no-inferrable-types
-            reportDate) {
+            prepare(reportDate, cacheOverride = false) {
                 return {
                     payload: {
                         cacheOverride,
@@ -49,24 +62,25 @@ const arAging = (0, toolkit_1.createSlice)({
             },
         },
         updateArAgingOnSuccess: {
-            prepare(data) {
+            prepare(reportDate, data) {
                 return {
                     payload: {
+                        reportDate,
                         data,
                     },
                 };
             },
             reducer(draft, action) {
-                const { data } = action.payload;
-                draft.fetchState = 'Completed';
-                draft.error = undefined;
+                const { data, reportDate } = action.payload;
                 const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(data);
                 draft.firstMonthOfFY = report.firstMonthOfFY;
                 draft.bookCloseDate = report.bookCloseDate;
                 draft.dataAvailable = report.dataAvailable;
-                draft.arAgingBalancesByCustomerId = (0, arAgingPayload_1.toArAgingDataByCustomerId)(data);
-                draft.arAgingTotals = (0, arAgingPayload_1.toArAgingTotals)(data);
+                doUpdateArAgingBalancesByDate(draft.arAgingBalancesByDate, reportDate, data);
                 draft.agingPeriods = data.aging_periods.map((elem) => (0, agingBalance_1.toAgingPeriod)(elem));
+                draft.uiState.selectedDate = reportDate;
+                draft.fetchState = 'Completed';
+                draft.error = undefined;
             },
         },
         updateArAgingUIState(draft, action) {
@@ -85,6 +99,16 @@ const arAging = (0, toolkit_1.createSlice)({
             if (action.payload.selectedDate != null) {
                 draft.uiState.selectedDate = action.payload.selectedDate;
             }
+            if (action.payload.agingDateSelectionType != null) {
+                draft.uiState.agingDateSelectionType =
+                    action.payload.agingDateSelectionType;
+            }
+        },
+        updateArAgingNodeCollapseState(draft, action) {
+            const nodeCollapseState = action.payload;
+            draft.uiState.nodeCollapseState = Object.assign({}, draft.uiState.nodeCollapseState, {
+                [nodeCollapseState.nodeId]: nodeCollapseState.isCollapsed,
+            });
         },
         updateArAgingOnFailure: {
             reducer(draft, action) {
@@ -100,5 +124,15 @@ const arAging = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = arAging.actions, exports.fetchArAging = _a.fetchArAging, exports.updateArAgingUIState = _a.updateArAgingUIState, exports.updateArAgingOnFailure = _a.updateArAgingOnFailure, exports.updateArAgingOnSuccess = _a.updateArAgingOnSuccess, exports.clearArAging = _a.clearArAging;
+_a = arAging.actions, exports.fetchArAging = _a.fetchArAging, exports.updateArAgingUIState = _a.updateArAgingUIState, exports.updateArAgingOnFailure = _a.updateArAgingOnFailure, exports.updateArAgingOnSuccess = _a.updateArAgingOnSuccess, exports.updateArAgingNodeCollapseState = _a.updateArAgingNodeCollapseState, exports.clearArAging = _a.clearArAging;
 exports.default = arAging.reducer;
+const doUpdateArAgingBalancesByDate = (draft, reportDate, data) => {
+    const key = (0, agingBalance_1.getAgingBalancesKey)(reportDate);
+    const allCustomers = data.customers.map((customer) => (0, customerPayload_1.toCustomer)(customer));
+    const agingBalances = {
+        arAgingBalancesByCustomerId: (0, arAgingPayload_1.toArAgingDataByCustomerId)(data),
+        arAgingTotals: (0, arAgingPayload_1.toArAgingTotals)(data),
+        nestedCustomerHierarchy: (0, getNestedCustomerHierarchy_1.getNestedCustomerHierarchy)(allCustomers),
+    };
+    draft[key] = agingBalances;
+};

package/lib/view/arAgingView/arAgingReport/arAgingSelector.d.ts

@@ -1,18 +1,24 @@
 import { RootState } from '../../../reducer';
 import { SelectorReport } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import { Customer } from '../../../entity/customer/customer';
+import { Customer } from '../../../entity/customer/customerState';
 import { AgingBalance, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
 import { Amount } from '../../../commonStateTypes/amount';
-import { AgingReportUIState } from '../../../commonStateTypes/viewAndReport/agingReportStateTypes';
-export interface AgingBalancesByCustomer {
+import { NestedCustomerID } from '../../../commonStateTypes/customerView/nestedCustomerID';
+import { ArAgingUIState } from './arAgingState';
+export interface NestedAgingBalancesByCustomer {
+    id: NestedCustomerID;
+    isLeafCustomer: boolean;
+    hasSiblings: boolean;
     customer: Customer;
-    total: Amount;
     arAgingBalances: AgingBalance[];
+    children: NestedAgingBalancesByCustomer[];
+    total: Amount;
+    totalWithChildren: Amount;
 }
 export interface ArAgingReport extends SelectorReport {
-    agingBalancesByCustomer: AgingBalancesByCustomer[];
+    agingBalances: NestedAgingBalancesByCustomer[];
     totalBalances: AgingBalance[];
-    arAgingUIState: AgingReportUIState;
+    arAgingUIState: ArAgingUIState;
     agingPeriods: AgingPeriod[];
 }
 export declare const getArAgingReport: (state: RootState) => ArAgingReport;

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

@@ -5,36 +5,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getArAgingReport = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const keys_1 = __importDefault(require("lodash/keys"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
-const customer_1 = require("../../../entity/customer/customer");
+const customerState_1 = require("../../../entity/customer/customerState");
+const agingBalance_1 = require("../../../commonStateTypes/agingBalance/agingBalance");
 const customerSelector_1 = require("../../../entity/customer/customerSelector");
 exports.getArAgingReport = (0, toolkit_1.createSelector)((state) => state.arAgingState, (state) => state.customerState, (arAgingState, customerState) => {
-    const { reportId, reportTitle, fetchState, uiState, firstMonthOfFY, arAgingTotals, arAgingBalancesByCustomerId, agingPeriods, } = arAgingState;
-    const { searchString, sortOrder, sortKey } = uiState;
-    const agingBalancesByCustomer = (0, keys_1.default)(arAgingBalancesByCustomerId).map((customerId) => {
-        const customer = (0, customerSelector_1.getCustomer)(customerState, customerId);
-        if (customer == null) {
-            throw new Error(`Customer with ${customerId} doesn't exist`);
-        }
-        const arAgingBalances = arAgingBalancesByCustomerId[customerId];
-        const { currencyCode, currencySymbol } = customer;
-        const customerTotal = arAgingBalances.reduce((prev, curr) => {
-            return prev + curr.balance.amount;
-        }, 0);
-        return {
-            customer,
-            arAgingBalances,
-            total: {
-                amount: customerTotal,
-                currencyCode: currencyCode !== null && currencyCode !== void 0 ? currencyCode : customer_1.defaultCustomerCurrency.currencyCode,
-                currencySymbol: currencySymbol !== null && currencySymbol !== void 0 ? currencySymbol : customer_1.defaultCustomerCurrency.currencySymbol,
-            },
-        };
+    const { reportId, reportTitle, fetchState, uiState, firstMonthOfFY, agingPeriods, } = arAgingState;
+    const { searchString, sortOrder, sortKey, selectedDate } = uiState;
+    const balancesKey = (0, agingBalance_1.getAgingBalancesKey)(selectedDate);
+    const arAgingBalancesByDate = arAgingState.arAgingBalancesByDate[balancesKey];
+    const arAgingBalancesByCustomerId = arAgingBalancesByDate != null
+        ? arAgingBalancesByDate.arAgingBalancesByCustomerId
+        : {};
+    const arAgingTotals = arAgingBalancesByDate != null
+        ? arAgingBalancesByDate.arAgingTotals
+        : [];
+    const nestedHierarchy = arAgingBalancesByDate != null
+        ? arAgingBalancesByDate.nestedCustomerHierarchy
+        : [];
+    const agingBalances = getNestedAgingBalancesByCustomer(customerState, arAgingBalancesByCustomerId, nestedHierarchy, searchString, sortKey, sortOrder);
+    return {
+        agingBalances,
+        reportId,
+        reportTitle,
+        fetchState,
+        firstMonthOfFY,
+        agingPeriods,
+        arAgingUIState: uiState,
+        totalBalances: arAgingTotals,
+    };
+});
+const getNestedAgingBalancesByCustomer = (customerState, agingBalancesByCustomerId, nestedCustomerHierarchy, searchString, sortKey, sortOrder) => {
+    if (nestedCustomerHierarchy.length === 0) {
+        return [];
+    }
+    const agingBalancesByCustomer = nestedCustomerHierarchy.map((parentCustomer) => {
+        return getCustomerAgingReport(customerState, parentCustomer, agingBalancesByCustomerId, searchString, sortKey, sortOrder, parentCustomer.children.length === 0);
     });
-    const filteredAgingBalancesByCustomer = agingBalancesByCustomer.filter((balance) => balance.customer.name
-        .toLowerCase()
-        .includes(searchString.toLowerCase()));
+    const filteredAgingBalancesByCustomer = agingBalancesByCustomer.filter((balance) => balance.customer.name.toLowerCase().includes(searchString.toLowerCase()));
     const sortedAgingBalancesByCustomer = (0, orderBy_1.default)(filteredAgingBalancesByCustomer, (balance) => {
         var _a;
         switch (sortKey) {
@@ -48,14 +56,39 @@ exports.getArAgingReport = (0, toolkit_1.createSelector)((state) => state.arAgin
             }
         }
     }, sortOrder === 'ascending' ? 'asc' : 'desc');
+    return sortedAgingBalancesByCustomer;
+};
+const getCustomerAgingReport = (customerState, nestedCustomer, arAgingBalancesByCustomerId, searchString, sortKey, sortOrder, isLeafCustomer) => {
+    const customerId = nestedCustomer.customerId[0];
+    const customer = (0, customerSelector_1.getCustomer)(customerState, customerId);
+    if (customer == null) {
+        throw new Error(`Customer with ${customerId} doesn't exist`);
+    }
+    const arAgingBalances = arAgingBalancesByCustomerId[customerId];
+    const { currencyCode, currencySymbol } = customer;
+    const customerTotal = arAgingBalances.reduce((prev, curr) => {
+        return prev + curr.balance.amount;
+    }, 0);
+    const customerTotalWithChildren = arAgingBalances.reduce((prev, curr) => {
+        var _a, _b;
+        return prev + ((_b = (_a = curr.totalBalance) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0);
+    }, 0);
     return {
-        agingBalancesByCustomer: sortedAgingBalancesByCustomer,
-        reportId,
-        reportTitle,
-        fetchState,
-        firstMonthOfFY,
-        agingPeriods,
-        arAgingUIState: uiState,
-        totalBalances: arAgingTotals,
+        id: nestedCustomer.customerId,
+        isLeafCustomer,
+        hasSiblings: nestedCustomer.hasSiblings,
+        customer,
+        arAgingBalances,
+        children: getNestedAgingBalancesByCustomer(customerState, arAgingBalancesByCustomerId, nestedCustomer.children, searchString, sortKey, sortOrder),
+        total: {
+            amount: customerTotal,
+            currencyCode: currencyCode !== null && currencyCode !== void 0 ? currencyCode : customerState_1.defaultCustomerCurrency.currencyCode,
+            currencySymbol: currencySymbol !== null && currencySymbol !== void 0 ? currencySymbol : customerState_1.defaultCustomerCurrency.currencySymbol,
+        },
+        totalWithChildren: {
+            amount: customerTotalWithChildren,
+            currencyCode: currencyCode !== null && currencyCode !== void 0 ? currencyCode : customerState_1.defaultCustomerCurrency.currencyCode,
+            currencySymbol: currencySymbol !== null && currencySymbol !== void 0 ? currencySymbol : customerState_1.defaultCustomerCurrency.currencySymbol,
+        },
     };
-});
+};

package/lib/view/arAgingView/arAgingReport/arAgingState.d.ts

@@ -1,10 +1,18 @@
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
-import { Report } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import { AgingBalance, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
+import { AgingBalance, AgingBalancesKey, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
 import { AgingReportUIState } from '../../../commonStateTypes/viewAndReport/agingReportStateTypes';
-export interface ArAgingState extends Report, FetchStateAndError {
+import { NestedCustomerHierarchy } from '../../../commonStateTypes/customerView/nestedCustomerID';
+import { ReportV2 } from '../../../commonStateTypes/v2/viewAndReport';
+export interface ARAgingBalancesByAgingBalancesKey {
     arAgingBalancesByCustomerId: Record<ID, AgingBalance[]>;
-    uiState: AgingReportUIState;
+    nestedCustomerHierarchy: NestedCustomerHierarchy[];
     arAgingTotals: AgingBalance[];
+}
+export interface ArAgingUIState extends AgingReportUIState {
+    nodeCollapseState: Record<ID, boolean>;
+}
+export interface ArAgingState extends ReportV2, FetchStateAndError {
+    arAgingBalancesByDate: Record<AgingBalancesKey, ARAgingBalancesByAgingBalancesKey>;
+    uiState: ArAgingUIState;
     agingPeriods: AgingPeriod[];
 }