@zeniai/client-epic-state 5.2.8 → 5.2.10-betaAK0

package/lib/entity/invoicing/invoicingCommonPayload.d.ts

@@ -1,3 +1,5 @@
+import { AccountBasePayload } from '../account/accountPayload';
+import { AccountBase } from '../account/accountState';
 import { AddressPayload } from '../address/addressPayload';
 export type InvoicingPriceType = 'tax_exclusive' | 'tax_inclusive';
 export declare const INVOICING_DUNNING_ACTIONS: readonly ["email_only", "email_and_retry", "do_nothing", "retry_only"];
@@ -92,41 +94,51 @@ export declare function toInvoicingQboCustomerMatchingMode(value: string): Invoi
  * A mapped account as the newer settings payload returns it: the platform id,
  * plus hydrated fields the client only displays.
  */
-export interface InvoicingQboMappedAccountPayload {
-    account_id?: string | null;
-    account_name?: string | null;
-    fully_qualified_name?: string | null;
-    qbo_id?: string | null;
-}
 /**
  * Account mappings arrive in two shapes. The original sends a bare id per slot
- * (`deposit_account_id`); the newer one sends an object holding the platform id
- * (`deposit_account: {account_id}`). Both are declared because a tenant can be
- * served either depending on when its backend rolled, and a page that understands
- * only one renders an empty picker over data that exists.
+ * (`deposit_account_id`); the newer one sends the account itself
+ * (`deposit_account`). Both are declared because a tenant can be served either
+ * depending on when its backend rolled, and a page that understands only one
+ * renders an empty picker over data that exists. `Partial` because a read may
+ * carry only the ids, while a write sends a whole `AccountBasePayload`.
  */
 export interface InvoicingQboAccountMappingsPayload {
-    default_income_account?: InvoicingQboMappedAccountPayload | null;
+    default_income_account?: Partial<AccountBasePayload> | null;
     default_income_account_id?: string | null;
-    deposit_account?: InvoicingQboMappedAccountPayload | null;
+    deposit_account?: Partial<AccountBasePayload> | null;
     deposit_account_id?: string | null;
     deposit_account_overrides?: Record<string, string> | null;
-    discounts_account?: InvoicingQboMappedAccountPayload | null;
+    discounts_account?: Partial<AccountBasePayload> | null;
     discounts_account_id?: string | null;
-    rounding_account?: InvoicingQboMappedAccountPayload | null;
+    rounding_account?: Partial<AccountBasePayload> | null;
     rounding_account_id?: string | null;
-    write_off_account?: InvoicingQboMappedAccountPayload | null;
+    write_off_account?: Partial<AccountBasePayload> | null;
     write_off_account_id?: string | null;
 }
+/**
+ * The id for one mapping slot, from whichever shape the backend sent. The object
+ * form wins when present; a blank id in either is treated as unset so the picker
+ * shows its placeholder rather than selecting nothing.
+ */
+/**
+ * The first id a picker can actually select. Callers list the QuickBooks id
+ * first: the options are keyed on it, so an internal id selects nothing even
+ * when it names the same record. Blank counts as absent, so a cleared field
+ * falls through to the next candidate rather than selecting an empty option.
+ */
+export declare const firstSelectableInvoicingId: (candidates: readonly (string | null | undefined)[]) => string | undefined;
 /**
  * Read one account-mapping dropdown value by its config `code` (the codes in
  * `qbo_account_mapping_kind_options` match the `account_mappings` field names).
  */
 export declare function getInvoicingQboAccountMappingId(accountMappings: InvoicingQboAccountMappingsPayload | undefined, code: string): string | undefined;
 /**
- * Return a copy of the account mappings with the dropdown slot named by
- * `code` set to `accountId`. Unknown codes leave the mappings unchanged.
+ * Expand each mapping from the id the picker submitted to the whole account, the
+ * shape the service stores. Written at the request boundary rather than in the
+ * page's draft so the UI keeps working in ids, and an id that no longer resolves
+ * is left out — a mapping the service cannot expand is worse than none.
  */
+export declare const withInvoicingQboMappedAccounts: (accountMappings: InvoicingQboAccountMappingsPayload | undefined, accountByQboId: (qboId: string) => AccountBase | undefined) => InvoicingQboAccountMappingsPayload | undefined;
 export declare function withInvoicingQboAccountMappingId(accountMappings: InvoicingQboAccountMappingsPayload | undefined, code: string, accountId: string): InvoicingQboAccountMappingsPayload;
 export interface InvoicingQboSettingsPayload {
     account_mappings?: InvoicingQboAccountMappingsPayload | null;

package/lib/entity/invoicing/invoicingCommonPayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_INVOICING_FIELD_HELP_GROUPS = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.INVOICING_DISCOUNT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_PRODUCT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_ITEM_LIFECYCLE_ACTIONS = exports.INVOICING_SUBSCRIPTION_LIFECYCLE_ACTIONS = exports.INVOICING_DUNNING_ACTIONS = void 0;
+exports.ALL_INVOICING_FIELD_HELP_GROUPS = exports.withInvoicingQboMappedAccounts = exports.firstSelectableInvoicingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.INVOICING_DISCOUNT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_PRODUCT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_ITEM_LIFECYCLE_ACTIONS = exports.INVOICING_SUBSCRIPTION_LIFECYCLE_ACTIONS = exports.INVOICING_DUNNING_ACTIONS = void 0;
 exports.toInvoicingDunningAction = toInvoicingDunningAction;
 exports.toInvoicingSubscriptionLifecycleAction = toInvoicingSubscriptionLifecycleAction;
 exports.toInvoicingSubscriptionLifecycleActionOption = toInvoicingSubscriptionLifecycleActionOption;
@@ -23,6 +23,7 @@ exports.toInvoicingSubscriptionEditFieldOption = toInvoicingSubscriptionEditFiel
 exports.toAuditLogEntityRouteOption = toAuditLogEntityRouteOption;
 exports.buildInvoicingEntityPath = buildInvoicingEntityPath;
 exports.isInvoicingEntityLinkable = isInvoicingEntityLinkable;
+const accountPayload_1 = require("../account/accountPayload");
 exports.INVOICING_DUNNING_ACTIONS = [
     'email_only',
     'email_and_retry',
@@ -158,17 +159,22 @@ function toInvoicingQboCustomerMatchingMode(value) {
  * form wins when present; a blank id in either is treated as unset so the picker
  * shows its placeholder rather than selecting nothing.
  */
+/**
+ * The first id a picker can actually select. Callers list the QuickBooks id
+ * first: the options are keyed on it, so an internal id selects nothing even
+ * when it names the same record. Blank counts as absent, so a cleared field
+ * falls through to the next candidate rather than selecting an empty option.
+ */
+const firstSelectableInvoicingId = (candidates) => candidates.find((candidate) => candidate != null && candidate !== '');
+exports.firstSelectableInvoicingId = firstSelectableInvoicingId;
 function readInvoicingQboMappedAccountId(mappedAccount, legacyAccountId) {
-    // `qbo_id` first: the pickers key their options on the QuickBooks id, so an
-    // internal `account_id` would not select anything even when it is the same
-    // account. Both are read because the mapping arrives either way depending on
-    // how it was saved.
-    const candidates = [
+    // Both shapes are read: the mapping arrives either way depending on how it
+    // was saved.
+    return (0, exports.firstSelectableInvoicingId)([
         mappedAccount?.qbo_id,
         mappedAccount?.account_id,
         legacyAccountId,
-    ];
-    return candidates.find((candidate) => candidate != null && candidate !== '');
+    ]);
 }
 /**
  * Read one account-mapping dropdown value by its config `code` (the codes in
@@ -194,11 +200,42 @@ function getInvoicingQboAccountMappingId(accountMappings, code) {
  * Return a copy of the account mappings with the dropdown slot named by
  * `code` set to `accountId`. Unknown codes leave the mappings unchanged.
  */
+/** The object key holding the mapped account for each `*_account_id` code. */
+const INVOICING_QBO_MAPPED_ACCOUNT_KEY = {
+    default_income_account_id: 'default_income_account',
+    deposit_account_id: 'deposit_account',
+    discounts_account_id: 'discounts_account',
+    rounding_account_id: 'rounding_account',
+    write_off_account_id: 'write_off_account',
+};
+/**
+ * Expand each mapping from the id the picker submitted to the whole account, the
+ * shape the service stores. Written at the request boundary rather than in the
+ * page's draft so the UI keeps working in ids, and an id that no longer resolves
+ * is left out — a mapping the service cannot expand is worse than none.
+ */
+const withInvoicingQboMappedAccounts = (accountMappings, accountByQboId) => {
+    if (accountMappings == null) {
+        return undefined;
+    }
+    const expanded = { ...accountMappings };
+    Object.entries(INVOICING_QBO_MAPPED_ACCOUNT_KEY).forEach(([code, objectKey]) => {
+        const accountId = getInvoicingQboAccountMappingId(accountMappings, code);
+        if (accountId == null) {
+            return;
+        }
+        const account = accountByQboId(accountId);
+        expanded[objectKey] =
+            account != null ? (0, accountPayload_1.toAccountPayload)(account) : undefined;
+        expanded[code] = undefined;
+    });
+    return expanded;
+};
+exports.withInvoicingQboMappedAccounts = withInvoicingQboMappedAccounts;
 function withInvoicingQboAccountMappingId(accountMappings, code, accountId) {
     // Both slots are written together. Setting only the bare id would leave the
     // object shape behind, and the reader prefers it — so the selection just made
-    // would read back as whatever was mapped before. The object is dropped rather
-    // than rebuilt: only the id is known here, not the name that came with it.
+    // would read back as whatever was mapped before.
     const base = accountMappings ?? {};
     switch (code) {
         case 'deposit_account_id':

package/lib/entity/invoicing/product/productPayload.d.ts

@@ -1,3 +1,5 @@
+import { AccountBasePayload } from '../../account/accountPayload';
+import { ClassBasePayload } from '../../class/classPayload';
 import { InvoicingPlanTier, InvoicingProduct } from './productState';
 export interface InvoicingPlanTierPayload {
     price: number;
@@ -7,10 +9,18 @@ export interface InvoicingPlanTierPayload {
     pricing_type?: string;
 }
 export interface InvoicingAccountingDetailPayload {
+    /**
+     * `account` and `accounting_class` hold whole records — what the service stores
+     * and what the catalog payload builder sends. The bare `accounting_code` /
+     * `accounting_category_1` are the older shape, still read so a plan saved
+     * before the rollover prefills.
+     */
+    account?: Partial<AccountBasePayload> | null;
     accounting_category_1?: string;
     accounting_category_2?: string;
     accounting_category_3?: string;
     accounting_category_4?: string;
+    accounting_class?: Partial<ClassBasePayload> | null;
     accounting_code?: string;
     sku?: string;
 }

package/lib/entity/invoicing/product/productPayload.js

@@ -4,6 +4,7 @@ exports.mapInvoicingProductPayloadToState = exports.mapInvoicingPlanTierPayloadT
 const amount_1 = require("../../../commonStateTypes/amount");
 const currencyHelper_1 = require("../../../commonStateTypes/currencyHelper");
 const zeniDayJS_1 = require("../../../zeniDayJS");
+const invoicingCommonPayload_1 = require("../invoicingCommonPayload");
 // ── Payload → State mappers (snake_case wire shape → camelCase domain shape) ──
 const mapInvoicingPlanTierPayloadToState = (payload, currencyCode, currencySymbol) => ({
     price: (0, amount_1.toAmount)(payload.price, currencyCode, currencySymbol),
@@ -14,11 +15,22 @@ const mapInvoicingPlanTierPayloadToState = (payload, currencyCode, currencySymbo
 });
 exports.mapInvoicingPlanTierPayloadToState = mapInvoicingPlanTierPayloadToState;
 const mapInvoicingAccountingDetailPayloadToState = (payload) => ({
-    accountingCategory1: payload.accounting_category_1,
+    // The QuickBooks id first in both, for the reason `firstSelectableInvoicingId`
+    // documents: the form's pickers are keyed on it, so reading the internal id
+    // would leave the field blank over a mapping that exists.
+    accountingCategory1: (0, invoicingCommonPayload_1.firstSelectableInvoicingId)([
+        payload.accounting_class?.qbo_id,
+        payload.accounting_class?.accounting_class_id,
+        payload.accounting_category_1,
+    ]),
     accountingCategory2: payload.accounting_category_2,
     accountingCategory3: payload.accounting_category_3,
     accountingCategory4: payload.accounting_category_4,
-    accountingCode: payload.accounting_code,
+    accountingCode: (0, invoicingCommonPayload_1.firstSelectableInvoicingId)([
+        payload.account?.qbo_id,
+        payload.account?.account_id,
+        payload.accounting_code,
+    ]),
     sku: payload.sku,
 });
 const mapInvoicingProductPayloadToState = (payload) => {

package/lib/esm/entity/invoicing/invoicingCommonPayload.js

@@ -1,3 +1,4 @@
+import { toAccountPayload } from '../account/accountPayload';
 export const INVOICING_DUNNING_ACTIONS = [
     'email_only',
     'email_and_retry',
@@ -133,17 +134,21 @@ export function toInvoicingQboCustomerMatchingMode(value) {
  * form wins when present; a blank id in either is treated as unset so the picker
  * shows its placeholder rather than selecting nothing.
  */
+/**
+ * The first id a picker can actually select. Callers list the QuickBooks id
+ * first: the options are keyed on it, so an internal id selects nothing even
+ * when it names the same record. Blank counts as absent, so a cleared field
+ * falls through to the next candidate rather than selecting an empty option.
+ */
+export const firstSelectableInvoicingId = (candidates) => candidates.find((candidate) => candidate != null && candidate !== '');
 function readInvoicingQboMappedAccountId(mappedAccount, legacyAccountId) {
-    // `qbo_id` first: the pickers key their options on the QuickBooks id, so an
-    // internal `account_id` would not select anything even when it is the same
-    // account. Both are read because the mapping arrives either way depending on
-    // how it was saved.
-    const candidates = [
+    // Both shapes are read: the mapping arrives either way depending on how it
+    // was saved.
+    return firstSelectableInvoicingId([
         mappedAccount?.qbo_id,
         mappedAccount?.account_id,
         legacyAccountId,
-    ];
-    return candidates.find((candidate) => candidate != null && candidate !== '');
+    ]);
 }
 /**
  * Read one account-mapping dropdown value by its config `code` (the codes in
@@ -169,11 +174,41 @@ export function getInvoicingQboAccountMappingId(accountMappings, code) {
  * Return a copy of the account mappings with the dropdown slot named by
  * `code` set to `accountId`. Unknown codes leave the mappings unchanged.
  */
+/** The object key holding the mapped account for each `*_account_id` code. */
+const INVOICING_QBO_MAPPED_ACCOUNT_KEY = {
+    default_income_account_id: 'default_income_account',
+    deposit_account_id: 'deposit_account',
+    discounts_account_id: 'discounts_account',
+    rounding_account_id: 'rounding_account',
+    write_off_account_id: 'write_off_account',
+};
+/**
+ * Expand each mapping from the id the picker submitted to the whole account, the
+ * shape the service stores. Written at the request boundary rather than in the
+ * page's draft so the UI keeps working in ids, and an id that no longer resolves
+ * is left out — a mapping the service cannot expand is worse than none.
+ */
+export const withInvoicingQboMappedAccounts = (accountMappings, accountByQboId) => {
+    if (accountMappings == null) {
+        return undefined;
+    }
+    const expanded = { ...accountMappings };
+    Object.entries(INVOICING_QBO_MAPPED_ACCOUNT_KEY).forEach(([code, objectKey]) => {
+        const accountId = getInvoicingQboAccountMappingId(accountMappings, code);
+        if (accountId == null) {
+            return;
+        }
+        const account = accountByQboId(accountId);
+        expanded[objectKey] =
+            account != null ? toAccountPayload(account) : undefined;
+        expanded[code] = undefined;
+    });
+    return expanded;
+};
 export function withInvoicingQboAccountMappingId(accountMappings, code, accountId) {
     // Both slots are written together. Setting only the bare id would leave the
     // object shape behind, and the reader prefers it — so the selection just made
-    // would read back as whatever was mapped before. The object is dropped rather
-    // than rebuilt: only the id is known here, not the name that came with it.
+    // would read back as whatever was mapped before.
     const base = accountMappings ?? {};
     switch (code) {
         case 'deposit_account_id':

package/lib/esm/entity/invoicing/product/productPayload.js

@@ -1,6 +1,7 @@
 import { toAmount } from '../../../commonStateTypes/amount';
 import { defaultCustomerCurrency } from '../../../commonStateTypes/currencyHelper';
 import { date } from '../../../zeniDayJS';
+import { firstSelectableInvoicingId } from '../invoicingCommonPayload';
 // ── Payload → State mappers (snake_case wire shape → camelCase domain shape) ──
 export const mapInvoicingPlanTierPayloadToState = (payload, currencyCode, currencySymbol) => ({
     price: toAmount(payload.price, currencyCode, currencySymbol),
@@ -10,11 +11,22 @@ export const mapInvoicingPlanTierPayloadToState = (payload, currencyCode, curren
     pricingType: payload.pricing_type,
 });
 const mapInvoicingAccountingDetailPayloadToState = (payload) => ({
-    accountingCategory1: payload.accounting_category_1,
+    // The QuickBooks id first in both, for the reason `firstSelectableInvoicingId`
+    // documents: the form's pickers are keyed on it, so reading the internal id
+    // would leave the field blank over a mapping that exists.
+    accountingCategory1: firstSelectableInvoicingId([
+        payload.accounting_class?.qbo_id,
+        payload.accounting_class?.accounting_class_id,
+        payload.accounting_category_1,
+    ]),
     accountingCategory2: payload.accounting_category_2,
     accountingCategory3: payload.accounting_category_3,
     accountingCategory4: payload.accounting_category_4,
-    accountingCode: payload.accounting_code,
+    accountingCode: firstSelectableInvoicingId([
+        payload.account?.qbo_id,
+        payload.account?.account_id,
+        payload.accounting_code,
+    ]),
     sku: payload.sku,
 });
 export const mapInvoicingProductPayloadToState = (payload) => {

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.js

@@ -1,3 +1,5 @@
+import { toAccountPayload } from '../../../entity/account/accountPayload';
+import { toClassBasePayload } from '../../../entity/class/classPayload';
 import { blankInvoicingCatalogSubFamily, isTieredCatalogPricingModel, } from './invoicingCatalogItemFormConfig';
 const CURRENCY_CODE = 'USD';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
@@ -7,20 +9,26 @@ const toProductCode = (value) => value
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-|-$/g, '');
-const buildAccountingDetail = (subFamily) => {
+const buildAccountingDetail = (subFamily, lookup) => {
     const detail = {};
     if (subFamily.sku.trim() !== '') {
         detail.sku = subFamily.sku.trim();
     }
-    if (subFamily.accountingCode.trim() !== '') {
-        detail.accounting_code = subFamily.accountingCode.trim();
+    // The account and class travel as whole objects rather than bare codes, built
+    // by the same helpers the transaction and vendor payloads use. An id that no
+    // longer resolves is dropped: sending a code the service cannot expand is how
+    // a mapping silently lands on the wrong account.
+    const account = lookup.accountByQboId(subFamily.accountingCode.trim());
+    if (account != null) {
+        detail.account = toAccountPayload(account);
     }
-    if (subFamily.accountingCategory.trim() !== '') {
-        detail.accounting_category_1 = subFamily.accountingCategory.trim();
+    const accountingClass = lookup.classByQboId(subFamily.accountingCategory.trim());
+    if (accountingClass != null) {
+        detail.accounting_class = toClassBasePayload(accountingClass);
     }
     return Object.keys(detail).length > 0 ? detail : undefined;
 };
-const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
+const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) => {
     const isAddon = localData.catalogType === 'addon';
     const tiered = isTieredCatalogPricingModel(subFamily.pricingModel);
     const name = subFamily.name.trim();
@@ -74,7 +82,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
             starting_unit: Number(tier.startingUnit) || 1,
         }));
     }
-    const accountingDetail = buildAccountingDetail(subFamily);
+    const accountingDetail = buildAccountingDetail(subFamily, lookup);
     if (accountingDetail != null) {
         payload.accounting_detail = accountingDetail;
     }
@@ -86,7 +94,7 @@ const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.
  */
-export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
+export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
     const description = trimOrUndefined(localData.description);
     const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
     const itemPayload = {
@@ -114,7 +122,7 @@ export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate)
         ? localData.subFamilies
         : [blankInvoicingCatalogSubFamily()];
     itemPayload.sub_family_details = isCreate
-        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false))
+        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
         : subFamilies.map((subFamily) => {
             const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
             const detail = {
@@ -124,6 +132,13 @@ export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate)
                 price_code: priceCode,
                 show_description_in_invoices: subFamily.showDescriptionInInvoices,
             };
+            // Edits send a narrower body than creates, but the accounting mapping
+            // is editable on this form, so leaving it out dropped the account and
+            // class the user had just picked.
+            const accountingDetail = buildAccountingDetail(subFamily, lookup);
+            if (accountingDetail != null) {
+                detail.accounting_detail = accountingDetail;
+            }
             const id = trimOrUndefined(subFamily.id);
             return id != null ? { ...detail, id } : detail;
         });

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js

@@ -6,6 +6,7 @@ import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiE
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
+import { invoicingQboAccountByQboId, invoicingQboClassByQboId, } from '../invoicingQboView/invoicingQboViewSelector';
 import { localDataToSaveInvoicingCatalogItemPayload, } from './editInvoicingCatalogItemDetailViewPayload';
 import { saveInvoicingCatalogItem, submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter((action) => submitInvoicingCatalogItemForm.match(action) ||
@@ -20,7 +21,11 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
         const viewState = state$.value.editInvoicingCatalogItemDetailViewState;
         const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
             viewState.newItemDraft;
-        data = localDataToSaveInvoicingCatalogItemPayload(localData, id == null);
+        const state = state$.value;
+        data = localDataToSaveInvoicingCatalogItemPayload(localData, id == null, {
+            accountByQboId: (qboId) => invoicingQboAccountByQboId(state, qboId),
+            classByQboId: (qboId) => invoicingQboClassByQboId(state, qboId),
+        });
     }
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null

package/lib/esm/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -37,6 +37,26 @@ export const INVOICING_INCOME_ACCOUNT_TYPES = [
     'income',
     'other_income',
 ];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+export const invoicingQboAccountByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { accounts } = getAccountList(state.accountState, state.accountListState, INVOICING_ACCOUNT_LIST_KEY);
+    return accounts.find((account) => String(account.qboId) === qboId);
+};
+/** The class behind a picker value, for the same reason as the account above. */
+export const invoicingQboClassByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { classes } = getClassList(state.classState, state.classListState);
+    return classes.find((accountingClass) => String(accountingClass.qboId) === qboId);
+};
 /**
  * Accounts and classes as the invoicing pickers need them. Both come from the
  * shared accounting-service lists, so whatever another screen already loaded

package/lib/esm/view/invoicing/settingsView/settingsViewEpics.js

@@ -1,9 +1,11 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { updateAddresses } from '../../../entity/address/addressReducer';
+import { withInvoicingQboMappedAccounts, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiError';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../responsePayload';
+import { invoicingQboAccountByQboId } from '../invoicingQboView/invoicingQboViewSelector';
 import { connectInvoicingStripe, disconnectInvoicingStripe, fetchInvoicingSettings, invoicingStripeConnectionFailure, saveInvoicingSettings, saveInvoicingSettingsFailure, saveInvoicingSettingsSuccess, updateInvoicingSettings, updateInvoicingSettingsFailure, updateInvoicingStripeConnection, } from './settingsViewReducer';
 export const fetchInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingSettings.match), switchMap(() => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
@@ -57,9 +59,22 @@ export const disconnectInvoicingStripeEpic = (actions$, _state$, zeniAPI) => act
     }), catchError((error) => of(invoicingStripeConnectionFailure(createZeniAPIStatus('Unexpected Error', 'Stripe disconnect REST API call errored out ' +
         JSON.stringify(error))))));
 }));
-export const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(saveInvoicingSettings.match), mergeMap((action) => {
+export const saveInvoicingSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveInvoicingSettings.match), mergeMap((action) => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     const { settings, snackbarSection } = action.payload;
+    // The QBO page edits mappings as picker ids; the service stores whole
+    // accounts. Expanded here, at the request boundary, so the page does not
+    // have to hold entities it only needs in order to save.
+    const qboSettings = settings.qbo;
+    const body = qboSettings?.account_mappings != null
+        ? {
+            ...settings,
+            qbo: {
+                ...qboSettings,
+                account_mappings: withInvoicingQboMappedAccounts(qboSettings.account_mappings, (qboId) => invoicingQboAccountByQboId(state$.value, qboId)),
+            },
+        }
+        : settings;
     /** `status` surfaces the platform's error text; omit it to keep the generic copy. */
     const snackbar = (messageText, status) => snackbarSection == null
         ? []
@@ -72,7 +87,7 @@ export const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions
             }),
         ];
     return zeniAPI
-        .putAndGetJSON(apiUrl, { ...settings })
+        .putAndGetJSON(apiUrl, { ...body })
         .pipe(switchMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return from([

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.d.ts

@@ -1,9 +1,20 @@
+import { AccountBase } from '../../../entity/account/accountState';
+import { ClassBase } from '../../../entity/class/classState';
 import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
 export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingPlanPayload>;
+/**
+ * Resolves the QuickBooks ids the pickers submit back to the entities they name.
+ * The payload carries the whole account and class, so the ids alone are not
+ * enough; `saveInvoicingCatalogItemEpic` builds this from the shared lists.
+ */
+export interface InvoicingCatalogAccountingLookup {
+    accountByQboId: (qboId: string) => AccountBase | undefined;
+    classByQboId: (qboId: string) => ClassBase | undefined;
+}
 /**
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.
  */
-export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean) => Record<string, unknown>;
+export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown>;

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localDataToSaveInvoicingCatalogItemPayload = void 0;
+const accountPayload_1 = require("../../../entity/account/accountPayload");
+const classPayload_1 = require("../../../entity/class/classPayload");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
 const CURRENCY_CODE = 'USD';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
@@ -10,20 +12,26 @@ const toProductCode = (value) => value
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-|-$/g, '');
-const buildAccountingDetail = (subFamily) => {
+const buildAccountingDetail = (subFamily, lookup) => {
     const detail = {};
     if (subFamily.sku.trim() !== '') {
         detail.sku = subFamily.sku.trim();
     }
-    if (subFamily.accountingCode.trim() !== '') {
-        detail.accounting_code = subFamily.accountingCode.trim();
+    // The account and class travel as whole objects rather than bare codes, built
+    // by the same helpers the transaction and vendor payloads use. An id that no
+    // longer resolves is dropped: sending a code the service cannot expand is how
+    // a mapping silently lands on the wrong account.
+    const account = lookup.accountByQboId(subFamily.accountingCode.trim());
+    if (account != null) {
+        detail.account = (0, accountPayload_1.toAccountPayload)(account);
     }
-    if (subFamily.accountingCategory.trim() !== '') {
-        detail.accounting_category_1 = subFamily.accountingCategory.trim();
+    const accountingClass = lookup.classByQboId(subFamily.accountingCategory.trim());
+    if (accountingClass != null) {
+        detail.accounting_class = (0, classPayload_1.toClassBasePayload)(accountingClass);
     }
     return Object.keys(detail).length > 0 ? detail : undefined;
 };
-const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
+const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) => {
     const isAddon = localData.catalogType === 'addon';
     const tiered = (0, invoicingCatalogItemFormConfig_1.isTieredCatalogPricingModel)(subFamily.pricingModel);
     const name = subFamily.name.trim();
@@ -77,7 +85,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
             starting_unit: Number(tier.startingUnit) || 1,
         }));
     }
-    const accountingDetail = buildAccountingDetail(subFamily);
+    const accountingDetail = buildAccountingDetail(subFamily, lookup);
     if (accountingDetail != null) {
         payload.accounting_detail = accountingDetail;
     }
@@ -89,7 +97,7 @@ const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.
  */
-const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
+const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
     const description = trimOrUndefined(localData.description);
     const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
     const itemPayload = {
@@ -117,7 +125,7 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
         ? localData.subFamilies
         : [(0, invoicingCatalogItemFormConfig_1.blankInvoicingCatalogSubFamily)()];
     itemPayload.sub_family_details = isCreate
-        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false))
+        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
         : subFamilies.map((subFamily) => {
             const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
             const detail = {
@@ -127,6 +135,13 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
                 price_code: priceCode,
                 show_description_in_invoices: subFamily.showDescriptionInInvoices,
             };
+            // Edits send a narrower body than creates, but the accounting mapping
+            // is editable on this form, so leaving it out dropped the account and
+            // class the user had just picked.
+            const accountingDetail = buildAccountingDetail(subFamily, lookup);
+            if (accountingDetail != null) {
+                detail.accounting_detail = accountingDetail;
+            }
             const id = trimOrUndefined(subFamily.id);
             return id != null ? { ...detail, id } : detail;
         });

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js

@@ -9,6 +9,7 @@ const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListView/invoicingCatalogListViewReducer");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const editInvoicingCatalogItemDetailViewPayload_1 = require("./editInvoicingCatalogItemDetailViewPayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemForm.match(action) ||
@@ -23,7 +24,11 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
         const viewState = state$.value.editInvoicingCatalogItemDetailViewState;
         const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
             viewState.newItemDraft;
-        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null);
+        const state = state$.value;
+        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, {
+            accountByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, qboId),
+            classByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboClassByQboId)(state, qboId),
+        });
     }
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.d.ts

@@ -1,7 +1,8 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
-import { AccountType } from '../../../entity/account/accountState';
+import { AccountBase, AccountType } from '../../../entity/account/accountState';
+import { ClassBase } from '../../../entity/class/classState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
 export declare const INVOICING_ACCOUNT_LIST_KEY: "accountList";
@@ -20,6 +21,14 @@ export declare const getInvoicingQboConnectionFetchState: (state: RootState) =>
  * "income accounts" rather than repeating the accounting service's vocabulary.
  */
 export declare const INVOICING_INCOME_ACCOUNT_TYPES: readonly AccountType[];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+export declare const invoicingQboAccountByQboId: (state: RootState, qboId: string | undefined) => AccountBase | undefined;
+/** The class behind a picker value, for the same reason as the account above. */
+export declare const invoicingQboClassByQboId: (state: RootState, qboId: string | undefined) => ClassBase | undefined;
 /** An account or class as the invoicing pickers render and submit it. */
 export interface InvoicingAccountingOption {
     id: string;

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 // The shared bucket, fetched with the same arguments as the other consumers so
@@ -43,6 +43,28 @@ exports.INVOICING_INCOME_ACCOUNT_TYPES = [
     'income',
     'other_income',
 ];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+const invoicingQboAccountByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
+    return accounts.find((account) => String(account.qboId) === qboId);
+};
+exports.invoicingQboAccountByQboId = invoicingQboAccountByQboId;
+/** The class behind a picker value, for the same reason as the account above. */
+const invoicingQboClassByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { classes } = (0, classListSelector_1.getClassList)(state.classState, state.classListState);
+    return classes.find((accountingClass) => String(accountingClass.qboId) === qboId);
+};
+exports.invoicingQboClassByQboId = invoicingQboClassByQboId;
 /**
  * Accounts and classes as the invoicing pickers need them. Both come from the
  * shared accounting-service lists, so whatever another screen already loaded

package/lib/view/invoicing/settingsView/settingsViewEpics.d.ts

@@ -9,4 +9,4 @@ export type ActionType = ReturnType<typeof fetchInvoicingSettings> | ReturnType<
 export declare const fetchInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const connectInvoicingStripeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const disconnectInvoicingStripeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
-export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/invoicing/settingsView/settingsViewEpics.js

@@ -4,9 +4,11 @@ exports.saveInvoicingSettingsEpic = exports.disconnectInvoicingStripeEpic = expo
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../../entity/address/addressReducer");
+const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const settingsViewReducer_1 = require("./settingsViewReducer");
 const fetchInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchInvoicingSettings.match), (0, operators_1.switchMap)(() => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
@@ -63,9 +65,22 @@ const disconnectInvoicingStripeEpic = (actions$, _state$, zeniAPI) => actions$.p
         JSON.stringify(error))))));
 }));
 exports.disconnectInvoicingStripeEpic = disconnectInvoicingStripeEpic;
-const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveInvoicingSettings.match), (0, operators_1.mergeMap)((action) => {
+const saveInvoicingSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveInvoicingSettings.match), (0, operators_1.mergeMap)((action) => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     const { settings, snackbarSection } = action.payload;
+    // The QBO page edits mappings as picker ids; the service stores whole
+    // accounts. Expanded here, at the request boundary, so the page does not
+    // have to hold entities it only needs in order to save.
+    const qboSettings = settings.qbo;
+    const body = qboSettings?.account_mappings != null
+        ? {
+            ...settings,
+            qbo: {
+                ...qboSettings,
+                account_mappings: (0, invoicingCommonPayload_1.withInvoicingQboMappedAccounts)(qboSettings.account_mappings, (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state$.value, qboId)),
+            },
+        }
+        : settings;
     /** `status` surfaces the platform's error text; omit it to keep the generic copy. */
     const snackbar = (messageText, status) => snackbarSection == null
         ? []
@@ -78,7 +93,7 @@ const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(
             }),
         ];
     return zeniAPI
-        .putAndGetJSON(apiUrl, { ...settings })
+        .putAndGetJSON(apiUrl, { ...body })
         .pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.from)([

package/package.json

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