@zeniai/client-epic-state 4.12.36 → 4.12.37

package/lib/view/scheduleView/scheduleAccruedDetailView/epics/fetchRecommendedTransactionRowIndexEpic.js

@@ -28,13 +28,13 @@ const fetchRecommendedTransactionRowIndexEpic = (actions$, state$, zeniAPI) => a
     const selectedJournalEntry = jeScheduleState.scheduledJournalEntry[selectedJELinkRowIndex];
     const { jeDebit } = jeScheduleState;
     const { account, accountingClass } = jeDebit;
-    const { amount, runningBalance: accruedBalance, expectedPostDate: startDate, } = selectedJournalEntry;
-    const endDate = (0, zeniDayJS_1.dateNow)().format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT);
+    const { amount, runningBalance: accruedBalance } = selectedJournalEntry;
+    const endDate = (0, zeniDayJS_1.dateNow)().endOf('month').format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT);
     const { vendor } = jeScheduleState;
     const vendorId = vendor.id;
     const vendorEntity = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorId);
     const queryParam = {
-        start_date: startDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT),
+        start_date: (0, zeniDayJS_1.dateNow)().format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT),
         end_date: endDate,
         amount: (_a = amount === null || amount === void 0 ? void 0 : amount.amount) !== null && _a !== void 0 ? _a : 0,
         accrued_balance: (_b = accruedBalance === null || accruedBalance === void 0 ? void 0 : accruedBalance.amount) !== null && _b !== void 0 ? _b : 0,

package/lib/view/scheduleView/scheduleAccruedDetailView/scheduleAccruedDetailPayload.d.ts

@@ -58,3 +58,4 @@ export declare const mapAccruedExpenseJEScheduleTransactionToPayload: (jeSchedul
 export declare const prepareNewScheduleAccruedDetailPayload: (state: RootState, scheduleDetailsLocalDataAccruedExpenses: ScheduleDetailsLocalDataAccruedExpenses) => SaveScheduleDetailPayload;
 export declare const prepareScheduleAccruedDetailPayload: (state: RootState, scheduleDetailsLocalDataAccruedExpenses: ScheduleDetailsLocalDataAccruedExpenses, selectedJEScheduleKey: JEScheduleKey, isDelete?: boolean | undefined) => SaveScheduleDetailPayload;
 export declare const prepareScheduleAccruedDetailForCancelPayload: (state: RootState, scheduleDetailsLocalDataAccruedExpenses: ScheduleDetailsLocalDataAccruedExpenses, selectedJEScheduleKey: JEScheduleKey, rowId?: number | undefined) => SaveScheduleDetailPayload;
+export declare const capitalizeString: (text: string) => string;

package/lib/view/scheduleView/scheduleAccruedDetailView/scheduleAccruedDetailPayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareScheduleAccruedDetailForCancelPayload = exports.prepareScheduleAccruedDetailPayload = exports.prepareNewScheduleAccruedDetailPayload = exports.mapAccruedExpenseJEScheduleTransactionToPayload = exports.mapNewAccruedExpenseJEScheduleTransactionToPayload = exports.mapNewJEScheduleLocalDataToScheduleDetailPayload = exports.mapJEScheduleLocalDataToScheduleDetailPayloadForCancel = exports.mapJEScheduleAccruedLocalDataToScheduleDetailPayload = exports.mapVendorToVendorPayload = void 0;
+exports.capitalizeString = exports.prepareScheduleAccruedDetailForCancelPayload = exports.prepareScheduleAccruedDetailPayload = exports.prepareNewScheduleAccruedDetailPayload = exports.mapAccruedExpenseJEScheduleTransactionToPayload = exports.mapNewAccruedExpenseJEScheduleTransactionToPayload = exports.mapNewJEScheduleLocalDataToScheduleDetailPayload = exports.mapJEScheduleLocalDataToScheduleDetailPayloadForCancel = exports.mapJEScheduleAccruedLocalDataToScheduleDetailPayload = exports.mapVendorToVendorPayload = void 0;
 const classListSelector_1 = require("../../classList/classListSelector");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
@@ -19,7 +19,7 @@ const mapJEScheduleAccruedLocalDataToScheduleDetailPayload = (jeScheduleDetails,
         const currentScheduleJournalEntry = scheduleJournalEntry[index];
         const payload = Object.assign(Object.assign(Object.assign({ status: {
                 code: journalEntry.postingStatus,
-                label: journalEntry.postingStatus,
+                label: (0, exports.capitalizeString)(journalEntry.postingStatus),
             }, transaction_memo: journalEntry.memo, third_party_id: (_a = journalEntry.jeLink.thirdPartyTransactionId) !== null && _a !== void 0 ? _a : null, expected_post_date: journalEntry.postingDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT), amount: journalEntry.amount.amount }, (selectedJEAccruedLinkRowIndex === index &&
             reversalTransactionDetails != null
             ? { is_bill_linked: true }
@@ -195,12 +195,10 @@ const mapAccruedExpenseJEScheduleTransactionToPayload = (jeScheduleAccruedExpens
         period: selectedMonths !== null && selectedMonths !== void 0 ? selectedMonths : null,
         je_schedule_type: 'accrued_expenses',
         posting_date: postingDate,
-        balance: (startingBalance === null || startingBalance === void 0 ? void 0 : startingBalance.amount) != null
-            ? startingBalance.amount
-            : getBalanceAmountAsOfToday({
-                balanceAsOfToday,
-                recurringAmount,
-            }),
+        balance: getBalanceAmountAsOfToday({
+            balanceAsOfToday,
+            recurringAmount,
+        }),
         start_date: (_b = startDate === null || startDate === void 0 ? void 0 : startDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)) !== null && _b !== void 0 ? _b : firstJEScheduleDate,
         end_date: (_c = endDate === null || endDate === void 0 ? void 0 : endDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)) !== null && _c !== void 0 ? _c : lastJEScheduleDate,
         je_credit_accounting_class_id: balanceSheetClassId !== null && balanceSheetClassId !== void 0 ? balanceSheetClassId : '',
@@ -286,3 +284,7 @@ const prepareScheduleAccruedDetailForCancelPayload = (state, scheduleDetailsLoca
     return payload;
 };
 exports.prepareScheduleAccruedDetailForCancelPayload = prepareScheduleAccruedDetailForCancelPayload;
+const capitalizeString = (text) => {
+    return text.charAt(0).toUpperCase() + text.substring(1);
+};
+exports.capitalizeString = capitalizeString;

package/lib/view/scheduleView/scheduleAccruedDetailView/scheduleAccruedDetailSelector.js

@@ -22,7 +22,11 @@ const getAccruedScheduleDetailsView = (state, scheduleType) => {
     const scheduleDetailAccountTypes = (0, scheduleDetailLocalDataHelper_1.getAccountsTypesForScheduleDetails)(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 accruedExpenseAccounts = allAccountList.accounts
+        .filter((account) => account.labels.includes('accrued_expenses'))
+        .map((account) => account.accountId);
+    const scheduleDetailAccountFilteredIds = scheduleDetailAccountIds.filter((accountId) => !accruedExpenseAccounts.includes(accountId));
+    const filteredAccounts = allAccountList.accounts.filter((account) => scheduleDetailAccountFilteredIds.includes(account.accountId));
     const accruedCategoryIds = (0, accountSelector_1.getAccountIdsForLabels)(accountState, [
         'accrued_expenses',
     ]);
@@ -32,7 +36,7 @@ const getAccruedScheduleDetailsView = (state, scheduleType) => {
         return (0, omit_1.default)(classData, ['accountIds', 'key']);
     });
     const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
-        scheduleDetailAccountIds.includes(account.accountId[0]));
+        scheduleDetailAccountFilteredIds.includes(account.accountId[0]));
     const accruedAccountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
         accruedCategoryIds.includes(account.accountId[0]));
     const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);

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

@@ -264,7 +264,7 @@ const calculateCOABalanceGroupedByPeriodForAccrued = (jeSchedule) => {
 };
 exports.calculateCOABalanceGroupedByPeriodForAccrued = calculateCOABalanceGroupedByPeriodForAccrued;
 const countStatusForDuration = (statusCode) => {
-    return ['unknown', 'posted'].includes(statusCode);
+    return ['unknown', 'posted', 'canceled'].includes(statusCode);
 };
 /**
  * Function to get Duration of months out total months Eg 5/12 or 9/12
@@ -370,7 +370,7 @@ const getDefaultSelectedTimeframeForScheduleType = (scheduleType) => {
             };
         case 'accrued_expenses':
             return {
-                startDate: thisMonthStart.subtract(7, 'year'),
+                startDate: thisMonthStart.subtract(24, 'months'),
                 endDate: thisMonthEnd,
             };
         default:

package/package.json

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