@zeniai/client-epic-state 5.2.11 → 5.2.12

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,42 +94,38 @@ 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.
+ * Account mappings as the service stores them: one entry per mapping kind the
+ * config API defines, keyed by that kind's code (`deposit_account`,
+ * `default_income_account`, …). The value is the whole account, or just its id
+ * for a tenant whose backend has not rolled — both are read, and a save writes
+ * the record.
+ *
+ * An index signature rather than a field list, because the config owns which
+ * kinds exist: enumerating them here means a kind it adds gets dropped.
  */
-export interface InvoicingQboAccountMappingsPayload {
-    default_income_account?: InvoicingQboMappedAccountPayload | null;
-    default_income_account_id?: string | null;
-    deposit_account?: InvoicingQboMappedAccountPayload | null;
-    deposit_account_id?: string | null;
-    deposit_account_overrides?: Record<string, string> | null;
-    discounts_account?: InvoicingQboMappedAccountPayload | null;
-    discounts_account_id?: string | null;
-    rounding_account?: InvoicingQboMappedAccountPayload | null;
-    rounding_account_id?: string | null;
-    write_off_account?: InvoicingQboMappedAccountPayload | null;
-    write_off_account_id?: string | null;
-}
+export type InvoicingQboAccountMappingsPayload = Record<string, Partial<AccountBasePayload> | string | null>;
+/**
+ * The first id a picker can actually select. Callers list the QuickBooks id
+ * first: the options are keyed on it, so a platform id selects nothing even when
+ * it names the same record. Blank counts as absent.
+ */
+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).
+ * The slot a mapping code names. Codes arrive from the config API as the slot
+ * itself (`deposit_account`); a trailing `_id` is tolerated so a tenant sending
+ * the older `deposit_account_id` resolves to the same mapping.
  */
+export declare const toInvoicingQboAccountMappingSlot: (code: string) => string;
+/** Read one account-mapping dropdown value by its config `code`. */
 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.
+ * Build the `account_mappings` request body from the ids the pickers submitted.
+ * Each kind is sent as the whole account, which is what the service stores; an
+ * id that resolves to no account is sent as it stands rather than dropped, so a
+ * save never silently unsets a mapping it could not expand.
  */
-export declare function withInvoicingQboAccountMappingId(accountMappings: InvoicingQboAccountMappingsPayload | undefined, code: string, accountId: string): InvoicingQboAccountMappingsPayload;
+export declare const toInvoicingQboAccountMappingsPayload: (accountIdByMappingCode: Record<string, string>, accountForId: (accountId: string) => AccountBase | undefined) => InvoicingQboAccountMappingsPayload;
 export interface InvoicingQboSettingsPayload {
     account_mappings?: InvoicingQboAccountMappingsPayload | null;
     auto_create_items?: boolean;

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.toInvoicingQboAccountMappingsPayload = exports.toInvoicingQboAccountMappingSlot = 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;
@@ -12,7 +12,6 @@ exports.toInvoicingDiscountLifecycleAction = toInvoicingDiscountLifecycleAction;
 exports.toInvoicingDiscountLifecycleActionOption = toInvoicingDiscountLifecycleActionOption;
 exports.toInvoicingQboCustomerMatchingMode = toInvoicingQboCustomerMatchingMode;
 exports.getInvoicingQboAccountMappingId = getInvoicingQboAccountMappingId;
-exports.withInvoicingQboAccountMappingId = withInvoicingQboAccountMappingId;
 exports.toInvoicingQboAccountMappingKindOption = toInvoicingQboAccountMappingKindOption;
 exports.toInvoicingNamedOption = toInvoicingNamedOption;
 exports.toInvoicingFormOption = toInvoicingFormOption;
@@ -23,6 +22,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',
@@ -154,87 +154,49 @@ function toInvoicingQboCustomerMatchingMode(value) {
     }
 }
 /**
- * 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 a platform id selects nothing even when
+ * it names the same record. Blank counts as absent.
  */
-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 = [
-        mappedAccount?.qbo_id,
-        mappedAccount?.account_id,
-        legacyAccountId,
-    ];
-    return candidates.find((candidate) => candidate != null && candidate !== '');
-}
+const firstSelectableInvoicingId = (candidates) => candidates.find((candidate) => candidate != null && candidate !== '');
+exports.firstSelectableInvoicingId = firstSelectableInvoicingId;
 /**
- * Read one account-mapping dropdown value by its config `code` (the codes in
- * `qbo_account_mapping_kind_options` match the `account_mappings` field names).
+ * The slot a mapping code names. Codes arrive from the config API as the slot
+ * itself (`deposit_account`); a trailing `_id` is tolerated so a tenant sending
+ * the older `deposit_account_id` resolves to the same mapping.
  */
+const toInvoicingQboAccountMappingSlot = (code) => code.replace(/_id$/, '');
+exports.toInvoicingQboAccountMappingSlot = toInvoicingQboAccountMappingSlot;
+/** Read one account-mapping dropdown value by its config `code`. */
 function getInvoicingQboAccountMappingId(accountMappings, code) {
-    switch (code) {
-        case 'deposit_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.deposit_account, accountMappings?.deposit_account_id);
-        case 'default_income_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.default_income_account, accountMappings?.default_income_account_id);
-        case 'discounts_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.discounts_account, accountMappings?.discounts_account_id);
-        case 'rounding_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.rounding_account, accountMappings?.rounding_account_id);
-        case 'write_off_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.write_off_account, accountMappings?.write_off_account_id);
-        default:
-            return undefined;
+    const slotKey = (0, exports.toInvoicingQboAccountMappingSlot)(code);
+    // Either key: the service sends `deposit_account`, but an older payload put
+    // the id under `deposit_account_id`.
+    const slot = accountMappings?.[slotKey] ?? accountMappings?.[`${slotKey}_id`];
+    if (typeof slot === 'string') {
+        return slot !== '' ? slot : undefined;
     }
+    return (0, exports.firstSelectableInvoicingId)([slot?.qbo_id, slot?.account_id]);
 }
 /**
- * Return a copy of the account mappings with the dropdown slot named by
- * `code` set to `accountId`. Unknown codes leave the mappings unchanged.
+ * Build the `account_mappings` request body from the ids the pickers submitted.
+ * Each kind is sent as the whole account, which is what the service stores; an
+ * id that resolves to no account is sent as it stands rather than dropped, so a
+ * save never silently unsets a mapping it could not expand.
  */
-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.
-    const base = accountMappings ?? {};
-    switch (code) {
-        case 'deposit_account_id':
-            return {
-                ...base,
-                deposit_account: undefined,
-                deposit_account_id: accountId,
-            };
-        case 'default_income_account_id':
-            return {
-                ...base,
-                default_income_account: undefined,
-                default_income_account_id: accountId,
-            };
-        case 'discounts_account_id':
-            return {
-                ...base,
-                discounts_account: undefined,
-                discounts_account_id: accountId,
-            };
-        case 'rounding_account_id':
-            return {
-                ...base,
-                rounding_account: undefined,
-                rounding_account_id: accountId,
-            };
-        case 'write_off_account_id':
-            return {
-                ...base,
-                write_off_account: undefined,
-                write_off_account_id: accountId,
-            };
-        default:
-            return base;
-    }
-}
+const toInvoicingQboAccountMappingsPayload = (accountIdByMappingCode, accountForId) => {
+    const mappings = {};
+    Object.entries(accountIdByMappingCode).forEach(([code, accountId]) => {
+        if (accountId === '') {
+            return;
+        }
+        const account = accountForId(accountId);
+        mappings[(0, exports.toInvoicingQboAccountMappingSlot)(code)] =
+            account != null ? (0, accountPayload_1.toAccountPayload)(account) : accountId;
+    });
+    return mappings;
+};
+exports.toInvoicingQboAccountMappingsPayload = toInvoicingQboAccountMappingsPayload;
 function toInvoicingQboAccountMappingKindOption(option) {
     return {
         accountTypes: option.account_types,

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

@@ -265,7 +265,7 @@ import { ActionType as InvoicingTransactionListViewActionType } from './view/inv
 import { ActionType as InvoicingPaymentActionActionType } from './view/invoicing/paymentAction/paymentActionEpic';
 import { ActionType as InvoicingPromotionalCreditActionActionType } from './view/invoicing/promotionalCreditAction/promotionalCreditActionEpic';
 import { ActionType as RecordPaymentActionType } from './view/invoicing/recordPayment/recordPaymentEpic';
-import { ActionType as InvoicingSettingsViewActionType } from './view/invoicing/settingsView/settingsViewEpics';
+import { InvoicingSettingsViewActionType } from './view/invoicing/settingsView/epics/settingsViewActionType';
 import { ActionType as InvoicingSubscriptionActionActionType } from './view/invoicing/subscriptionAction/subscriptionActionEpic';
 import { ActionType as FetchMonthClosePerformanceTrendActionType } from './view/monthEndCloseChecksView/epics/fetchMonthClosePerformanceTrendEpic';
 import { ActionType as FetchMonthEndCloseChecksActionType } from './view/monthEndCloseChecksView/epics/fetchMonthEndCloseChecksEpic';

package/lib/epic.js

@@ -313,8 +313,12 @@ const issueCreditNoteEpic_1 = require("./view/invoicing/issueCreditNote/issueCre
 const paymentActionEpic_1 = require("./view/invoicing/paymentAction/paymentActionEpic");
 const promotionalCreditActionEpic_1 = require("./view/invoicing/promotionalCreditAction/promotionalCreditActionEpic");
 const recordPaymentEpic_1 = require("./view/invoicing/recordPayment/recordPaymentEpic");
+const connectInvoicingStripeEpic_1 = require("./view/invoicing/settingsView/epics/connectInvoicingStripeEpic");
+const disconnectInvoicingStripeEpic_1 = require("./view/invoicing/settingsView/epics/disconnectInvoicingStripeEpic");
+const fetchInvoicingSettingsEpic_1 = require("./view/invoicing/settingsView/epics/fetchInvoicingSettingsEpic");
+const saveInvoicingSettingsEpic_1 = require("./view/invoicing/settingsView/epics/saveInvoicingSettingsEpic");
+const submitInvoicingQboSettingsEpic_1 = require("./view/invoicing/settingsView/epics/submitInvoicingQboSettingsEpic");
 const invoicingBrandingFormEpics_1 = require("./view/invoicing/settingsView/invoicingBrandingFormEpics");
-const settingsViewEpics_1 = require("./view/invoicing/settingsView/settingsViewEpics");
 const subscriptionActionEpic_1 = require("./view/invoicing/subscriptionAction/subscriptionActionEpic");
 const fetchMonthClosePerformanceTrendEpic_1 = require("./view/monthEndCloseChecksView/epics/fetchMonthClosePerformanceTrendEpic");
 const fetchMonthEndCloseChecksEpic_1 = require("./view/monthEndCloseChecksView/epics/fetchMonthEndCloseChecksEpic");
@@ -762,7 +766,7 @@ const ALL_EPICS = [
     confirmBulkUploadMatchEpic_1.confirmBulkUploadMatchEpic,
     confirmCardSetupIntentEpic_1.confirmCardSetupIntentEpic,
     confirmStatementMappingEpic_1.confirmStatementMappingEpic,
-    settingsViewEpics_1.connectInvoicingStripeEpic,
+    connectInvoicingStripeEpic_1.connectInvoicingStripeEpic,
     convertAmountToHomeCurrencyEpic_1.convertAmountToHomeCurrencyEpic,
     createAddressEpic_1.createAddressEpic,
     createAutoTransferRuleEpic_1.createAutoTransferRuleEpic,
@@ -814,7 +818,7 @@ const ALL_EPICS = [
     deleteTransactionAttachmentEpic_1.deleteTransactionAttachmentEpic,
     deleteUserBankAccountEpic_1.deleteUserBankAccountEpic,
     disableAccountingProjectsEpic_1.disableAccountingProjectsEpic,
-    settingsViewEpics_1.disconnectInvoicingStripeEpic,
+    disconnectInvoicingStripeEpic_1.disconnectInvoicingStripeEpic,
     dismissCapitalizationOnboardingEpic_1.dismissCapitalizationOnboardingEpic,
     doMagicLinkSignInEpic_1.doMagicLinkSignInEpic,
     signInUserEpic_1.doSignInEpic,
@@ -1023,7 +1027,7 @@ const ALL_EPICS = [
     customerPaymentMethodEpic_1.fetchInvoicingPlaidLinkTokenEpic,
     fetchInvoicingQboConnectionEpic_1.fetchInvoicingQboConnectionEpic,
     fetchInvoicingQboSyncHealthEpic_1.fetchInvoicingQboSyncHealthEpic,
-    settingsViewEpics_1.fetchInvoicingSettingsEpic,
+    fetchInvoicingSettingsEpic_1.fetchInvoicingSettingsEpic,
     fetchInvoicingSubscriptionCountsEpic_1.fetchInvoicingSubscriptionCountsEpic,
     invoicingSubscriptionDetailViewEpics_1.fetchInvoicingSubscriptionDetailEpic,
     fetchInvoicingSubscriptionFormPageEpic_1.fetchInvoicingSubscriptionFormPageEpic,
@@ -1311,7 +1315,7 @@ const ALL_EPICS = [
     saveInvoicingCouponEpic_1.saveInvoicingCouponEpic,
     saveInvoicingCustomerEpic_1.saveInvoicingCustomerEpic,
     customerPaymentMethodEpic_1.saveInvoicingPaymentMethodEpic,
-    settingsViewEpics_1.saveInvoicingSettingsEpic,
+    saveInvoicingSettingsEpic_1.saveInvoicingSettingsEpic,
     saveInvoicingSubscriptionEpic_1.saveInvoicingSubscriptionEpic,
     saveMagicLinkBankAccountEpic_1.saveMagicLinkBankAccountEpic,
     saveNewAddressEpic_1.saveNewAddressEpic,
@@ -1360,6 +1364,7 @@ const ALL_EPICS = [
     submitFeedbackEpic_1.submitFeedbackEpic,
     submitIntlVerificationEpic_1.submitIntlVerificationEpic,
     invoicingBrandingFormEpics_1.submitInvoicingBrandingFormEpic,
+    submitInvoicingQboSettingsEpic_1.submitInvoicingQboSettingsEpic,
     submitQuestionEpic_1.submitQuestionEpic,
     syncInvoicingSubscriptionCouponsEpic_1.syncInvoicingSubscriptionCouponsEpic,
     syncTabsAfterAutomatchEpic_1.syncTabsAfterAutomatchEpic,

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',
@@ -129,87 +130,46 @@ export function toInvoicingQboCustomerMatchingMode(value) {
     }
 }
 /**
- * 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 a platform id selects nothing even when
+ * it names the same record. Blank counts as absent.
  */
-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 = [
-        mappedAccount?.qbo_id,
-        mappedAccount?.account_id,
-        legacyAccountId,
-    ];
-    return candidates.find((candidate) => candidate != null && candidate !== '');
-}
+export const firstSelectableInvoicingId = (candidates) => candidates.find((candidate) => candidate != null && candidate !== '');
 /**
- * Read one account-mapping dropdown value by its config `code` (the codes in
- * `qbo_account_mapping_kind_options` match the `account_mappings` field names).
+ * The slot a mapping code names. Codes arrive from the config API as the slot
+ * itself (`deposit_account`); a trailing `_id` is tolerated so a tenant sending
+ * the older `deposit_account_id` resolves to the same mapping.
  */
+export const toInvoicingQboAccountMappingSlot = (code) => code.replace(/_id$/, '');
+/** Read one account-mapping dropdown value by its config `code`. */
 export function getInvoicingQboAccountMappingId(accountMappings, code) {
-    switch (code) {
-        case 'deposit_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.deposit_account, accountMappings?.deposit_account_id);
-        case 'default_income_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.default_income_account, accountMappings?.default_income_account_id);
-        case 'discounts_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.discounts_account, accountMappings?.discounts_account_id);
-        case 'rounding_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.rounding_account, accountMappings?.rounding_account_id);
-        case 'write_off_account_id':
-            return readInvoicingQboMappedAccountId(accountMappings?.write_off_account, accountMappings?.write_off_account_id);
-        default:
-            return undefined;
+    const slotKey = toInvoicingQboAccountMappingSlot(code);
+    // Either key: the service sends `deposit_account`, but an older payload put
+    // the id under `deposit_account_id`.
+    const slot = accountMappings?.[slotKey] ?? accountMappings?.[`${slotKey}_id`];
+    if (typeof slot === 'string') {
+        return slot !== '' ? slot : undefined;
     }
+    return firstSelectableInvoicingId([slot?.qbo_id, slot?.account_id]);
 }
 /**
- * Return a copy of the account mappings with the dropdown slot named by
- * `code` set to `accountId`. Unknown codes leave the mappings unchanged.
+ * Build the `account_mappings` request body from the ids the pickers submitted.
+ * Each kind is sent as the whole account, which is what the service stores; an
+ * id that resolves to no account is sent as it stands rather than dropped, so a
+ * save never silently unsets a mapping it could not expand.
  */
-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.
-    const base = accountMappings ?? {};
-    switch (code) {
-        case 'deposit_account_id':
-            return {
-                ...base,
-                deposit_account: undefined,
-                deposit_account_id: accountId,
-            };
-        case 'default_income_account_id':
-            return {
-                ...base,
-                default_income_account: undefined,
-                default_income_account_id: accountId,
-            };
-        case 'discounts_account_id':
-            return {
-                ...base,
-                discounts_account: undefined,
-                discounts_account_id: accountId,
-            };
-        case 'rounding_account_id':
-            return {
-                ...base,
-                rounding_account: undefined,
-                rounding_account_id: accountId,
-            };
-        case 'write_off_account_id':
-            return {
-                ...base,
-                write_off_account: undefined,
-                write_off_account_id: accountId,
-            };
-        default:
-            return base;
-    }
-}
+export const toInvoicingQboAccountMappingsPayload = (accountIdByMappingCode, accountForId) => {
+    const mappings = {};
+    Object.entries(accountIdByMappingCode).forEach(([code, accountId]) => {
+        if (accountId === '') {
+            return;
+        }
+        const account = accountForId(accountId);
+        mappings[toInvoicingQboAccountMappingSlot(code)] =
+            account != null ? toAccountPayload(account) : accountId;
+    });
+    return mappings;
+};
 export function toInvoicingQboAccountMappingKindOption(option) {
     return {
         accountTypes: option.account_types,

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/epic.js

@@ -310,8 +310,12 @@ import { issueCreditNoteEpic } from './view/invoicing/issueCreditNote/issueCredi
 import { runInvoicingPaymentActionEpic, } from './view/invoicing/paymentAction/paymentActionEpic';
 import { addPromotionalCreditsEpic, } from './view/invoicing/promotionalCreditAction/promotionalCreditActionEpic';
 import { recordPaymentEpic, } from './view/invoicing/recordPayment/recordPaymentEpic';
+import { connectInvoicingStripeEpic } from './view/invoicing/settingsView/epics/connectInvoicingStripeEpic';
+import { disconnectInvoicingStripeEpic } from './view/invoicing/settingsView/epics/disconnectInvoicingStripeEpic';
+import { fetchInvoicingSettingsEpic } from './view/invoicing/settingsView/epics/fetchInvoicingSettingsEpic';
+import { saveInvoicingSettingsEpic } from './view/invoicing/settingsView/epics/saveInvoicingSettingsEpic';
+import { submitInvoicingQboSettingsEpic } from './view/invoicing/settingsView/epics/submitInvoicingQboSettingsEpic';
 import { initializeInvoicingBrandingAddressEpic, submitInvoicingBrandingFormEpic, } from './view/invoicing/settingsView/invoicingBrandingFormEpics';
-import { connectInvoicingStripeEpic, disconnectInvoicingStripeEpic, fetchInvoicingSettingsEpic, saveInvoicingSettingsEpic, } from './view/invoicing/settingsView/settingsViewEpics';
 import { runInvoicingSubscriptionActionEpic, } from './view/invoicing/subscriptionAction/subscriptionActionEpic';
 import { fetchMonthClosePerformanceTrendEpic, } from './view/monthEndCloseChecksView/epics/fetchMonthClosePerformanceTrendEpic';
 import { fetchMonthEndCloseChecksEpic, } from './view/monthEndCloseChecksView/epics/fetchMonthEndCloseChecksEpic';
@@ -1357,6 +1361,7 @@ const ALL_EPICS = [
     submitFeedbackEpic,
     submitIntlVerificationEpic,
     submitInvoicingBrandingFormEpic,
+    submitInvoicingQboSettingsEpic,
     submitQuestionEpic,
     syncInvoicingSubscriptionCouponsEpic,
     syncTabsAfterAutomatchEpic,

package/lib/esm/index.js

@@ -194,11 +194,11 @@ import { getExpenseAutomationTransactionView, getLastTransferEntryReplacement, }
 import { applyTransactionFilters } from './view/expenseAutomationView/transactionFilterHelpers';
 import { TRANSACTION_FILTER_CATEGORIES, } from './view/expenseAutomationView/transactionFilterTypes';
 import { DEFAULT_COMPLETED_SUB_TAB, toCompletedSubTab, } from './view/expenseAutomationView/types/completedSubTab';
-import { DEFAULT_TRANSACTION_GROUP, TRANSACTION_GROUPS, toTransactionGroup, } from './view/expenseAutomationView/types/transactionGroup';
 import { toJEScheduleMainTab as toExpenseAutomationJEScheduleMainTab, toJEScheduleSortKey as toExpenseAutomationJEScheduleSortKey, } from './view/expenseAutomationView/types/jeSchedulesViewState';
 import { BATCH_FILE_STATUSES, isUnmatchedTabFileStatus, toBatchFileStatus, toBatchStatusValue, toBulkUploadPhase, toBulkUploadResultsTab, toBulkUploadSortKey, toMatchSource, toMissingReceiptsTab, } from './view/expenseAutomationView/types/missingReceiptsViewState';
 import { toMissingReceiptsSortKey as toExpenseAutomationMissingReceiptsSortKey, } from './view/expenseAutomationView/types/missingReceiptsViewState';
 import { toReconciliationTabsType, } from './view/expenseAutomationView/types/reconciliationViewState';
+import { DEFAULT_TRANSACTION_GROUP, TRANSACTION_GROUPS, toTransactionGroup, } from './view/expenseAutomationView/types/transactionGroup';
 import { toTransactionsTabKey as toExpenseAutomationTransactionsTabKey, toTransactionsSortKey, } from './view/expenseAutomationView/types/transactionsViewState';
 import { fetchRegisteredInterests, notifyMeForFeature, } from './view/featureNotificationView/featureNotificationViewReducer';
 import { getFeatureNotificationView, getRegisteredInterests, getRegisteredInterestsByFeature, isFeatureInterestRegistered, } from './view/featureNotificationView/featureNotificationViewSelector';
@@ -849,15 +849,16 @@ export { getInvoicingCatalogItemDetail } from './view/invoicing/invoicingCatalog
 export { getInvoicingPlanById } from './entity/invoicing/plan/planSelector';
 export { getInvoicingProductById } from './entity/invoicing/product/productSelector';
 // ── Invoicing: settings ───────────────────────────────────────────────────────
-export { connectInvoicingStripe, disconnectInvoicingStripe, fetchInvoicingSettings, resetInvoicingBrandingFormDraft, resetSaveInvoicingSettings, saveInvoicingSettings, submitInvoicingBrandingForm, updateInvoicingBrandingFormDraft, updateInvoicingSettings, } from './view/invoicing/settingsView/settingsViewReducer';
-export { getInvoicingBrandingFormView, getInvoicingSettings, getInvoicingSettingsFetchState, getInvoicingSettingsHubView, getInvoicingSettingsView, } from './view/invoicing/settingsView/settingsViewSelector';
+export { connectInvoicingStripe, disconnectInvoicingStripe, fetchInvoicingSettings, resetInvoicingBrandingFormDraft, resetInvoicingQboSettingsDraft, resetSaveInvoicingSettings, saveInvoicingSettings, submitInvoicingBrandingForm, submitInvoicingQboSettings, updateInvoicingBrandingFormDraft, updateInvoicingQboSettingsDraft, updateInvoicingSettings, } from './view/invoicing/settingsView/settingsViewReducer';
+export { getInvoicingBrandingFormView, getInvoicingQboSettingsFormView, getInvoicingSettings, getInvoicingSettingsFetchState, getInvoicingSettingsHubView, getInvoicingSettingsView, } from './view/invoicing/settingsView/settingsViewSelector';
+export { entityToInvoicingQboSettingsLocalData, initialInvoicingQboSettingsLocalData, invoicingQboSettingsLocalDataToPayload, } from './view/invoicing/settingsView/invoicingQboSettingsFormConfig';
 export { INVOICING_BUSINESS_ADDRESS_TYPE, entityToInvoicingBrandingFormLocalData, initialInvoicingBrandingFormLocalData, } from './view/invoicing/settingsView/invoicingBrandingFormConfig';
 export { isStripeConnectedFromSettings } from './view/invoicing/settingsView/invoicingSettingsHelpers';
 // ── Invoicing: QBO integration ────────────────────────────────────────────────
 export { fetchInvoicingAccountingPickers, fetchInvoicingQboConnection, fetchInvoicingQboSyncHealth, retryInvoicingQboSyncTask, startInvoicingQboBackfill, } from './view/invoicing/invoicingQboView/invoicingQboViewReducer';
 export { INVOICING_INCOME_ACCOUNT_TYPES, invoicingAccountsForQboAccountTypes, } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
 export { getInvoicingQboView } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
-export { INVOICING_QBO_CUSTOMER_MATCHING_MODES, getInvoicingQboAccountMappingId, toInvoicingNamedOptionsByKey, toInvoicingQboCustomerMatchingMode, withInvoicingQboAccountMappingId, } from './entity/invoicing/invoicingCommonPayload';
+export { INVOICING_QBO_CUSTOMER_MATCHING_MODES, getInvoicingQboAccountMappingId, toInvoicingNamedOptionsByKey, toInvoicingQboCustomerMatchingMode, } from './entity/invoicing/invoicingCommonPayload';
 // ── Invoicing: config ─────────────────────────────────────────────────────────
 export { acceptInvoicingTerms, enableInvoicing, fetchInvoicingConfig, resetInvoicingConfigActionStates, updateInvoicingConfig, } from './view/invoicing/invoicingConfigView/invoicingConfigViewReducer';
 export { getInvoicingConfigView } from './view/invoicing/invoicingConfigView/invoicingConfigViewSelector';