@zeniai/client-epic-state 5.2.41-beta6MM → 5.2.41-beta8MM

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

@@ -20,8 +20,9 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
     // class become the records the service stores. Price points ride along
     // nested, so the detail page and the create/edit form share one request.
     const viewState = state.editInvoicingCatalogItemDetailViewState;
-    const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
-        viewState.newItemDraft;
+    const localData = (id != null
+        ? viewState.editDraftById[id]?.localData
+        : viewState.newItemDraft) ?? viewState.newItemDraft;
     const data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, accountingLookup);
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null
@@ -83,7 +84,20 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
                 }));
                 return resultActions;
             };
-            return completeSave([]);
+            // Price points added on an edit form cannot ride in the update:
+            // it addresses them by id and they have none yet. They are created
+            // against the item that was just saved, and their responses join
+            // the same success — one of them failing is the whole save
+            // failing, since the item on screen would otherwise claim price
+            // points the service never stored. A create needs none of this:
+            // its price points are nested in the item body.
+            const newProductPayloads = id != null
+                ? (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToCreateInvoicingCatalogProductPayloads)(localData, savedItem.id, accountingLookup)
+                : [];
+            if (newProductPayloads.length === 0) {
+                return completeSave([]);
+            }
+            return (0, rxjs_1.forkJoin)(newProductPayloads.map((productPayload) => zeniAPI.postAndGetJSON(`${baseUrl}/catalog/products`, productPayload))).pipe((0, operators_1.mergeMap)((productResponses) => completeSave(productResponses)));
         }
         return (0, rxjs_1.from)([
             (0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)(response.status),

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

@@ -1,12 +1,16 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
-import { seedInvoicingCatalogItemFormDraft, updateInvoicingCatalogItemDetail } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof seedInvoicingCatalogItemFormDraft>;
+import { fetchInvoicingCatalogItemDetailPage, seedInvoicingCatalogItemFormDraft, updateInvoicingCatalogItemDetail } from './editInvoicingCatalogItemDetailViewReducer';
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogItemDetailPage> | ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof seedInvoicingCatalogItemFormDraft>;
 /**
- * Seeds the edit draft from the record the moment the detail fetch lands, so
- * the form has its values before it mounts. The reducer ignores the seed when a
- * draft already exists, which is what stops a background refetch from
- * overwriting edits in progress.
+ * Seeds the edit draft from the record, so the form has its values before it
+ * mounts. The reducer ignores a seed once the draft holds the record, which is
+ * what stops a background refetch from overwriting edits in progress.
+ *
+ * Opening the page counts as a trigger, not just the detail response: the page
+ * fetch is cache-guarded, so re-opening a form for a record already loaded this
+ * session issues no request at all — and a draft cleared in between (by a save
+ * or a cancel) would have nothing left to seed it.
  */
 export declare const seedInvoicingCatalogItemFormDraftEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -7,13 +7,36 @@ const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const invoicingCatalogItemFormHelper_1 = require("./invoicingCatalogItemFormHelper");
 /**
- * Seeds the edit draft from the record the moment the detail fetch lands, so
- * the form has its values before it mounts. The reducer ignores the seed when a
- * draft already exists, which is what stops a background refetch from
- * overwriting edits in progress.
+ * Seeds the edit draft from the record, so the form has its values before it
+ * mounts. The reducer ignores a seed once the draft holds the record, which is
+ * what stops a background refetch from overwriting edits in progress.
+ *
+ * Opening the page counts as a trigger, not just the detail response: the page
+ * fetch is cache-guarded, so re-opening a form for a record already loaded this
+ * session issues no request at all — and a draft cleared in between (by a save
+ * or a cancel) would have nothing left to seed it.
  */
-const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.updateInvoicingCatalogItemDetail.match), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
-    const { id } = action.payload;
+const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCatalogItemDetailViewReducer_1.updateInvoicingCatalogItemDetail.match(action) ||
+    editInvoicingCatalogItemDetailViewReducer_1.fetchInvoicingCatalogItemDetailPage.match(action)), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
+    const id = action.payload.id;
+    if (id == null) {
+        return rxjs_1.EMPTY;
+    }
+    // The entity alone does not say the whole record is loaded — the list
+    // endpoints merge their own list-shaped rows into the same store. Only a
+    // completed detail load does, which is also exactly when the page's
+    // cache-guarded fetch issues no request and this is the sole seed.
+    // A forced refetch is the caller asking for fresh data: the response will
+    // seed, and seeding first from the entity as it stands would mark the
+    // draft loaded and lock that response out.
+    if (editInvoicingCatalogItemDetailViewReducer_1.fetchInvoicingCatalogItemDetailPage.match(action) &&
+        (action.payload.cacheOverride === true ||
+            state.editInvoicingCatalogItemDetailViewState.recordStateById[id]
+                ?.fetchState !== 'Completed')) {
+        return rxjs_1.EMPTY;
+    }
+    // Nothing to seed from on a cold open; the detail response triggers this
+    // again once it lands.
     const plan = (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id);
     if (plan == null) {
         return rxjs_1.EMPTY;

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/editInvoicingCouponDetailViewReducer.d.ts

@@ -48,6 +48,8 @@ export declare const updateInvoicingCouponFormDraft: import("@reduxjs/toolkit").
     id: ID;
 }, "editInvoicingCouponDetailView/runInvoicingDiscountActionFailure">, submitInvoicingCouponForm: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: SubmitInvoicingCouponFormPayload], SubmitInvoicingCouponFormPayload, "editInvoicingCouponDetailView/submitInvoicingCouponForm", never, never>, saveInvoicingCoupon: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: SaveInvoicingCouponPayload], SaveInvoicingCouponPayload, "editInvoicingCouponDetailView/saveInvoicingCoupon", never, never>, submitInvoicingCouponFormSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     couponId: ID;
-}, "editInvoicingCouponDetailView/submitInvoicingCouponFormSuccess">, submitInvoicingCouponFormFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "editInvoicingCouponDetailView/submitInvoicingCouponFormFailure">, resetEditInvoicingCouponDetailView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"editInvoicingCouponDetailView/resetEditInvoicingCouponDetailView">;
+}, "editInvoicingCouponDetailView/submitInvoicingCouponFormSuccess">, submitInvoicingCouponFormFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "editInvoicingCouponDetailView/submitInvoicingCouponFormFailure">, resetEditInvoicingCouponDetailView: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<{
+    id?: ID;
+} | undefined, "editInvoicingCouponDetailView/resetEditInvoicingCouponDetailView">;
 declare const _default: import("redux").Reducer<EditInvoicingCouponDetailViewState>;
 export default _default;

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetEditInvoicingCouponDetailView = exports.submitInvoicingCouponFormFailure = exports.submitInvoicingCouponFormSuccess = exports.saveInvoicingCoupon = exports.submitInvoicingCouponForm = exports.runInvoicingDiscountActionFailure = exports.runInvoicingDiscountActionSuccess = exports.runInvoicingDiscountAction = exports.updateInvoicingCouponDetailFailure = exports.updateInvoicingCouponDetail = exports.seedInvoicingCouponFormDraft = exports.fetchInvoicingCouponDetailPage = exports.fetchInvoicingCouponDetail = exports.updateInvoicingCouponFormDraft = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../../rootActions");
+const invoicingFormDraft_1 = require("../invoicingFormDraft");
 const editInvoicingCouponDetailViewState_1 = require("./editInvoicingCouponDetailViewState");
 exports.initialState = {
     fetchState: 'Not-Started',
@@ -24,7 +25,7 @@ const editInvoicingCouponDetailView = (0, toolkit_1.createSlice)({
         updateInvoicingCouponFormDraft(draft, action) {
             const { id, localData } = action.payload;
             if (id != null) {
-                draft.editDraftById[id] = localData;
+                (0, invoicingFormDraft_1.applyInvoicingFormDraftEdit)(draft.editDraftById, id, localData);
             }
             else {
                 draft.newCouponDraft = localData;
@@ -54,6 +55,9 @@ const editInvoicingCouponDetailView = (0, toolkit_1.createSlice)({
             draft.fetchState = 'Completed';
             draft.error = undefined;
             draft.savedCouponId = action.payload.couponId;
+            // An edit is refetched on success; keep the saved values on screen until
+            // that lands, and let it replace them.
+            (0, invoicingFormDraft_1.applyInvoicingFormDraftSaved)(draft.editDraftById, action.payload.couponId);
         },
         submitInvoicingCouponFormFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -89,15 +93,12 @@ const editInvoicingCouponDetailView = (0, toolkit_1.createSlice)({
                 fetchState: 'Error',
                 error: action.payload.status,
             };
+            (0, invoicingFormDraft_1.applyInvoicingFormDraftFailure)(draft.editDraftById, action.payload.id, editInvoicingCouponDetailViewState_1.initialInvoicingCouponFormLocalData);
         },
-        /**
-         * Seed the draft from the loaded record, once. Skipped when a draft already
-         * exists so a late refetch cannot overwrite in-progress edits.
-         */
+        /** Fill the draft from the loaded record — see `applyInvoicingFormDraftSeed`. */
         seedInvoicingCouponFormDraft(draft, action) {
-            if (draft.editDraftById[action.payload.id] == null) {
-                draft.editDraftById[action.payload.id] = action.payload.localData;
-            }
+            const { id, localData } = action.payload;
+            (0, invoicingFormDraft_1.applyInvoicingFormDraftSeed)(draft.editDraftById, id, localData);
         },
         runInvoicingDiscountAction(draft, action) {
             draft.actionStateById[action.payload.id] = {
@@ -117,12 +118,22 @@ const editInvoicingCouponDetailView = (0, toolkit_1.createSlice)({
                 error: action.payload.error,
             };
         },
-        resetEditInvoicingCouponDetailView(draft) {
+        /**
+         * Discard a form's draft — the coupon's own when `id` is given,
+         * the create draft otherwise. Scoped to the one form on purpose: another
+         * coupon's half-finished edit is not this form's to throw away.
+         * Clearing every draft at once is what `clearAll` is for.
+         */
+        resetEditInvoicingCouponDetailView(draft, action) {
             draft.fetchState = 'Not-Started';
             draft.error = undefined;
             draft.savedCouponId = undefined;
-            draft.editDraftById = {};
-            draft.newCouponDraft = { ...editInvoicingCouponDetailViewState_1.initialInvoicingCouponFormLocalData };
+            const id = action.payload?.id;
+            if (id == null) {
+                draft.newCouponDraft = { ...editInvoicingCouponDetailViewState_1.initialInvoicingCouponFormLocalData };
+                return;
+            }
+            delete draft.editDraftById[id];
         },
     },
     extraReducers: (builder) => {

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';
@@ -18,6 +19,19 @@ export interface EditInvoicingCouponDetailView extends SelectorView {
      * Folded in here so the screen never reaches for the config view itself.
      */
     fieldHelp: InvoicingFieldHelpByCode;
+    /**
+     * True while the coupon being edited is still on its way to the form. The
+     * form holds a skeleton on this rather than mount: it seeds react-hook-form
+     * once, at first render, so fields mounted against the blank draft stay blank
+     * and the first change writes that blankness back over the coupon. A later
+     * refetch does not raise this again, so a refresh leaves the form on screen
+     * instead of blanking it mid-edit.
+     *
+     * Narrower than `pageFetchState`, which also waits on the accounting lists:
+     * the discounts-account picker carries its own loading state, so the form is
+     * useful before the lists land.
+     */
+    isFormLoading: boolean;
     /**
      * Every request the page renders from, reduced to one state: the record and
      * the config behind its dropdowns and field help. The page holds a skeleton
@@ -30,6 +44,15 @@ export interface EditInvoicingCouponDetailView extends SelectorView {
      */
     recordState: FetchStateAndError;
     coupon?: InvoicingCoupon;
+    /**
+     * The name of the account the coupon's discount line posts to, resolved from
+     * the id the coupon stores against the shared QuickBooks account list.
+     * Resolved here rather than carried on the entity: the account is a record
+     * the accounting lists already own, and the coupon only ever stored a
+     * reference to it. Absent while the list is still loading, or when the id
+     * names an account this tenant can no longer see.
+     */
+    discountsAccountName?: string;
     savedCouponId?: ID;
 }
 export declare const getEditInvoicingCouponDetailViewState: (state: RootState, couponId?: ID) => EditInvoicingCouponDetailView;
@@ -42,9 +65,32 @@ 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 flattens the tree into options by walking each node's
+     * children, so dropping a parent that is not itself an income account would
+     * drop its income descendants 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

@@ -1,16 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingCouponFormView = exports.getEditInvoicingCouponDetailViewState = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
 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 invoicingFormDraft_1 = require("../invoicingFormDraft");
+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,
  * the id of the coupon last saved, and — when a `couponId` is passed (edit
  * mode) — the existing coupon entity to prefill the form.
  */
+/**
+ * The QuickBooks ids the discounts account may be picked from.
+ *
+ * Memoized, and collapsing to one shared empty array while QBO is disconnected:
+ * the form turns this into its picker options and re-seeds its defaults when
+ * those change, so a fresh array on every store change would reset the form
+ * under the user until their first edit.
+ */
+const getInvoicingCouponDiscountsAccountIds = (0, toolkit_1.createSelector)([
+    invoicingQboViewSelector_1.getInvoicingQboAccountOptions,
+    (state) => (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).qboAccountMappingKindOptions,
+    invoicingQboViewSelector_1.isInvoicingQboConnected,
+], (accounts, qboAccountMappingKindOptions, isQboConnected) => isQboConnected
+    ? (0, invoicingQboViewSelector_1.invoicingQboAccountIdsForMappingSlot)(accounts, qboAccountMappingKindOptions, invoicingQboViewSelector_1.INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT, invoicingQboViewSelector_1.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES)
+    : invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_IDS);
 const NOT_STARTED = {
     error: undefined,
     fetchState: 'Not-Started',
@@ -26,6 +45,9 @@ const getEditInvoicingCouponDetailViewState = (state, couponId) => {
             fetchState: 'Not-Started',
         })
         : { error: undefined, fetchState: 'Completed' };
+    const coupon = couponId != null
+        ? (0, couponSelector_1.getInvoicingCouponById)(state.invoicingCouponState, couponId)
+        : undefined;
     return {
         actionState: couponId != null
             ? (state.editInvoicingCouponDetailViewState.actionStateById[couponId] ??
@@ -39,9 +61,9 @@ const getEditInvoicingCouponDetailViewState = (state, couponId) => {
             { error: undefined, fetchState: configFetchState },
         ]),
         recordState,
-        coupon: couponId != null
-            ? (0, couponSelector_1.getInvoicingCouponById)(state.invoicingCouponState, couponId)
-            : undefined,
+        isFormLoading: (0, invoicingFormDraft_1.isInvoicingFormDraftPending)(state.editInvoicingCouponDetailViewState.editDraftById, couponId),
+        coupon,
+        discountsAccountName: (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, coupon?.discountsAccountId)?.accountName,
         savedCouponId,
         fetchState,
         error,
@@ -62,17 +84,58 @@ const getInvoicingCouponFormView = (state, couponId) => {
     // `seedInvoicingCouponFormDraftEpic` when the detail load lands. Until then
     // the page is showing its skeleton.
     const localData = couponId != null
-        ? (editDraftById[couponId] ?? editInvoicingCouponDetailViewState_1.initialInvoicingCouponFormLocalData)
+        ? (0, invoicingFormDraft_1.getInvoicingFormDraftLocalData)(editDraftById, couponId, editInvoicingCouponDetailViewState_1.initialInvoicingCouponFormLocalData)
         : newCouponDraft;
     const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
+    const isQboConnected = (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state);
+    const qboView = isQboConnected ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state) : undefined;
+    const isQboPickerDataLoading = (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state);
+    const settingsFetchState = (0, settingsViewSelector_1.getInvoicingSettingsFetchState)(state).fetchState;
+    // Only a create reads the settings, and only until they arrive: an `Error`
+    // is a create that starts on no account, not a page that never renders.
+    const isCreateSeedPending = couponId == null &&
+        (settingsFetchState === 'Not-Started' ||
+            settingsFetchState === 'In-Progress');
     return {
         ...base,
         applyOnOptions: discountApplyOnOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         discountTypeOptions: discountTypeOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         durationTypeOptions: discountDurationTypeOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
-        localData,
+        isQboConnected,
+        isQboPickerDataLoading,
+        // Widened past the record and config the detail page waits on: the form
+        // also renders from the account list, and seeds a create from the settings
+        // discounts account. A form that mounted before those landed would offer an
+        // empty picker and save a coupon with no account of its own — not wrong,
+        // since blank means "use the settings account", but not what the user was
+        // shown either. Widened here rather than on the base view, so the detail
+        // page does not start waiting on lists it never renders.
+        //
+        // Only while they are still coming, though, and the settings only on a
+        // create: a coupon saves fine without a discounts account, so neither is
+        // allowed to hold the form behind a skeleton once it has failed.
+        pageFetchState: (0, reduceFetchState_1.reduceAllFetchState)([
+            base.pageFetchState,
+            {
+                error: undefined,
+                fetchState: isQboPickerDataLoading || isCreateSeedPending
+                    ? 'In-Progress'
+                    : 'Completed',
+            },
+        ]),
+        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 ?? invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_HIERARCHY,
+        qboIncomeAccountIds: getInvoicingCouponDiscountsAccountIds(state),
     };
 };
 exports.getInvoicingCouponFormView = getInvoicingCouponFormView;

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

@@ -1,6 +1,8 @@
 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';
+import { InvoicingFormDraftById } from '../invoicingFormDraft';
 /**
  * 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 +15,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;
@@ -29,7 +38,7 @@ export interface InvoicingCouponFormLocalData {
 export interface EditInvoicingCouponDetailViewState extends FetchedState {
     /** Lifecycle action (archive, activate, …) fetch state per coupon id. */
     actionStateById: Record<ID, FetchStateAndError>;
-    editDraftById: Record<ID, InvoicingCouponFormLocalData>;
+    editDraftById: InvoicingFormDraftById<InvoicingCouponFormLocalData>;
     newCouponDraft: InvoicingCouponFormLocalData;
     /** Detail-load state per coupon id. */
     recordStateById: Record<ID, FetchStateAndError>;
@@ -38,3 +47,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,20 @@ 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) => {
+    const pickedAccountId = discountsAccountId.trim();
+    return pickedAccountId !== ''
+        ? pickedAccountId
+        : ((0, invoicingCommonPayload_1.getInvoicingQboAccountMappingId)(accountMappings ?? undefined, 'discounts_account') ?? '');
+};
+exports.invoicingCouponDiscountsAccountIdForCreate = invoicingCouponDiscountsAccountIdForCreate;

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

@@ -2,12 +2,16 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
 import { fetchInvoicingConfig } from '../invoicingConfigView/invoicingConfigViewReducer';
+import { fetchInvoicingAccountingPickers, fetchInvoicingQboConnection } from '../invoicingQboView/invoicingQboViewReducer';
+import { fetchInvoicingSettings } from '../settingsView/settingsViewReducer';
 import { fetchInvoicingCouponDetail, fetchInvoicingCouponDetailPage } from './editInvoicingCouponDetailViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCouponDetailPage> | ReturnType<typeof fetchInvoicingCouponDetail> | ReturnType<typeof fetchInvoicingConfig>;
+export type ActionType = ReturnType<typeof fetchInvoicingCouponDetailPage> | ReturnType<typeof fetchInvoicingCouponDetail> | ReturnType<typeof fetchInvoicingConfig> | ReturnType<typeof fetchInvoicingQboConnection> | ReturnType<typeof fetchInvoicingAccountingPickers> | ReturnType<typeof fetchInvoicingSettings>;
 /**
- * Orchestrates the discount detail page: one action fans out to the coupon
- * record and the invoicing config behind its dropdowns and field help, each
- * skipped when already cached. The page reads a single reduced fetch state off
- * the view, so the form mounts once with real values.
+ * Orchestrates the discount pages: one action fans out to the coupon record,
+ * the invoicing config behind its dropdowns and field help, and the QuickBooks
+ * connection, account list and settings the form's Discounts account picker
+ * renders and seeds from — each skipped when already cached. The page reads a
+ * single reduced fetch state off the view, so the form mounts once with real
+ * values.
  */
 export declare const fetchInvoicingCouponDetailPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -4,6 +4,8 @@ exports.fetchInvoicingCouponDetailPageEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const invoicingConfigViewReducer_1 = require("../invoicingConfigView/invoicingConfigViewReducer");
+const invoicingQboViewReducer_1 = require("../invoicingQboView/invoicingQboViewReducer");
+const settingsViewReducer_1 = require("../settingsView/settingsViewReducer");
 const editInvoicingCouponDetailViewReducer_1 = require("./editInvoicingCouponDetailViewReducer");
 /**
  * Fetch unless the endpoint is already loaded or in flight — or always when the
@@ -13,10 +15,12 @@ const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
     (fetchStateAndError.fetchState !== 'Completed' &&
         fetchStateAndError.fetchState !== 'In-Progress');
 /**
- * Orchestrates the discount detail page: one action fans out to the coupon
- * record and the invoicing config behind its dropdowns and field help, each
- * skipped when already cached. The page reads a single reduced fetch state off
- * the view, so the form mounts once with real values.
+ * Orchestrates the discount pages: one action fans out to the coupon record,
+ * the invoicing config behind its dropdowns and field help, and the QuickBooks
+ * connection, account list and settings the form's Discounts account picker
+ * renders and seeds from — each skipped when already cached. The page reads a
+ * single reduced fetch state off the view, so the form mounts once with real
+ * values.
  */
 const fetchInvoicingCouponDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editInvoicingCouponDetailViewReducer_1.fetchInvoicingCouponDetailPage.match), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
     const { cacheOverride = false, id } = action.payload;
@@ -35,6 +39,20 @@ const fetchInvoicingCouponDetailPageEpic = (actions$, state$) => actions$.pipe((
     if (shouldFetch({ error: configState.error, fetchState: configState.fetchState }, cacheOverride)) {
         pageActions.push((0, invoicingConfigViewReducer_1.fetchInvoicingConfig)());
     }
+    const qboState = state.invoicingQboViewState;
+    if (shouldFetch(qboState.connectionFetchState, cacheOverride)) {
+        pageActions.push((0, invoicingQboViewReducer_1.fetchInvoicingQboConnection)());
+    }
+    // The picker epic tops up the shared account list and skips what the
+    // store already holds, so this is safe to ask for on every open.
+    pageActions.push((0, invoicingQboViewReducer_1.fetchInvoicingAccountingPickers)());
+    const settingsState = state.invoicingSettingsViewState;
+    if (shouldFetch({ error: settingsState.error, fetchState: settingsState.fetchState }, cacheOverride)) {
+        // A create seeds its Discounts account from the settings mapping, so
+        // the settings are page data here rather than a settings-screen
+        // concern.
+        pageActions.push((0, settingsViewReducer_1.fetchInvoicingSettings)());
+    }
     return pageActions.length > 0 ? (0, rxjs_1.from)(pageActions) : rxjs_1.EMPTY;
 }));
 exports.fetchInvoicingCouponDetailPageEpic = fetchInvoicingCouponDetailPageEpic;