@zeniai/client-epic-state 5.2.8 → 5.2.9

package/lib/esm/view/invoicing/dataImportView/dataImportViewReducer.js

@@ -98,6 +98,16 @@ const dataImportView = createSlice({
                 nextCursor: current?.nextCursor ?? null,
             };
         },
+        clearInvoicingDataImportView(draft) {
+            draft.activeDetailId = null;
+            draft.sessions = [];
+            draft.sessionsFetch = { fetchState: 'Not-Started', error: undefined };
+            draft.statusRows = [];
+            draft.statusFetch = { fetchState: 'Not-Started', error: undefined };
+            draft.sessionDetail = {};
+            draft.sessionDetailFetch = { fetchState: 'Not-Started', error: undefined };
+            draft.diagnosticsBySession = {};
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(clearAll, (draft) => {
@@ -112,5 +122,5 @@ const dataImportView = createSlice({
         });
     },
 });
-export const { fetchInvoicingMigrationSessions, updateInvoicingMigrationSessions, updateInvoicingMigrationSessionsFailure, fetchInvoicingDataImportStatus, updateInvoicingDataImportStatus, updateInvoicingDataImportStatusFailure, fetchInvoicingMigrationSession, setInvoicingActiveMigrationSessionId, updateInvoicingMigrationSessionFailure, upsertInvoicingMigrationSession, fetchInvoicingMigrationDiagnostics, updateInvoicingMigrationDiagnostics, updateInvoicingMigrationDiagnosticsFailure, } = dataImportView.actions;
+export const { fetchInvoicingMigrationSessions, updateInvoicingMigrationSessions, updateInvoicingMigrationSessionsFailure, fetchInvoicingDataImportStatus, updateInvoicingDataImportStatus, updateInvoicingDataImportStatusFailure, fetchInvoicingMigrationSession, setInvoicingActiveMigrationSessionId, updateInvoicingMigrationSessionFailure, upsertInvoicingMigrationSession, fetchInvoicingMigrationDiagnostics, updateInvoicingMigrationDiagnostics, updateInvoicingMigrationDiagnosticsFailure, clearInvoicingDataImportView, } = dataImportView.actions;
 export default dataImportView.reducer;

package/lib/esm/view/invoicing/discountAction/discountActionReducer.js

@@ -25,6 +25,12 @@ const discountAction = createSlice({
                 error: action.payload.error,
             };
         },
+        clearInvoicingDiscountAction(draft, action) {
+            delete draft.byId[action.payload];
+        },
+        clearAllInvoicingDiscountActions(draft) {
+            draft.byId = {};
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(clearAll, (draft) => {
@@ -32,5 +38,5 @@ const discountAction = createSlice({
         });
     },
 });
-export const { runInvoicingDiscountAction, runInvoicingDiscountActionSuccess, runInvoicingDiscountActionFailure, } = discountAction.actions;
+export const { runInvoicingDiscountAction, runInvoicingDiscountActionSuccess, runInvoicingDiscountActionFailure, clearInvoicingDiscountAction, clearAllInvoicingDiscountActions, } = discountAction.actions;
 export default discountAction.reducer;

package/lib/esm/view/invoicing/dunningAction/dunningActionReducer.js

@@ -25,6 +25,12 @@ const dunningAction = createSlice({
                 error: action.payload.error,
             };
         },
+        clearInvoicingDunningAction(draft, action) {
+            delete draft.byId[action.payload];
+        },
+        clearAllInvoicingDunningActions(draft) {
+            draft.byId = {};
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(clearAll, (draft) => {
@@ -32,5 +38,5 @@ const dunningAction = createSlice({
         });
     },
 });
-export const { runInvoicingDunningAction, runInvoicingDunningActionSuccess, runInvoicingDunningActionFailure, } = dunningAction.actions;
+export const { runInvoicingDunningAction, runInvoicingDunningActionSuccess, runInvoicingDunningActionFailure, clearInvoicingDunningAction, clearAllInvoicingDunningActions, } = dunningAction.actions;
 export default dunningAction.reducer;

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

@@ -80,7 +80,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
     }
     return payload;
 };
-/** `unit` is the item's unit of measure, not a currency; `CURRENCY_CODE` above prices Price points. */
+/** `unit` is the item's unit of measure, not a currency; `CURRENCY_CODE` above prices sub-families. */
 const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
 /**
  * Build the parent catalog-item request body from the form draft. Creates omit

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

@@ -1,8 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
-import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
-import { INVOICING_INCOME_ACCOUNT_TYPES, getInvoicingQboView, invoicingAccountHierarchyForTypes, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
-import { INVOICING_CATALOG_APPLICABILITY_VALUES, INVOICING_CATALOG_PRICING_MODEL_VALUES, INVOICING_CATALOG_PRORATION_VALUES, INVOICING_CATALOG_TIER_TYPE_VALUES, entityToInvoicingCatalogItemFormLocalData, } from './invoicingCatalogItemFormConfig';
+import { INVOICING_CATALOG_APPLICABILITY_VALUES, INVOICING_CATALOG_PERIOD_UNIT_VALUES, INVOICING_CATALOG_PRICING_MODEL_VALUES, INVOICING_CATALOG_PRORATION_VALUES, INVOICING_CATALOG_TIER_TYPE_VALUES, INVOICING_CATALOG_TRIAL_END_ACTION_VALUES, INVOICING_CATALOG_TRIAL_UNIT_VALUES, INVOICING_CATALOG_TYPE_VALUES, entityToInvoicingCatalogItemFormLocalData, } from './invoicingCatalogItemFormConfig';
 export const getEditInvoicingCatalogItemDetailViewState = (state) => ({
     fetchState: state.editInvoicingCatalogItemDetailViewState.fetchState,
     error: state.editInvoicingCatalogItemDetailViewState.error,
@@ -49,29 +47,18 @@ export const getInvoicingCatalogItemFormView = (state, id) => {
     const applicableItemOptions = id != null
         ? allApplicableItemOptions.filter((option) => option.id !== id)
         : allApplicableItemOptions;
-    const isQboConnected = isInvoicingQboConnected(state);
-    const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = getInvoicingConfigView(state);
     return {
-        fieldHelp: invoicingFieldHelpForGroup(state, 'catalog'),
-        isQboPickerDataLoading: isInvoicingAccountingPickerDataLoading(state),
-        qboClassHierarchy: isQboConnected
-            ? getInvoicingQboView(state).nestedClassHierarchy
-            : [],
-        qboIncomeAccountHierarchy: isQboConnected
-            ? invoicingAccountHierarchyForTypes(state, INVOICING_INCOME_ACCOUNT_TYPES)
-            : [],
         applicabilityValues: INVOICING_CATALOG_APPLICABILITY_VALUES,
         applicableItemOptions,
         localData,
         mode: id != null ? 'edit' : 'create',
-        periodUnitOptions: billingPeriodUnitOptions,
+        periodUnitValues: INVOICING_CATALOG_PERIOD_UNIT_VALUES,
         pricingModelValues: INVOICING_CATALOG_PRICING_MODEL_VALUES,
         prorationValues: INVOICING_CATALOG_PRORATION_VALUES,
         tierTypeValues: INVOICING_CATALOG_TIER_TYPE_VALUES,
-        trialEndActionOptions: catalogTrialEndActionOptions,
-        trialUnitOptions: catalogTrialUnitOptions,
-        typeOptions: catalogItemTypeOptions,
-        catalogTierTypeOptionsByPricingModel,
+        trialEndActionValues: INVOICING_CATALOG_TRIAL_END_ACTION_VALUES,
+        trialUnitValues: INVOICING_CATALOG_TRIAL_UNIT_VALUES,
+        typeValues: INVOICING_CATALOG_TYPE_VALUES,
         kind,
         plan,
         savedItemId,

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

@@ -1,8 +1,18 @@
 /**
- * Value sets the catalog item form still owns locally: the backend has no enum
- * for pricing model, tier type, proration or applicability yet, so these stay
- * here until it does. Everything else on this form comes from `/1.0/config`.
+ * Canonical value sets for the catalog item form. CES owns the values;
+ * web-components maps each value to a localized label.
  */
+export const INVOICING_CATALOG_TYPE_VALUES = [
+    'plan',
+    'addon',
+    'charge',
+];
+export const INVOICING_CATALOG_PERIOD_UNIT_VALUES = [
+    'day',
+    'week',
+    'month',
+    'year',
+];
 export const INVOICING_CATALOG_PRICING_MODEL_VALUES = [
     'flat_fee',
     'per_unit',
@@ -15,6 +25,12 @@ export const INVOICING_CATALOG_TIER_TYPE_VALUES = [
     'flat_fee',
     'package',
 ];
+export const INVOICING_CATALOG_TRIAL_UNIT_VALUES = ['day', 'month'];
+export const INVOICING_CATALOG_TRIAL_END_ACTION_VALUES = [
+    'site_default',
+    'activate_subscription',
+    'cancel_subscription',
+];
 export const INVOICING_CATALOG_PRORATION_VALUES = [
     'site_default',
     'partial_term',
@@ -105,7 +121,7 @@ export const initialInvoicingCatalogItemFormLocalData = {
     unit: '',
 };
 /**
- * Seed the form draft from a parent catalog item and its embedded Price points.
+ * Seed the form draft from a parent catalog item and its embedded sub-families.
  */
 export const entityToInvoicingCatalogItemFormLocalData = (item) => {
     if (item == null) {

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

@@ -1,6 +1,5 @@
+import { INVOICING_COUPON_APPLY_ON_OPTIONS, INVOICING_COUPON_DURATION_TYPE_OPTIONS, INVOICING_COUPON_PERIOD_UNIT_OPTIONS, INVOICING_DISCOUNT_TYPE_OPTIONS, } from '../../../entity/invoicing/coupon/couponConstants';
 import { getInvoicingCouponById } from '../../../entity/invoicing/coupon/couponSelector';
-import { toInvoicingFormOption, } from '../../../entity/invoicing/invoicingCommonPayload';
-import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { entityToInvoicingCouponFormLocalData, } from './editInvoicingCouponDetailViewState';
 /**
  * Bundled view for the discount create/edit form: the save fetch state/error,
@@ -9,10 +8,7 @@ import { entityToInvoicingCouponFormLocalData, } from './editInvoicingCouponDeta
  */
 export const getEditInvoicingCouponDetailViewState = (state, couponId) => {
     const { error, fetchState, savedCouponId } = state.editInvoicingCouponDetailViewState;
-    const { discountLifecycleActionOptions, fetchState: configFetchState } = getInvoicingConfigView(state);
     return {
-        configFetchState,
-        discountLifecycleActionOptions,
         coupon: couponId != null
             ? getInvoicingCouponById(state.invoicingCouponState, couponId)
             : undefined,
@@ -35,15 +31,13 @@ export const getInvoicingCouponFormView = (state, couponId) => {
         ? (editDraftById[couponId] ??
             entityToInvoicingCouponFormLocalData(base.coupon))
         : newCouponDraft;
-    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = getInvoicingConfigView(state);
     return {
-        fieldHelp: invoicingFieldHelpForGroup(state, 'discount'),
         ...base,
-        applyOnOptions: discountApplyOnOptions.map(toInvoicingFormOption),
-        discountTypeOptions: discountTypeOptions.map(toInvoicingFormOption),
-        durationTypeOptions: discountDurationTypeOptions.map(toInvoicingFormOption),
+        applyOnOptions: INVOICING_COUPON_APPLY_ON_OPTIONS,
+        discountTypeOptions: INVOICING_DISCOUNT_TYPE_OPTIONS,
+        durationTypeOptions: INVOICING_COUPON_DURATION_TYPE_OPTIONS,
         localData,
         mode: couponId != null ? 'edit' : 'create',
-        periodUnitOptions: billingPeriodUnitOptions.map(toInvoicingFormOption),
+        periodUnitOptions: INVOICING_COUPON_PERIOD_UNIT_OPTIONS,
     };
 };

package/lib/esm/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewSelector.js

@@ -1,7 +1,6 @@
 import { getInvoicingCustomerById } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector';
 import { getFormattedAddress } from '../../addressView/addressViewSelector';
-import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
-import { INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE, entityToInvoicingCustomerFormLocalData, } from './invoicingCustomerFormConfig';
+import { INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE, INVOICING_CUSTOMER_TYPE_VALUES, INVOICING_NET_TERM_DAY_VALUES, INVOICING_TAXABILITY_VALUES, entityToInvoicingCustomerFormLocalData, } from './invoicingCustomerFormConfig';
 /**
  * Bundled view for the customer create/edit form. Exposes the draft `localData`
  * (seeded from the existing customer entity in edit mode until the user edits),
@@ -27,14 +26,12 @@ export const getInvoicingCustomerFormView = (state, invoicingCustomerID) => {
     const billingAddressLabel = newAddress?.addressToCreate != null
         ? getFormattedAddress(newAddress.addressToCreate)
         : undefined;
-    const { customerTypeOptions, netTermDayOptions, taxabilityOptions } = getInvoicingConfigView(state);
     return {
-        fieldHelp: invoicingFieldHelpForGroup(state, 'customer'),
-        customerTypeOptions,
+        customerTypeValues: [...INVOICING_CUSTOMER_TYPE_VALUES],
         localData,
         mode,
-        netTermDayOptions,
-        taxabilityOptions,
+        netTermDayValues: [...INVOICING_NET_TERM_DAY_VALUES],
+        taxabilityValues: [...INVOICING_TAXABILITY_VALUES],
         billingAddressId,
         billingAddressLabel,
         savedCustomerId,

package/lib/esm/view/invoicing/editInvoicingCustomerDetailView/invoicingCustomerFormConfig.js

@@ -1,5 +1,22 @@
 /** `AddressType` key used when the customer form opens the shared Address screen. */
 export const INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE = 'invoicing_customer_billing_address';
+/**
+ * Canonical option value sets for the customer form. CES owns the values;
+ * web-components maps each value to a localized label (same split as the
+ * invoicing list column/tab config).
+ */
+export const INVOICING_CUSTOMER_TYPE_VALUES = [
+    'business',
+    'residential',
+];
+export const INVOICING_TAXABILITY_VALUES = ['taxable', 'exempt'];
+export const INVOICING_NET_TERM_DAY_VALUES = [
+    '0',
+    '15',
+    '30',
+    '45',
+    '60',
+];
 export const initialInvoicingCustomerFormLocalData = {
     autoCollection: true,
     company: '',

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewPayload.js

@@ -1,55 +1,42 @@
 import { toAddressUpdatableInfoPayload } from '../../addressView/addressViewPayload';
-import { invoicingSubscriptionTodayIso, toInvoicingSubscriptionBillingCycles, toInvoicingSubscriptionQuantity, } from './invoicingSubscriptionFormConfig';
+import { billingFrequencyToPeriod } from './invoicingSubscriptionFormConfig';
 /**
  * Build the create/update subscription request body from the form draft. The
  * shipping address is sent as an object (captured via the shared Address
  * screen); the backend persists it — same pattern as the customer save flow.
- *
- * `remaining_billing_cycles` is omitted when the user left the field empty, so
- * the backend applies the plan's own `billing_cycles` (or renews forever when
- * the plan sets no limit) rather than being pinned to a value the form invented.
- *
- * `billing_period` / `billing_period_unit` are deliberately absent. Billing
- * cadence is a property of the selected price point, not of the subscription,
- * and the backend derives it from that price point when the fields are omitted.
- * Sending them made every price point whose cadence the form could not express
- * — a daily plan, for instance — fail with a 422.
  */
 export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingAddress) => {
+    const frequency = billingFrequencyToPeriod(localData.billingFrequency);
     const items = [
         {
             item_price_code: localData.planPriceCode,
             item_type: 'plan',
-            quantity: toInvoicingSubscriptionQuantity(localData.planQuantity),
+            quantity: Math.max(1, localData.planQuantity || 1),
         },
         ...localData.addonPriceCodes.map((priceCode) => ({
             item_price_code: priceCode,
             item_type: 'addon',
-            quantity: toInvoicingSubscriptionQuantity(localData.addonQuantities[priceCode]),
+            quantity: 1,
         })),
         ...localData.chargePriceCodes.map((priceCode) => ({
             item_price_code: priceCode,
             item_type: 'charge',
-            quantity: toInvoicingSubscriptionQuantity(localData.chargeQuantities[priceCode]),
+            quantity: 1,
         })),
     ];
     const setupFee = localData.setupFee?.amount;
     const poNumber = localData.poNumber.trim();
     const trialEnd = localData.trialEnd.trim();
-    const startedAt = localData.startedAt.trim();
-    const remainingBillingCycles = toInvoicingSubscriptionBillingCycles(localData.remainingBillingCycles);
     return {
         auto_collection: localData.autoCollection ? 'on' : 'off',
+        billing_period: frequency.period,
+        billing_period_unit: frequency.unit,
         currency_code: localData.preferredCurrencyCode,
         customer_id: localData.customerId,
-        started_at: startedAt !== '' ? startedAt : invoicingSubscriptionTodayIso(),
         subscription_items: items,
         ...(setupFee != null ? { setup_fee: setupFee } : {}),
         ...(poNumber !== '' ? { po_number: poNumber } : {}),
         ...(trialEnd !== '' ? { trial_end: trialEnd } : {}),
-        ...(remainingBillingCycles != null
-            ? { remaining_billing_cycles: remainingBillingCycles }
-            : {}),
         ...(localData.couponId !== '' ? { coupon_ids: [localData.couponId] } : {}),
         ...(shippingAddress != null
             ? { shipping_address: toAddressUpdatableInfoPayload(shippingAddress) }

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewSelector.js

@@ -2,16 +2,11 @@ import { getInvoicingSubscriptionById } from '../../../entity/invoicing/invoicin
 import { getFormattedAddress } from '../../addressView/addressViewSelector';
 import { getInvoicingCouponListItems } from '../couponView/couponViewSelector';
 import { getInvoicingCatalogListView, getInvoicingCatalogPrices, } from '../invoicingCatalogListView/invoicingCatalogListViewSelector';
-import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingCustomerListView } from '../invoicingCustomerListView/invoicingCustomerListViewSelector';
-import { INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE, entityToInvoicingSubscriptionFormLocalData, } from './invoicingSubscriptionFormConfig';
+import { INVOICING_SUBSCRIPTION_BILLING_FREQUENCY_VALUES, INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE, entityToInvoicingSubscriptionFormLocalData, } from './invoicingSubscriptionFormConfig';
 export const getEditInvoicingSubscriptionDetailViewState = (state, invoicingSubscriptionID) => {
     const { error, fetchState, savedSubscriptionId } = state.editInvoicingSubscriptionDetailViewState;
-    const { subscriptionCommercialEditAllowedFromStatuses, subscriptionLifecycleActionOptions, subscriptionMetadataEditAllowedFromStatuses, } = getInvoicingConfigView(state);
     return {
-        subscriptionCommercialEditAllowedFromStatuses,
-        subscriptionLifecycleActionOptions,
-        subscriptionMetadataEditAllowedFromStatuses,
         subscription: invoicingSubscriptionID != null
             ? getInvoicingSubscriptionById(state.invoicingSubscriptionState, invoicingSubscriptionID)
             : undefined,
@@ -42,7 +37,9 @@ export const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID)
     const planPrices = getInvoicingCatalogPrices(catalogListView.plans);
     const addonAndChargePrices = getInvoicingCatalogPrices(catalogListView.products);
     return {
-        fieldHelp: invoicingFieldHelpForGroup(state, 'subscription'),
+        billingFrequencyValues: [
+            ...INVOICING_SUBSCRIPTION_BILLING_FREQUENCY_VALUES,
+        ],
         coupons: getInvoicingCouponListItems(state),
         customers: getInvoicingCustomerListView(state).customers,
         localData,

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/invoicingSubscriptionFormConfig.js

@@ -1,66 +1,49 @@
-import { dateNow } from '../../../zeniDayJS';
 /** `AddressType` key used when the subscription form opens the shared Address screen. */
 export const INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = 'invoicing_subscription_shipping_address';
-const subscriptionItemPriceCodes = (subscription, itemType) => subscription?.subscriptionItems
-    ?.filter((item) => item.itemType === itemType)
-    .map((item) => item.itemPriceCode)
-    .filter((code) => code != null && code !== '') ?? [];
-const subscriptionItemQuantities = (subscription, itemType) => {
-    const quantities = {};
-    subscription?.subscriptionItems
-        ?.filter((item) => item.itemType === itemType)
-        .forEach((item) => {
-        if (item.itemPriceCode != null && item.itemPriceCode !== '') {
-            quantities[item.itemPriceCode] = toInvoicingSubscriptionQuantity(item.quantity);
-        }
-    });
-    return quantities;
-};
-/**
- * Today as `YYYY-MM-DD`, the default subscription start date. Goes through
- * dayjs (not `toISOString`, which is UTC) so a user in a UTC+ timezone late in
- * their day gets their own calendar date rather than yesterday's.
- */
-export const invoicingSubscriptionTodayIso = () => dateNow().format('YYYY-MM-DD');
 /**
- * Clamp a subscription-item quantity to the minimum the API accepts. Shared by
- * the plan, add-on and charge items so none of them can bill a 0 or a fraction.
+ * Canonical billing-frequency value set for the subscription form. CES owns the
+ * values (and their period/unit mapping); web-components maps each value to a
+ * localized label (same split as the customer form's value sets).
  */
-export const toInvoicingSubscriptionQuantity = (quantity) => {
-    const whole = Math.floor(Number(quantity));
-    return Number.isFinite(whole) && whole > 0 ? whole : 1;
+export const INVOICING_SUBSCRIPTION_BILLING_FREQUENCY_VALUES = [
+    'weekly',
+    'monthly',
+    'quarterly',
+    'half_yearly',
+    'yearly',
+];
+const BILLING_FREQUENCY_TO_PERIOD = {
+    weekly: { period: 1, unit: 'week' },
+    monthly: { period: 1, unit: 'month' },
+    quarterly: { period: 3, unit: 'month' },
+    half_yearly: { period: 6, unit: 'month' },
+    yearly: { period: 1, unit: 'year' },
 };
-/**
- * Parse the billing-cycles field into what the API should receive, or
- * `undefined` when the field is empty or unparseable (the payload then omits it
- * so the backend applies the plan's own limit).
- *
- * Deliberately NOT `toInvoicingSubscriptionQuantity`: `0` is a real
- * remaining-cycles value on a subscription serving its last paid term, and edit
- * drafts seed it straight off the entity. Clamping it up to `1` would turn a
- * no-op save of a non-renewing subscription into a one-cycle extension.
- */
-export const toInvoicingSubscriptionBillingCycles = (remainingBillingCycles) => {
-    if (remainingBillingCycles.trim() === '') {
-        return undefined;
-    }
-    const whole = Math.floor(Number(remainingBillingCycles));
-    return Number.isFinite(whole) && whole >= 0 ? whole : undefined;
+/** Map a billing-frequency value to its API `billing_period` / `billing_period_unit`. */
+export const billingFrequencyToPeriod = (value) => BILLING_FREQUENCY_TO_PERIOD[value] ?? BILLING_FREQUENCY_TO_PERIOD.monthly;
+/** Map an existing subscription's period/unit back to a billing-frequency value. */
+export const periodToBillingFrequency = (period, unit) => {
+    const match = INVOICING_SUBSCRIPTION_BILLING_FREQUENCY_VALUES.find((value) => {
+        const mapped = BILLING_FREQUENCY_TO_PERIOD[value];
+        return mapped.period === period && mapped.unit === unit;
+    });
+    return match ?? 'monthly';
 };
+const subscriptionItemPriceCodes = (subscription, itemType) => subscription?.subscriptionItems
+    ?.filter((item) => item.itemType === itemType)
+    .map((item) => item.itemPriceCode)
+    .filter((code) => code != null && code !== '') ?? [];
 export const initialInvoicingSubscriptionFormLocalData = {
     addonPriceCodes: [],
-    addonQuantities: {},
     autoCollection: true,
+    billingFrequency: 'monthly',
     chargePriceCodes: [],
-    chargeQuantities: {},
     couponId: '',
     customerId: '',
     planPriceCode: '',
     planQuantity: 1,
     poNumber: '',
     preferredCurrencyCode: 'USD',
-    remainingBillingCycles: '',
-    startedAt: '',
     trialEnd: '',
 };
 /** Seed the form draft from an existing subscription entity (edit mode). */
@@ -71,25 +54,18 @@ export const entityToInvoicingSubscriptionFormLocalData = (subscription) => {
     const planItem = subscription.subscriptionItems?.find((item) => item.itemType === 'plan');
     return {
         addonPriceCodes: subscriptionItemPriceCodes(subscription, 'addon'),
-        addonQuantities: subscriptionItemQuantities(subscription, 'addon'),
         autoCollection: (subscription.autoCollection ?? 'on') === 'on',
+        billingFrequency: periodToBillingFrequency(subscription.billingPeriod, subscription.billingPeriodUnit),
         chargePriceCodes: subscriptionItemPriceCodes(subscription, 'charge'),
-        chargeQuantities: subscriptionItemQuantities(subscription, 'charge'),
         couponId: subscription.coupons?.[0]?.couponCode ??
             subscription.coupons?.[0]?.couponID ??
             '',
         customerId: subscription.customerID ?? '',
         planPriceCode: subscriptionItemPriceCodes(subscription, 'plan')[0] ?? '',
-        planQuantity: toInvoicingSubscriptionQuantity(planItem?.quantity),
+        planQuantity: planItem?.quantity ?? 1,
         poNumber: subscription.poNumber ?? '',
         preferredCurrencyCode: subscription.currencyCode ?? 'USD',
-        remainingBillingCycles: subscription.remainingBillingCycles != null
-            ? String(subscription.remainingBillingCycles)
-            : '',
         setupFee: subscription.setupFee,
-        startedAt: subscription.startedAt != null
-            ? subscription.startedAt.format('YYYY-MM-DD')
-            : '',
         trialEnd: subscription.trialEnd != null
             ? subscription.trialEnd.format('YYYY-MM-DD')
             : '',

package/lib/esm/view/invoicing/invoiceAction/invoiceActionReducer.js

@@ -31,6 +31,12 @@ const invoiceAction = createSlice({
                 error: undefined,
             };
         },
+        clearInvoicingInvoiceAction(draft, action) {
+            delete draft.byInvoiceId[action.payload];
+        },
+        clearAllInvoicingInvoiceActions(draft) {
+            draft.byInvoiceId = {};
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(clearAll, (draft) => {
@@ -38,5 +44,5 @@ const invoiceAction = createSlice({
         });
     },
 });
-export const { runInvoicingInvoiceAction, runInvoicingInvoiceActionSuccess, runInvoicingInvoiceActionFailure, updateInvoicingInvoice, } = invoiceAction.actions;
+export const { runInvoicingInvoiceAction, runInvoicingInvoiceActionSuccess, runInvoicingInvoiceActionFailure, updateInvoicingInvoice, clearInvoicingInvoiceAction, clearAllInvoicingInvoiceActions, } = invoiceAction.actions;
 export default invoiceAction.reducer;

package/lib/esm/view/invoicing/invoiceDetail/invoiceDetailReducer.js

@@ -30,6 +30,9 @@ const invoiceDetail = createSlice({
             const { invoiceId, status } = action.payload;
             draft.detailById[invoiceId] = buildInvoiceDetail(invoiceId, 'Error', status);
         },
+        clearAllInvoiceDetail(draft) {
+            draft.detailById = {};
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(clearAll, (draft) => {
@@ -37,5 +40,5 @@ const invoiceDetail = createSlice({
         });
     },
 });
-export const { fetchInvoiceDetail, updateInvoiceDetail, updateInvoiceDetailFailure, } = invoiceDetail.actions;
+export const { fetchInvoiceDetail, updateInvoiceDetail, updateInvoiceDetailFailure, clearAllInvoiceDetail, } = invoiceDetail.actions;
 export default invoiceDetail.reducer;

package/lib/esm/view/invoicing/invoiceDetail/invoiceDetailSelector.js

@@ -2,12 +2,10 @@ import recordGet from 'lodash/get';
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoiceById } from '../../../entity/invoicing/invoice/invoiceSelector';
 import { getInvoicingInvoiceActionState } from '../invoiceAction/invoiceActionSelector';
-import { invoicingFieldHelpForGroup } from '../invoicingConfigView/invoicingConfigViewSelector';
 export const getInvoiceDetail = (state, invoiceId) => {
     const detail = recordGet(state.invoicingInvoiceDetailState.detailById, invoiceId, undefined);
     const invoice = getInvoiceById(state.invoicingInvoiceState, invoiceId);
     return {
-        fieldHelp: invoicingFieldHelpForGroup(state, 'invoice'),
         invoice,
         billingAddress: invoice?.billingAddressId != null
             ? getAddressByAddressId(state.addressState, invoice.billingAddressId)

package/lib/esm/view/invoicing/invoiceList/fetchInvoiceListPageEpic.js

@@ -1,7 +1,6 @@
 import { concat, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { fetchInvoiceCounts, fetchInvoiceKPIs, fetchInvoiceList, fetchInvoiceListPage, } from './invoiceListReducer';
-import { makeInvoiceTabState } from './invoiceListState';
 /**
  * Fetch unless the endpoint is already loaded or in flight — or always when the
  * caller forces a refresh via `cacheOverride` (e.g. on a filter/sort change).
@@ -17,7 +16,7 @@ const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
 export const fetchInvoiceListPageEpic = (actions$, state$) => actions$.pipe(filter(fetchInvoiceListPage.match), mergeMap((action) => {
     const { cacheOverride, filters, sort } = action.payload;
     const state = state$.value.invoicingInvoiceListState;
-    const activeTabState = state.invoiceByTab[state.activeTab] ?? makeInvoiceTabState();
+    const activeTabState = state.invoiceByTab[state.activeTab];
     const pageActions = [];
     if (shouldFetch({ fetchState: activeTabState.fetchState, error: activeTabState.error }, cacheOverride)) {
         pageActions.push(fetchInvoiceList({ filters, sort }));