@zeniai/client-epic-state 5.2.42 → 5.2.44-betaAK0

package/lib/entity/invoicing/coupon/couponPayload.d.ts

@@ -1,3 +1,4 @@
+import { AccountBasePayload } from '../../account/accountPayload';
 import { InvoicingCoupon } from './couponState';
 import { InvoicingCouponApplyOn, InvoicingCouponDurationType, InvoicingCouponPeriodUnit, InvoicingCouponStatus, InvoicingDiscountType } from './couponTypes';
 export interface InvoicingCouponPayload {
@@ -11,6 +12,13 @@ export interface InvoicingCouponPayload {
     discount_percentage?: number;
     discount_quantity?: number;
     discount_type?: InvoicingDiscountType;
+    /**
+     * The income account this coupon's discount line posts to. Stored as an
+     * `{account_id}` and hydrated on read, the same shape the QBO settings
+     * mappings use; `null` when the coupon has none and the settings default
+     * applies instead.
+     */
+    discounts_account?: Partial<AccountBasePayload> | null;
     duration_type?: InvoicingCouponDurationType;
     invoice_name?: string;
     invoice_notes?: string;

package/lib/entity/invoicing/coupon/couponPayload.js

@@ -4,6 +4,7 @@ exports.mapInvoicingCouponPayloadToState = void 0;
 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 mapInvoicingCouponPayloadToState = (payload) => {
     const currencyCode = payload.currency_code ?? currencyHelper_1.defaultCustomerCurrency.currencyCode;
@@ -20,6 +21,13 @@ const mapInvoicingCouponPayloadToState = (payload) => {
         discountPercentage: payload.discount_percentage,
         discountQuantity: payload.discount_quantity,
         discountType: payload.discount_type,
+        // The QuickBooks id first, for the reason `firstSelectableInvoicingId`
+        // documents: the form's picker is keyed on it, so reading the internal id
+        // would leave the field blank over an account that is set.
+        discountsAccountId: (0, invoicingCommonPayload_1.firstSelectableInvoicingId)([
+            payload.discounts_account?.qbo_id,
+            payload.discounts_account?.account_id,
+        ]),
         durationType: payload.duration_type,
         invoiceName: payload.invoice_name,
         invoiceNotes: payload.invoice_notes,

package/lib/entity/invoicing/coupon/couponState.d.ts

@@ -11,6 +11,12 @@ export interface InvoicingCoupon {
     discountAmount?: Amount;
     discountPercentage?: number;
     discountQuantity?: number;
+    /**
+     * The income account for this coupon's discount line, as the id its picker
+     * submits. Absent when the coupon has none, which is what makes the QBO
+     * settings discounts account apply instead.
+     */
+    discountsAccountId?: ID;
     discountType?: InvoicingDiscountType;
     durationType?: InvoicingCouponDurationType;
     invoiceName?: string;

package/lib/esm/entity/invoicing/coupon/couponPayload.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 mapInvoicingCouponPayloadToState = (payload) => {
     const currencyCode = payload.currency_code ?? defaultCustomerCurrency.currencyCode;
@@ -17,6 +18,13 @@ export const mapInvoicingCouponPayloadToState = (payload) => {
         discountPercentage: payload.discount_percentage,
         discountQuantity: payload.discount_quantity,
         discountType: payload.discount_type,
+        // The QuickBooks id first, for the reason `firstSelectableInvoicingId`
+        // documents: the form's picker is keyed on it, so reading the internal id
+        // would leave the field blank over an account that is set.
+        discountsAccountId: firstSelectableInvoicingId([
+            payload.discounts_account?.qbo_id,
+            payload.discounts_account?.account_id,
+        ]),
         durationType: payload.duration_type,
         invoiceName: payload.invoice_name,
         invoiceNotes: payload.invoice_notes,

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

@@ -3,7 +3,6 @@ import { toClassBasePayload } from '../../../entity/class/classPayload';
 import { blankInvoicingCatalogSubFamily, isTieredCatalogPricingModel, } from './invoicingCatalogItemFormHelper';
 const CURRENCY_CODE = 'USD';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
-const trimOrNull = (value) => value.trim() !== '' ? value.trim() : null;
 const toProductCode = (value) => value
     .trim()
     .toLowerCase()
@@ -91,13 +90,24 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) =
 /** `unit` is the item's unit of measure, not a currency; `CURRENCY_CODE` above prices Price points. */
 const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
 /**
- * Build the parent catalog-item request body from the form draft. Creates omit
- * both parent and price point IDs; edits retain returned price point IDs.
+ * Build the parent catalog-item request body from the form draft. Every field
+ * the form holds is sent, so a value cleared on the form is cleared on the
+ * item: the service reads an absent key as "leave it alone", which is why
+ * `description` travels as an empty string and `applicable_items` as an empty
+ * list rather than being dropped. Fields the form does not collect
+ * (`external_name`, `item_family_id`, `metadata`, …) stay off the body so an
+ * edit cannot overwrite them with a value nobody chose.
  */
 export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
-    const description = trimOrUndefined(localData.description);
     const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
     const itemPayload = {
+        // `applicable_items` only means anything while the item is restricted;
+        // sending the empty list otherwise is what clears a restriction that was
+        // just lifted.
+        applicable_items: localData.itemApplicability === 'restricted'
+            ? localData.applicableItems
+            : [],
+        description: trimOrUndefined(localData.description) ?? '',
         enabled_for_checkout: true,
         enabled_in_portal: true,
         is_giftable: false,
@@ -107,41 +117,39 @@ export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate,
         name: localData.name.trim(),
         product_code: productCode,
         type: localData.catalogType,
+        // The form no longer collects a unit; an item that already has one keeps it.
+        unit: trimOrUndefined(localData.unit) ?? DEFAULT_CATALOG_ITEM_UNIT,
     };
-    if (description != null) {
-        itemPayload.description = description;
-    }
-    // The form no longer collects a unit; an item that already has one keeps it.
-    itemPayload.unit =
-        trimOrUndefined(localData.unit) ?? DEFAULT_CATALOG_ITEM_UNIT;
-    if (localData.itemApplicability === 'restricted' &&
-        localData.applicableItems.length > 0) {
-        itemPayload.applicable_items = localData.applicableItems;
+    // The external id is assigned by the billing service and shown read-only, so
+    // it is echoed back only when the item already has one: sending the blank a
+    // create starts with would clear an id assigned in the meantime.
+    const externalId = trimOrUndefined(localData.externalId);
+    if (externalId != null) {
+        itemPayload.external_id = externalId;
     }
     const subFamilies = localData.subFamilies.length > 0
         ? localData.subFamilies
         : [blankInvoicingCatalogSubFamily()];
-    itemPayload.sub_family_details = isCreate
+    itemPayload.sub_families = isCreate
         ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
         : subFamilies.map((subFamily) => {
-            const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
-            const detail = {
-                description: trimOrNull(subFamily.description),
-                invoice_notes: trimOrNull(subFamily.invoiceNotes),
-                name: subFamily.name.trim(),
-                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. `null` rather than omitted when it is
-            // empty: an absent key on an update reads as "leave it alone", which
-            // would make a cleared mapping impossible to save — the same reason
-            // `description` and `invoice_notes` go through `trimOrNull`.
-            detail.accounting_detail =
-                buildAccountingDetail(subFamily, lookup) ?? null;
-            const id = trimOrUndefined(subFamily.id);
-            return id != null ? { ...detail, id } : detail;
+            // Edits send the same body a create does. The narrower hand-built one
+            // this replaces had to be kept in step by hand and was not: it dropped
+            // `accounting_detail` once, and `billing_cycles`, `price`,
+            // `pricing_model`, `period`, the trial fields, `proration_type`,
+            // `free_quantity`, `is_taxable` and `tiers` were never added at all, so
+            // editing any of them looked saved and changed nothing.
+            const detail = buildSubFamilyPayload(localData, subFamily, true, lookup);
+            // `null` rather than omitted when empty: an absent key on an update
+            // reads as "leave it alone", which would make a cleared mapping
+            // impossible to save — the same reason `description` and
+            // `invoice_notes` are cleared rather than dropped above.
+            detail.accounting_detail = detail.accounting_detail ?? null;
+            // A price point added on this form has no id yet, and travels with a
+            // blank one. The update endpoint reads that as "create this one", so it
+            // lands in the same request as the edits around it rather than a second
+            // call that could fail on its own.
+            return { ...detail, id: subFamily.id.trim() };
         });
     return itemPayload;
 };

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewPayload.js

@@ -1,9 +1,13 @@
+import { toAccountPayload } from '../../../entity/account/accountPayload';
 /**
  * Build the create/update discount request body from the form draft (snake_case
  * matching the `/discounts` schema). On create the coupon id is part of the
  * body; on edit it is the URL param, so it is omitted here.
+ *
+ * `accountByQboId` resolves the discounts-account picker back to the account
+ * record the body carries, the same way the catalog and QBO settings bodies do.
  */
-export const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
+export const localDataToSaveInvoicingCouponPayload = (localData, isCreate, accountByQboId) => {
     const data = {
         apply_on: localData.applyOn,
         discount_type: localData.discountType,
@@ -54,5 +58,16 @@ export const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
     if (invoiceNotes !== '') {
         data.invoice_notes = invoiceNotes;
     }
+    // Omitted rather than sent as `null` when there is none: the service reads a
+    // blank discounts account as "not given" and leaves what it has, which is
+    // what keeps a form that never showed the picker — QBO disconnected — from
+    // clearing an account set elsewhere.
+    const discountsAccountId = localData.discountsAccountId.trim();
+    const discountsAccount = discountsAccountId !== ''
+        ? accountByQboId?.(discountsAccountId)
+        : undefined;
+    if (discountsAccount != null) {
+        data.discounts_account = toAccountPayload(discountsAccount);
+    }
     return data;
 };

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.js

@@ -2,7 +2,9 @@ import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState'
 import { getInvoicingCouponById } from '../../../entity/invoicing/coupon/couponSelector';
 import { toInvoicingFormOption, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
-import { initialInvoicingCouponFormLocalData, } from './editInvoicingCouponDetailViewState';
+import { getInvoicingQboView, invoicingAccountsForQboAccountTypes, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
+import { getInvoicingSettings } from '../settingsView/settingsViewSelector';
+import { initialInvoicingCouponFormLocalData, invoicingCouponDiscountsAccountIdForCreate, } from './editInvoicingCouponDetailViewState';
 /**
  * Bundled view for the discount create/edit form: the save fetch state/error,
  * the id of the coupon last saved, and — when a `couponId` is passed (edit
@@ -45,6 +47,12 @@ export const getEditInvoicingCouponDetailViewState = (state, couponId) => {
         version: 1.0,
     };
 };
+/**
+ * The account types the discounts slot falls back to when the config has no
+ * `discounts_account` kind. A QuickBooks discount line posts to an income
+ * account; offering every account instead would let a save be rejected.
+ */
+const DEFAULT_DISCOUNTS_ACCOUNT_TYPES = 'Income';
 /**
  * Bundled view for the discount form screen: the edit view (save state + the
  * coupon to prefill in edit mode), the draft `localData` (seeded from the
@@ -60,14 +68,32 @@ export const getInvoicingCouponFormView = (state, couponId) => {
     const localData = couponId != null
         ? (editDraftById[couponId] ?? initialInvoicingCouponFormLocalData)
         : newCouponDraft;
-    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = getInvoicingConfigView(state);
+    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, qboAccountMappingKindOptions, } = getInvoicingConfigView(state);
+    const isQboConnected = isInvoicingQboConnected(state);
+    const qboView = isQboConnected ? getInvoicingQboView(state) : undefined;
+    // The account types the discounts slot accepts come from the same config the
+    // QBO settings page reads, so the two pickers offer the same accounts and
+    // widening the slot stays a config change.
+    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => kindOption.code === 'discounts_account')?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
     return {
         ...base,
         applyOnOptions: discountApplyOnOptions.map(toInvoicingFormOption),
         discountTypeOptions: discountTypeOptions.map(toInvoicingFormOption),
         durationTypeOptions: discountDurationTypeOptions.map(toInvoicingFormOption),
-        localData,
+        isQboConnected,
+        isQboPickerDataLoading: isInvoicingAccountingPickerDataLoading(state),
+        localData: couponId != null
+            ? localData
+            : {
+                ...localData,
+                // Seeded from settings only while the draft has none of its own, so
+                // the picker shows the account a create would post against before
+                // the user touches it, and stops seeding the moment they pick.
+                discountsAccountId: invoicingCouponDiscountsAccountIdForCreate(localData.discountsAccountId, getInvoicingSettings(state)?.qbo?.account_mappings),
+            },
         mode: couponId != null ? 'edit' : 'create',
         periodUnitOptions: billingPeriodUnitOptions.map(toInvoicingFormOption),
+        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],
+        qboIncomeAccountIds: invoicingAccountsForQboAccountTypes(qboView?.accounts ?? [], discountsAccountTypes).map((account) => account.id),
     };
 };

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewState.js

@@ -1,9 +1,11 @@
+import { getInvoicingQboAccountMappingId, } from '../../../entity/invoicing/invoicingCommonPayload';
 export const initialInvoicingCouponFormLocalData = {
     applyOn: 'invoice_amount',
     couponCode: '',
     couponId: '',
     discountPercentage: '',
     discountQuantity: '',
+    discountsAccountId: '',
     discountType: 'percentage',
     durationType: 'one_time',
     invoiceName: '',
@@ -29,6 +31,10 @@ export const entityToInvoicingCouponFormLocalData = (coupon) => {
             ? String(coupon.discountPercentage)
             : '',
         discountQuantity: coupon.discountQuantity != null ? String(coupon.discountQuantity) : '',
+        // The coupon's own account, never the current setting: an edit shows what
+        // this coupon will post against, which is what was stored when it was
+        // saved even if the settings default has moved since.
+        discountsAccountId: coupon.discountsAccountId ?? '',
         discountType: coupon.discountType ?? 'percentage',
         durationType: coupon.durationType ?? 'one_time',
         invoiceName: coupon.invoiceName ?? '',
@@ -41,3 +47,16 @@ export const entityToInvoicingCouponFormLocalData = (coupon) => {
         validTill: coupon.validTill != null ? coupon.validTill.format('YYYY-MM-DD') : '',
     };
 };
+/**
+ * The discounts account a create starts from: the draft's own pick, or the QBO
+ * settings discounts account while the user has not made one. Read by both the
+ * form view and the save, so what the picker shows is what the request sends —
+ * a create that leaves the picker alone still stores the settings account on
+ * the coupon rather than relying on the setting staying put.
+ *
+ * Create only. An edit shows the coupon's stored account, so a coupon saved
+ * without one keeps showing none.
+ */
+export const invoicingCouponDiscountsAccountIdForCreate = (discountsAccountId, accountMappings) => discountsAccountId.trim() !== ''
+    ? discountsAccountId.trim()
+    : (getInvoicingQboAccountMappingId(accountMappings ?? undefined, 'discounts_account') ?? '');

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/saveInvoicingCouponEpic.js

@@ -5,8 +5,11 @@ import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiE
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { addInvoicingCouponToList } from '../couponView/couponViewReducer';
+import { invoicingQboAccountByQboId } from '../invoicingQboView/invoicingQboViewSelector';
+import { getInvoicingSettings } from '../settingsView/settingsViewSelector';
 import { localDataToSaveInvoicingCouponPayload, } from './editInvoicingCouponDetailViewPayload';
 import { saveInvoicingCoupon, submitInvoicingCouponForm, submitInvoicingCouponFormFailure, submitInvoicingCouponFormSuccess, } from './editInvoicingCouponDetailViewReducer';
+import { invoicingCouponDiscountsAccountIdForCreate } from './editInvoicingCouponDetailViewState';
 export const saveInvoicingCouponEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter((action) => submitInvoicingCouponForm.match(action) ||
     saveInvoicingCoupon.match(action)), mergeMap((action) => {
     const { id } = action.payload;
@@ -14,11 +17,22 @@ export const saveInvoicingCouponEpic = (actions$, state$, zeniAPI) => actions$.p
     const data = saveInvoicingCoupon.match(action)
         ? action.payload.data
         : (() => {
-            const viewState = state$.value.editInvoicingCouponDetailViewState;
-            const localData = (id != null
+            const state = state$.value;
+            const viewState = state.editInvoicingCouponDetailViewState;
+            const draft = (id != null
                 ? viewState.editDraftById[id]
                 : viewState.newCouponDraft) ?? viewState.newCouponDraft;
-            return localDataToSaveInvoicingCouponPayload(localData, id == null);
+            // The create default is resolved here as well as in the form view,
+            // so a create that never touched the picker still persists the
+            // settings account on the coupon instead of leaving it to whatever
+            // the setting says the day an invoice is raised.
+            const localData = id == null
+                ? {
+                    ...draft,
+                    discountsAccountId: invoicingCouponDiscountsAccountIdForCreate(draft.discountsAccountId, getInvoicingSettings(state)?.qbo?.account_mappings),
+                }
+                : draft;
+            return localDataToSaveInvoicingCouponPayload(localData, id == null, (qboId) => invoicingQboAccountByQboId(state, qboId));
         })();
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null

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

@@ -1,10 +1,30 @@
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
-import { InvoicingProductPayload } from '../../../entity/invoicing/product/productPayload';
+import { InvoicingAccountingDetailPayload, InvoicingProductPayload } from '../../../entity/invoicing/product/productPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
 export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingPlanPayload>;
+/**
+ * The price-point half of a save body. `InvoicingProductPayload` is the shape
+ * the service returns; a save differs in two ways: a field is cleared by
+ * sending an explicit `null` (an absent key reads as "leave it alone"), and a
+ * price point the form has only just added carries a blank `id`, which the
+ * update endpoint reads as "create this one".
+ */
+export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingProductPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
+    accounting_detail?: InvoicingAccountingDetailPayload | null;
+    description?: string | null;
+    invoice_notes?: string | null;
+};
+/**
+ * The catalog-item save body: the item the service returns, minus the fields it
+ * assigns itself. Price points keep the `sub_families` name they are read back
+ * under, and differ only in allowing the cleared and blank-id forms above.
+ */
+export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingPlanPayload>, 'sub_families'> & {
+    sub_families?: InvoicingCatalogSubFamilySavePayload[];
+};
 /**
  * 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
@@ -20,12 +40,17 @@ export interface InvoicingCatalogAccountingFields {
     accountingCode: string;
     sku: string;
 }
-export declare const buildAccountingDetail: (subFamily: InvoicingCatalogAccountingFields, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown> | undefined;
+export declare const buildAccountingDetail: (subFamily: InvoicingCatalogAccountingFields, lookup: InvoicingCatalogAccountingLookup) => InvoicingAccountingDetailPayload | undefined;
 /**
- * Build the parent catalog-item request body from the form draft. Creates omit
- * both parent and price point IDs; edits retain returned price point IDs.
+ * Build the parent catalog-item request body from the form draft. Every field
+ * the form holds is sent, so a value cleared on the form is cleared on the
+ * item: the service reads an absent key as "leave it alone", which is why
+ * `description` travels as an empty string and `applicable_items` as an empty
+ * list rather than being dropped. Fields the form does not collect
+ * (`external_name`, `item_family_id`, `metadata`, …) stay off the body so an
+ * edit cannot overwrite them with a value nobody chose.
  */
-export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown>;
+export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean, lookup: InvoicingCatalogAccountingLookup) => InvoicingCatalogItemSavePayload;
 export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingPlanPayload>;
 export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingProductPayload>;
 export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingPlanPayload>;

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

@@ -6,7 +6,6 @@ const classPayload_1 = require("../../../entity/class/classPayload");
 const invoicingCatalogItemFormHelper_1 = require("./invoicingCatalogItemFormHelper");
 const CURRENCY_CODE = 'USD';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
-const trimOrNull = (value) => value.trim() !== '' ? value.trim() : null;
 const toProductCode = (value) => value
     .trim()
     .toLowerCase()
@@ -95,13 +94,24 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) =
 /** `unit` is the item's unit of measure, not a currency; `CURRENCY_CODE` above prices Price points. */
 const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
 /**
- * Build the parent catalog-item request body from the form draft. Creates omit
- * both parent and price point IDs; edits retain returned price point IDs.
+ * Build the parent catalog-item request body from the form draft. Every field
+ * the form holds is sent, so a value cleared on the form is cleared on the
+ * item: the service reads an absent key as "leave it alone", which is why
+ * `description` travels as an empty string and `applicable_items` as an empty
+ * list rather than being dropped. Fields the form does not collect
+ * (`external_name`, `item_family_id`, `metadata`, …) stay off the body so an
+ * edit cannot overwrite them with a value nobody chose.
  */
 const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
-    const description = trimOrUndefined(localData.description);
     const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
     const itemPayload = {
+        // `applicable_items` only means anything while the item is restricted;
+        // sending the empty list otherwise is what clears a restriction that was
+        // just lifted.
+        applicable_items: localData.itemApplicability === 'restricted'
+            ? localData.applicableItems
+            : [],
+        description: trimOrUndefined(localData.description) ?? '',
         enabled_for_checkout: true,
         enabled_in_portal: true,
         is_giftable: false,
@@ -111,41 +121,39 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup)
         name: localData.name.trim(),
         product_code: productCode,
         type: localData.catalogType,
+        // The form no longer collects a unit; an item that already has one keeps it.
+        unit: trimOrUndefined(localData.unit) ?? DEFAULT_CATALOG_ITEM_UNIT,
     };
-    if (description != null) {
-        itemPayload.description = description;
-    }
-    // The form no longer collects a unit; an item that already has one keeps it.
-    itemPayload.unit =
-        trimOrUndefined(localData.unit) ?? DEFAULT_CATALOG_ITEM_UNIT;
-    if (localData.itemApplicability === 'restricted' &&
-        localData.applicableItems.length > 0) {
-        itemPayload.applicable_items = localData.applicableItems;
+    // The external id is assigned by the billing service and shown read-only, so
+    // it is echoed back only when the item already has one: sending the blank a
+    // create starts with would clear an id assigned in the meantime.
+    const externalId = trimOrUndefined(localData.externalId);
+    if (externalId != null) {
+        itemPayload.external_id = externalId;
     }
     const subFamilies = localData.subFamilies.length > 0
         ? localData.subFamilies
         : [(0, invoicingCatalogItemFormHelper_1.blankInvoicingCatalogSubFamily)()];
-    itemPayload.sub_family_details = isCreate
+    itemPayload.sub_families = isCreate
         ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
         : subFamilies.map((subFamily) => {
-            const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
-            const detail = {
-                description: trimOrNull(subFamily.description),
-                invoice_notes: trimOrNull(subFamily.invoiceNotes),
-                name: subFamily.name.trim(),
-                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. `null` rather than omitted when it is
-            // empty: an absent key on an update reads as "leave it alone", which
-            // would make a cleared mapping impossible to save — the same reason
-            // `description` and `invoice_notes` go through `trimOrNull`.
-            detail.accounting_detail =
-                (0, exports.buildAccountingDetail)(subFamily, lookup) ?? null;
-            const id = trimOrUndefined(subFamily.id);
-            return id != null ? { ...detail, id } : detail;
+            // Edits send the same body a create does. The narrower hand-built one
+            // this replaces had to be kept in step by hand and was not: it dropped
+            // `accounting_detail` once, and `billing_cycles`, `price`,
+            // `pricing_model`, `period`, the trial fields, `proration_type`,
+            // `free_quantity`, `is_taxable` and `tiers` were never added at all, so
+            // editing any of them looked saved and changed nothing.
+            const detail = buildSubFamilyPayload(localData, subFamily, true, lookup);
+            // `null` rather than omitted when empty: an absent key on an update
+            // reads as "leave it alone", which would make a cleared mapping
+            // impossible to save — the same reason `description` and
+            // `invoice_notes` are cleared rather than dropped above.
+            detail.accounting_detail = detail.accounting_detail ?? null;
+            // A price point added on this form has no id yet, and travels with a
+            // blank one. The update endpoint reads that as "create this one", so it
+            // lands in the same request as the edits around it rather than a second
+            // call that could fail on its own.
+            return { ...detail, id: subFamily.id.trim() };
         });
     return itemPayload;
 };

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewPayload.d.ts

@@ -1,3 +1,4 @@
+import { AccountBase } from '../../../entity/account/accountState';
 import { InvoicingCouponPayload } from '../../../entity/invoicing/coupon/couponPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { InvoicingCouponFormLocalData } from './editInvoicingCouponDetailViewState';
@@ -6,7 +7,10 @@ export type InvoicingCouponWriteResponse = ZeniAPIResponse<InvoicingCouponPayloa
  * Build the create/update discount request body from the form draft (snake_case
  * matching the `/discounts` schema). On create the coupon id is part of the
  * body; on edit it is the URL param, so it is omitted here.
+ *
+ * `accountByQboId` resolves the discounts-account picker back to the account
+ * record the body carries, the same way the catalog and QBO settings bodies do.
  */
-export declare const localDataToSaveInvoicingCouponPayload: (localData: InvoicingCouponFormLocalData, isCreate: boolean) => Record<string, unknown>;
+export declare const localDataToSaveInvoicingCouponPayload: (localData: InvoicingCouponFormLocalData, isCreate: boolean, accountByQboId?: (qboId: string) => AccountBase | undefined) => Record<string, unknown>;
 export type RunInvoicingDiscountActionResponse = ZeniAPIResponse<InvoicingCouponPayload>;
 export type InvoicingCouponDetailResponse = ZeniAPIResponse<InvoicingCouponPayload>;

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewPayload.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localDataToSaveInvoicingCouponPayload = void 0;
+const accountPayload_1 = require("../../../entity/account/accountPayload");
 /**
  * Build the create/update discount request body from the form draft (snake_case
  * matching the `/discounts` schema). On create the coupon id is part of the
  * body; on edit it is the URL param, so it is omitted here.
+ *
+ * `accountByQboId` resolves the discounts-account picker back to the account
+ * record the body carries, the same way the catalog and QBO settings bodies do.
  */
-const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
+const localDataToSaveInvoicingCouponPayload = (localData, isCreate, accountByQboId) => {
     const data = {
         apply_on: localData.applyOn,
         discount_type: localData.discountType,
@@ -57,6 +61,17 @@ const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
     if (invoiceNotes !== '') {
         data.invoice_notes = invoiceNotes;
     }
+    // Omitted rather than sent as `null` when there is none: the service reads a
+    // blank discounts account as "not given" and leaves what it has, which is
+    // what keeps a form that never showed the picker — QBO disconnected — from
+    // clearing an account set elsewhere.
+    const discountsAccountId = localData.discountsAccountId.trim();
+    const discountsAccount = discountsAccountId !== ''
+        ? accountByQboId?.(discountsAccountId)
+        : undefined;
+    if (discountsAccount != null) {
+        data.discounts_account = (0, accountPayload_1.toAccountPayload)(discountsAccount);
+    }
     return data;
 };
 exports.localDataToSaveInvoicingCouponPayload = localDataToSaveInvoicingCouponPayload;

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.d.ts

@@ -1,3 +1,4 @@
+import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { FetchState, FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { InvoicingCoupon } from '../../../entity/invoicing/coupon/couponState';
@@ -42,9 +43,31 @@ export interface InvoicingCouponFormView extends EditInvoicingCouponDetailView {
      * Folded in here so the screen never reaches for the config view itself.
      */
     fieldHelp: InvoicingFieldHelpByCode;
+    /**
+     * False hides the discounts-account picker outright: with no QuickBooks
+     * connection there are no accounts to offer, and a coupon saves fine without
+     * one.
+     */
+    isQboConnected: boolean;
+    /**
+     * True while the accounting lists are still loading, so the discounts-account
+     * picker can show as busy rather than as an empty list.
+     */
+    isQboPickerDataLoading: boolean;
     localData: InvoicingCouponFormLocalData;
     mode: 'create' | 'edit';
     periodUnitOptions: InvoicingFormOption[];
+    /**
+     * The account tree the discounts-account picker renders, and the QuickBooks
+     * ids within it the discounts slot accepts. Two values rather than a filtered
+     * tree: the picker groups by parent, and dropping a parent that is not itself
+     * an income account would take its income children with it.
+     *
+     * Empty until QBO is connected — the form must not offer a mapping that
+     * cannot be pushed.
+     */
+    qboAccountHierarchy: NestedAccountHierarchyForReport[];
+    qboIncomeAccountIds: string[];
 }
 /**
  * Bundled view for the discount form screen: the edit view (save state + the

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.js

@@ -5,6 +5,8 @@ const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState")
 const couponSelector_1 = require("../../../entity/invoicing/coupon/couponSelector");
 const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
+const settingsViewSelector_1 = require("../settingsView/settingsViewSelector");
 const editInvoicingCouponDetailViewState_1 = require("./editInvoicingCouponDetailViewState");
 /**
  * Bundled view for the discount create/edit form: the save fetch state/error,
@@ -49,6 +51,12 @@ const getEditInvoicingCouponDetailViewState = (state, couponId) => {
     };
 };
 exports.getEditInvoicingCouponDetailViewState = getEditInvoicingCouponDetailViewState;
+/**
+ * The account types the discounts slot falls back to when the config has no
+ * `discounts_account` kind. A QuickBooks discount line posts to an income
+ * account; offering every account instead would let a save be rejected.
+ */
+const DEFAULT_DISCOUNTS_ACCOUNT_TYPES = 'Income';
 /**
  * Bundled view for the discount form screen: the edit view (save state + the
  * coupon to prefill in edit mode), the draft `localData` (seeded from the
@@ -64,15 +72,33 @@ const getInvoicingCouponFormView = (state, couponId) => {
     const localData = couponId != null
         ? (editDraftById[couponId] ?? editInvoicingCouponDetailViewState_1.initialInvoicingCouponFormLocalData)
         : newCouponDraft;
-    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
+    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, qboAccountMappingKindOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
+    const isQboConnected = (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state);
+    const qboView = isQboConnected ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state) : undefined;
+    // The account types the discounts slot accepts come from the same config the
+    // QBO settings page reads, so the two pickers offer the same accounts and
+    // widening the slot stays a config change.
+    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => kindOption.code === 'discounts_account')?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
     return {
         ...base,
         applyOnOptions: discountApplyOnOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         discountTypeOptions: discountTypeOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         durationTypeOptions: discountDurationTypeOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
-        localData,
+        isQboConnected,
+        isQboPickerDataLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state),
+        localData: couponId != null
+            ? localData
+            : {
+                ...localData,
+                // Seeded from settings only while the draft has none of its own, so
+                // the picker shows the account a create would post against before
+                // the user touches it, and stops seeding the moment they pick.
+                discountsAccountId: (0, editInvoicingCouponDetailViewState_1.invoicingCouponDiscountsAccountIdForCreate)(localData.discountsAccountId, (0, settingsViewSelector_1.getInvoicingSettings)(state)?.qbo?.account_mappings),
+            },
         mode: couponId != null ? 'edit' : 'create',
         periodUnitOptions: billingPeriodUnitOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
+        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],
+        qboIncomeAccountIds: (0, invoicingQboViewSelector_1.invoicingAccountsForQboAccountTypes)(qboView?.accounts ?? [], discountsAccountTypes).map((account) => account.id),
     };
 };
 exports.getInvoicingCouponFormView = getInvoicingCouponFormView;

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewState.d.ts

@@ -1,6 +1,7 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { InvoicingCoupon } from '../../../entity/invoicing/coupon/couponState';
+import { InvoicingQboAccountMappingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
 /**
  * Draft form state for the create/edit discount-coupon form. Held in CES so the
  * form flows its data from here (mirrors the customer form pattern). Dates are
@@ -13,6 +14,13 @@ export interface InvoicingCouponFormLocalData {
     couponId: string;
     discountPercentage: string;
     discountQuantity: string;
+    /**
+     * The income account for this coupon's discount line, as the id its picker
+     * submits. Blank means "no account of its own", which is what makes the QBO
+     * settings discounts account apply instead — so on create it is seeded from
+     * that setting rather than left empty.
+     */
+    discountsAccountId: string;
     discountType: string;
     durationType: string;
     invoiceName: string;
@@ -38,3 +46,14 @@ export interface EditInvoicingCouponDetailViewState extends FetchedState {
 export declare const initialInvoicingCouponFormLocalData: InvoicingCouponFormLocalData;
 /** Seed the form draft from an existing coupon entity (edit mode). */
 export declare const entityToInvoicingCouponFormLocalData: (coupon?: InvoicingCoupon) => InvoicingCouponFormLocalData;
+/**
+ * The discounts account a create starts from: the draft's own pick, or the QBO
+ * settings discounts account while the user has not made one. Read by both the
+ * form view and the save, so what the picker shows is what the request sends —
+ * a create that leaves the picker alone still stores the settings account on
+ * the coupon rather than relying on the setting staying put.
+ *
+ * Create only. An edit shows the coupon's stored account, so a coupon saved
+ * without one keeps showing none.
+ */
+export declare const invoicingCouponDiscountsAccountIdForCreate: (discountsAccountId: string, accountMappings: InvoicingQboAccountMappingsPayload | null | undefined) => string;

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewState.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityToInvoicingCouponFormLocalData = exports.initialInvoicingCouponFormLocalData = void 0;
+exports.invoicingCouponDiscountsAccountIdForCreate = exports.entityToInvoicingCouponFormLocalData = exports.initialInvoicingCouponFormLocalData = void 0;
+const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 exports.initialInvoicingCouponFormLocalData = {
     applyOn: 'invoice_amount',
     couponCode: '',
     couponId: '',
     discountPercentage: '',
     discountQuantity: '',
+    discountsAccountId: '',
     discountType: 'percentage',
     durationType: 'one_time',
     invoiceName: '',
@@ -32,6 +34,10 @@ const entityToInvoicingCouponFormLocalData = (coupon) => {
             ? String(coupon.discountPercentage)
             : '',
         discountQuantity: coupon.discountQuantity != null ? String(coupon.discountQuantity) : '',
+        // The coupon's own account, never the current setting: an edit shows what
+        // this coupon will post against, which is what was stored when it was
+        // saved even if the settings default has moved since.
+        discountsAccountId: coupon.discountsAccountId ?? '',
         discountType: coupon.discountType ?? 'percentage',
         durationType: coupon.durationType ?? 'one_time',
         invoiceName: coupon.invoiceName ?? '',
@@ -45,3 +51,17 @@ const entityToInvoicingCouponFormLocalData = (coupon) => {
     };
 };
 exports.entityToInvoicingCouponFormLocalData = entityToInvoicingCouponFormLocalData;
+/**
+ * The discounts account a create starts from: the draft's own pick, or the QBO
+ * settings discounts account while the user has not made one. Read by both the
+ * form view and the save, so what the picker shows is what the request sends —
+ * a create that leaves the picker alone still stores the settings account on
+ * the coupon rather than relying on the setting staying put.
+ *
+ * Create only. An edit shows the coupon's stored account, so a coupon saved
+ * without one keeps showing none.
+ */
+const invoicingCouponDiscountsAccountIdForCreate = (discountsAccountId, accountMappings) => discountsAccountId.trim() !== ''
+    ? discountsAccountId.trim()
+    : ((0, invoicingCommonPayload_1.getInvoicingQboAccountMappingId)(accountMappings ?? undefined, 'discounts_account') ?? '');
+exports.invoicingCouponDiscountsAccountIdForCreate = invoicingCouponDiscountsAccountIdForCreate;

package/lib/view/invoicing/editInvoicingCouponDetailView/saveInvoicingCouponEpic.js

@@ -8,8 +8,11 @@ const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const couponViewReducer_1 = require("../couponView/couponViewReducer");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
+const settingsViewSelector_1 = require("../settingsView/settingsViewSelector");
 const editInvoicingCouponDetailViewPayload_1 = require("./editInvoicingCouponDetailViewPayload");
 const editInvoicingCouponDetailViewReducer_1 = require("./editInvoicingCouponDetailViewReducer");
+const editInvoicingCouponDetailViewState_1 = require("./editInvoicingCouponDetailViewState");
 const saveInvoicingCouponEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCouponDetailViewReducer_1.submitInvoicingCouponForm.match(action) ||
     editInvoicingCouponDetailViewReducer_1.saveInvoicingCoupon.match(action)), (0, operators_1.mergeMap)((action) => {
     const { id } = action.payload;
@@ -17,11 +20,22 @@ const saveInvoicingCouponEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
     const data = editInvoicingCouponDetailViewReducer_1.saveInvoicingCoupon.match(action)
         ? action.payload.data
         : (() => {
-            const viewState = state$.value.editInvoicingCouponDetailViewState;
-            const localData = (id != null
+            const state = state$.value;
+            const viewState = state.editInvoicingCouponDetailViewState;
+            const draft = (id != null
                 ? viewState.editDraftById[id]
                 : viewState.newCouponDraft) ?? viewState.newCouponDraft;
-            return (0, editInvoicingCouponDetailViewPayload_1.localDataToSaveInvoicingCouponPayload)(localData, id == null);
+            // The create default is resolved here as well as in the form view,
+            // so a create that never touched the picker still persists the
+            // settings account on the coupon instead of leaving it to whatever
+            // the setting says the day an invoice is raised.
+            const localData = id == null
+                ? {
+                    ...draft,
+                    discountsAccountId: (0, editInvoicingCouponDetailViewState_1.invoicingCouponDiscountsAccountIdForCreate)(draft.discountsAccountId, (0, settingsViewSelector_1.getInvoicingSettings)(state)?.qbo?.account_mappings),
+                }
+                : draft;
+            return (0, editInvoicingCouponDetailViewPayload_1.localDataToSaveInvoicingCouponPayload)(localData, id == null, (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, qboId));
         })();
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.42",
+  "version": "5.2.44-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",
@@ -76,7 +76,7 @@
     "semver": "^7.7.1",
     "typescript": "^5.7.3",
     "vite": "^7.3.5",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.11"
   },
   "dependencies": {
     "@redux-devtools/extension": "^3.3.0",