@zeniai/client-epic-state 5.2.96 → 5.2.97-beta1KB

package/lib/esm/view/transactionDetail/createTransaction/createTransactionPayload.js

@@ -128,7 +128,6 @@ export const prepareCreateTransactionPayload = (state, localData) => {
     if (transactionType === 'journal_entry') {
         return {
             ...base,
-            document_id: localData.documentId,
             lines,
         };
     }
@@ -142,6 +141,8 @@ export const prepareCreateTransactionPayload = (state, localData) => {
     if (transactionType === 'check') {
         return {
             ...purchaseBase,
+            // The form has no payment method field for a check; it is always paid by check.
+            payment_type: 'check',
             document_number: localData.documentNumber,
             print_status: localData.printStatus,
             remit_to_address: toRemitToAddressPayload(localData.remitToAddress),

package/lib/esm/view/transactionDetail/createTransaction/createTransactionSelector.js

@@ -1,4 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
+import { getAccountBase } from '../../../entity/account/accountSelector';
 import { getAccountListFetchState, getNestedAccountListHierarchy, } from '../../accountList/accountListSelector';
 import { getNestedClassListHierarchy } from '../../classList/classListSelector';
 import { getResolvedTransferAccounts } from '../../createTransferEntry/createTransferEntrySelector';
@@ -22,6 +23,9 @@ export const getCreateTransactionVendorRecommendations = (state, vendorQboId) =>
         recommendations: view.recommendations,
     };
 };
+/** QBO keeps a sub-account on its parent's type, so filtering the roots is enough. */
+const getBankAccountsOnly = (accountState, hierarchy) => hierarchy.filter((node) => getAccountBase(accountState, node.accountId[0], 'account_list')
+    ?.accountType === 'bank');
 /**
  * Memoized: app-ui reads this straight from useSelector, and the vendor list and hierarchies are
  * rebuilt on every call, so an unmemoized version re-renders the page on every store action.
@@ -30,22 +34,28 @@ export const getCreateTransactionView = createSelector([
     (state) => state.transactionDetailState.createTransactionsState,
     (state) => state.vendorState.vendorByID,
     (state) => state.accountListState,
+    (state) => state.accountState,
     (state) => state.classListState,
     (state) => getResolvedTransferAccounts(state).transferAccountsList,
     (_state, transactionType) => transactionType,
-], (createTransactionsState, vendorByID, accountListState, classListState, transferAccountsList, transactionType) => ({
-    transactionType,
-    localData: createTransactionsState.newTransactionState[transactionType],
-    createStatus: createTransactionsState.createStatus,
-    createdTransactionId: createTransactionsState.createdTransactionId,
-    vendorList: Object.values(vendorByID),
-    accountListFetchState: getAccountListFetchState(accountListState, 'accountList'),
-    lineAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionLineAccountList'),
-    paymentAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionPaymentAccountList'),
-    accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionLineAccountList'),
-    paymentAccountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionPaymentAccountList'),
-    classListNestedAccountHierarchy: getNestedClassListHierarchy(classListState),
-    transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
-    fetchState: createTransactionsState.createStatus.fetchState,
-    error: createTransactionsState.createStatus.error,
-}));
+], (createTransactionsState, vendorByID, accountListState, accountState, classListState, transferAccountsList, transactionType) => {
+    const paymentAccountListNestedAccountHierarchy = getNestedAccountListHierarchy(accountListState, 'createTransactionPaymentAccountList');
+    return {
+        transactionType,
+        localData: createTransactionsState.newTransactionState[transactionType],
+        createStatus: createTransactionsState.createStatus,
+        createdTransactionId: createTransactionsState.createdTransactionId,
+        vendorList: Object.values(vendorByID),
+        accountListFetchState: getAccountListFetchState(accountListState, 'accountList'),
+        lineAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionPaymentAccountList'),
+        accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListNestedAccountHierarchy: transactionType === 'check'
+            ? getBankAccountsOnly(accountState, paymentAccountListNestedAccountHierarchy)
+            : paymentAccountListNestedAccountHierarchy,
+        classListNestedAccountHierarchy: getNestedClassListHierarchy(classListState),
+        transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
+        fetchState: createTransactionsState.createStatus.fetchState,
+        error: createTransactionsState.createStatus.error,
+    };
+});

package/lib/view/transactionDetail/createTransaction/createTransactionPayload.d.ts

@@ -12,8 +12,8 @@ import { CreateTransactionLocalData } from './createTransactionState';
  * 1. `line_detail_type` is snake_case. The PascalCase strings in the backend are Python
  *    constant NAMES; ZENI_LINE_DETAIL_TYPE_TO_QBO_LINE_DETAIL_TYPE_MAP converts them for the
  *    body the backend sends on to QuickBooks, never for ours.
- * 2. The reference number uses two different keys depending on the QBO entity. check and
- *    expense are Purchases and take `document_number`; everything else takes `document_id`.
+ * 2. Only the QBO Purchases (check, credit_card_credit) send a reference number, as
+ *    `document_number`. A journal entry sends none.
  */
 export interface CreateTransactionAccountPayload {
     qbo_id: ID;
@@ -51,8 +51,6 @@ export interface CreateTransactionRemitToAddressPayload {
 export interface CreateTransactionRequest extends Record<string, unknown> {
     transaction_date: string;
     transaction_type: string;
-    /** journal_entry reference number. */
-    document_id?: string;
     /** check / credit_card_credit reference number (QBO Purchase). */
     document_number?: string;
     from_account_id?: ID;

package/lib/view/transactionDetail/createTransaction/createTransactionPayload.js

@@ -132,7 +132,6 @@ const prepareCreateTransactionPayload = (state, localData) => {
     if (transactionType === 'journal_entry') {
         return {
             ...base,
-            document_id: localData.documentId,
             lines,
         };
     }
@@ -146,6 +145,8 @@ const prepareCreateTransactionPayload = (state, localData) => {
     if (transactionType === 'check') {
         return {
             ...purchaseBase,
+            // The form has no payment method field for a check; it is always paid by check.
+            payment_type: 'check',
             document_number: localData.documentNumber,
             print_status: localData.printStatus,
             remit_to_address: toRemitToAddressPayload(localData.remitToAddress),

package/lib/view/transactionDetail/createTransaction/createTransactionSelector.d.ts

@@ -22,7 +22,10 @@ export interface CreateTransactionView extends SelectorView {
     lineAccountListFetchState: FetchState;
     localData: CreateTransactionLocalData;
     paymentAccountListFetchState: FetchState;
-    /** Bank, credit card and other current asset accounts for the header payment account. */
+    /**
+     * Bank, credit card and other current asset accounts for the header payment account; bank
+     * accounts only for a check.
+     */
     paymentAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     transactionType: CreatableTransactionType;
     /** Populated for transfer only; the COA would offer ineligible accounts. */

package/lib/view/transactionDetail/createTransaction/createTransactionSelector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCreateTransactionView = exports.getCreateTransactionVendorRecommendations = exports.getCreateTransactionStatus = exports.getCreateTransactionLocalData = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const accountSelector_1 = require("../../../entity/account/accountSelector");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const createTransferEntrySelector_1 = require("../../createTransferEntry/createTransferEntrySelector");
@@ -28,6 +29,9 @@ const getCreateTransactionVendorRecommendations = (state, vendorQboId) => {
     };
 };
 exports.getCreateTransactionVendorRecommendations = getCreateTransactionVendorRecommendations;
+/** QBO keeps a sub-account on its parent's type, so filtering the roots is enough. */
+const getBankAccountsOnly = (accountState, hierarchy) => hierarchy.filter((node) => (0, accountSelector_1.getAccountBase)(accountState, node.accountId[0], 'account_list')
+    ?.accountType === 'bank');
 /**
  * Memoized: app-ui reads this straight from useSelector, and the vendor list and hierarchies are
  * rebuilt on every call, so an unmemoized version re-renders the page on every store action.
@@ -36,22 +40,28 @@ exports.getCreateTransactionView = (0, toolkit_1.createSelector)([
     (state) => state.transactionDetailState.createTransactionsState,
     (state) => state.vendorState.vendorByID,
     (state) => state.accountListState,
+    (state) => state.accountState,
     (state) => state.classListState,
     (state) => (0, createTransferEntrySelector_1.getResolvedTransferAccounts)(state).transferAccountsList,
     (_state, transactionType) => transactionType,
-], (createTransactionsState, vendorByID, accountListState, classListState, transferAccountsList, transactionType) => ({
-    transactionType,
-    localData: createTransactionsState.newTransactionState[transactionType],
-    createStatus: createTransactionsState.createStatus,
-    createdTransactionId: createTransactionsState.createdTransactionId,
-    vendorList: Object.values(vendorByID),
-    accountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'accountList'),
-    lineAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionLineAccountList'),
-    paymentAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionPaymentAccountList'),
-    accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionLineAccountList'),
-    paymentAccountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionPaymentAccountList'),
-    classListNestedAccountHierarchy: (0, classListSelector_1.getNestedClassListHierarchy)(classListState),
-    transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
-    fetchState: createTransactionsState.createStatus.fetchState,
-    error: createTransactionsState.createStatus.error,
-}));
+], (createTransactionsState, vendorByID, accountListState, accountState, classListState, transferAccountsList, transactionType) => {
+    const paymentAccountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionPaymentAccountList');
+    return {
+        transactionType,
+        localData: createTransactionsState.newTransactionState[transactionType],
+        createStatus: createTransactionsState.createStatus,
+        createdTransactionId: createTransactionsState.createdTransactionId,
+        vendorList: Object.values(vendorByID),
+        accountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'accountList'),
+        lineAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionPaymentAccountList'),
+        accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListNestedAccountHierarchy: transactionType === 'check'
+            ? getBankAccountsOnly(accountState, paymentAccountListNestedAccountHierarchy)
+            : paymentAccountListNestedAccountHierarchy,
+        classListNestedAccountHierarchy: (0, classListSelector_1.getNestedClassListHierarchy)(classListState),
+        transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
+        fetchState: createTransactionsState.createStatus.fetchState,
+        error: createTransactionsState.createStatus.error,
+    };
+});

package/lib/view/transactionDetail/createTransaction/createTransactionState.d.ts

@@ -54,8 +54,6 @@ export interface CreateTransactionLocalData {
     /** Empty for transfer, which has no lines at all. */
     lines: CreateTransactionLineLocalData[];
     transactionType: CreatableTransactionType;
-    /** journal_entry reference number. */
-    documentId?: string;
     /** check / credit_card_credit reference number. */
     documentNumber?: string;
     /** transfer */

package/package.json

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