@zeniai/client-epic-state 5.1.96-betaAK0 → 5.1.97

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 sub-families. */
+/** `unit` is the item's unit of measure, not a currency; `CURRENCY_CODE` above prices Price points. */
 const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
 /**
  * Build the parent catalog-item request body from the form draft. Creates omit

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

@@ -121,7 +121,7 @@ export const initialInvoicingCatalogItemFormLocalData = {
     unit: '',
 };
 /**
- * Seed the form draft from a parent catalog item and its embedded sub-families.
+ * Seed the form draft from a parent catalog item and its embedded Price points.
  */
 export const entityToInvoicingCatalogItemFormLocalData = (item) => {
     if (item == null) {

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

@@ -1,5 +1,5 @@
 import { toAddressUpdatableInfoPayload } from '../../addressView/addressViewPayload';
-import { billingFrequencyToPeriod, invoicingSubscriptionTodayIso, toInvoicingSubscriptionQuantity, } from './invoicingSubscriptionFormConfig';
+import { billingFrequencyToPeriod, invoicingSubscriptionTodayIso, toInvoicingSubscriptionBillingCycles, toInvoicingSubscriptionQuantity, } 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
@@ -32,7 +32,7 @@ export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingA
     const poNumber = localData.poNumber.trim();
     const trialEnd = localData.trialEnd.trim();
     const startedAt = localData.startedAt.trim();
-    const remainingBillingCycles = localData.remainingBillingCycles.trim();
+    const remainingBillingCycles = toInvoicingSubscriptionBillingCycles(localData.remainingBillingCycles);
     return {
         auto_collection: localData.autoCollection ? 'on' : 'off',
         billing_period: frequency.period,
@@ -44,10 +44,8 @@ export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingA
         ...(setupFee != null ? { setup_fee: setupFee } : {}),
         ...(poNumber !== '' ? { po_number: poNumber } : {}),
         ...(trialEnd !== '' ? { trial_end: trialEnd } : {}),
-        ...(remainingBillingCycles !== ''
-            ? {
-                remaining_billing_cycles: toInvoicingSubscriptionQuantity(Number(remainingBillingCycles)),
-            }
+        ...(remainingBillingCycles != null
+            ? { remaining_billing_cycles: remainingBillingCycles }
             : {}),
         ...(localData.couponId !== '' ? { coupon_ids: [localData.couponId] } : {}),
         ...(shippingAddress != null

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

@@ -1,3 +1,4 @@
+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';
 /**
@@ -44,8 +45,12 @@ const subscriptionItemQuantities = (subscription, itemType) => {
     });
     return quantities;
 };
-/** Today as `YYYY-MM-DD`, the default subscription start date. */
-export const invoicingSubscriptionTodayIso = () => new Date().toISOString().slice(0, 10);
+/**
+ * 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.
@@ -54,6 +59,23 @@ export const toInvoicingSubscriptionQuantity = (quantity) => {
     const whole = Math.floor(Number(quantity));
     return Number.isFinite(whole) && whole > 0 ? whole : 1;
 };
+/**
+ * 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;
+};
 export const initialInvoicingSubscriptionFormLocalData = {
     addonPriceCodes: [],
     addonQuantities: {},

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

@@ -79,7 +79,6 @@ export const getInvoicingSettingsHubView = (state) => {
         isEnablingInvoicing: enableState.fetchState === 'In-Progress',
         isQboConfigured,
         isStripeConnected,
-        status,
     };
 };
 /**

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

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

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

@@ -19,6 +19,6 @@ export declare const blankInvoicingCatalogSubFamily: () => InvoicingCatalogItemF
 export declare const invoicingProductToCatalogItemFormSubFamily: (product?: InvoicingProduct) => InvoicingCatalogItemFormSubFamily;
 export declare const initialInvoicingCatalogItemFormLocalData: InvoicingCatalogItemFormLocalData;
 /**
- * Seed the form draft from a parent catalog item and its embedded sub-families.
+ * Seed the form draft from a parent catalog item and its embedded Price points.
  */
 export declare const entityToInvoicingCatalogItemFormLocalData: (item?: InvoicingPlan) => InvoicingCatalogItemFormLocalData;

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

@@ -128,7 +128,7 @@ exports.initialInvoicingCatalogItemFormLocalData = {
     unit: '',
 };
 /**
- * Seed the form draft from a parent catalog item and its embedded sub-families.
+ * Seed the form draft from a parent catalog item and its embedded Price points.
  */
 const entityToInvoicingCatalogItemFormLocalData = (item) => {
     if (item == null) {

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

@@ -35,7 +35,7 @@ const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingAddress)
     const poNumber = localData.poNumber.trim();
     const trialEnd = localData.trialEnd.trim();
     const startedAt = localData.startedAt.trim();
-    const remainingBillingCycles = localData.remainingBillingCycles.trim();
+    const remainingBillingCycles = (0, invoicingSubscriptionFormConfig_1.toInvoicingSubscriptionBillingCycles)(localData.remainingBillingCycles);
     return {
         auto_collection: localData.autoCollection ? 'on' : 'off',
         billing_period: frequency.period,
@@ -47,10 +47,8 @@ const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingAddress)
         ...(setupFee != null ? { setup_fee: setupFee } : {}),
         ...(poNumber !== '' ? { po_number: poNumber } : {}),
         ...(trialEnd !== '' ? { trial_end: trialEnd } : {}),
-        ...(remainingBillingCycles !== ''
-            ? {
-                remaining_billing_cycles: (0, invoicingSubscriptionFormConfig_1.toInvoicingSubscriptionQuantity)(Number(remainingBillingCycles)),
-            }
+        ...(remainingBillingCycles != null
+            ? { remaining_billing_cycles: remainingBillingCycles }
             : {}),
         ...(localData.couponId !== '' ? { coupon_ids: [localData.couponId] } : {}),
         ...(shippingAddress != null

package/lib/view/invoicing/editInvoicingSubscriptionDetailView/invoicingSubscriptionFormConfig.d.ts

@@ -15,13 +15,28 @@ export declare const billingFrequencyToPeriod: (value: string) => {
 };
 /** Map an existing subscription's period/unit back to a billing-frequency value. */
 export declare const periodToBillingFrequency: (period?: number, unit?: string) => string;
-/** Today as `YYYY-MM-DD`, the default subscription start date. */
+/**
+ * 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 declare const invoicingSubscriptionTodayIso: () => string;
 /**
  * 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.
  */
 export declare const toInvoicingSubscriptionQuantity: (quantity?: number) => number;
+/**
+ * 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 declare const toInvoicingSubscriptionBillingCycles: (remainingBillingCycles: string) => number | undefined;
 export declare const initialInvoicingSubscriptionFormLocalData: InvoicingSubscriptionFormLocalData;
 /** Seed the form draft from an existing subscription entity (edit mode). */
 export declare const entityToInvoicingSubscriptionFormLocalData: (subscription?: InvoicingSubscription) => InvoicingSubscriptionFormLocalData;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityToInvoicingSubscriptionFormLocalData = exports.initialInvoicingSubscriptionFormLocalData = exports.toInvoicingSubscriptionQuantity = exports.invoicingSubscriptionTodayIso = exports.periodToBillingFrequency = exports.billingFrequencyToPeriod = exports.INVOICING_SUBSCRIPTION_BILLING_FREQUENCY_VALUES = exports.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = void 0;
+exports.entityToInvoicingSubscriptionFormLocalData = exports.initialInvoicingSubscriptionFormLocalData = exports.toInvoicingSubscriptionBillingCycles = exports.toInvoicingSubscriptionQuantity = exports.invoicingSubscriptionTodayIso = exports.periodToBillingFrequency = exports.billingFrequencyToPeriod = exports.INVOICING_SUBSCRIPTION_BILLING_FREQUENCY_VALUES = exports.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = void 0;
+const zeniDayJS_1 = require("../../../zeniDayJS");
 /** `AddressType` key used when the subscription form opens the shared Address screen. */
 exports.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = 'invoicing_subscription_shipping_address';
 /**
@@ -49,8 +50,12 @@ const subscriptionItemQuantities = (subscription, itemType) => {
     });
     return quantities;
 };
-/** Today as `YYYY-MM-DD`, the default subscription start date. */
-const invoicingSubscriptionTodayIso = () => new Date().toISOString().slice(0, 10);
+/**
+ * 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.
+ */
+const invoicingSubscriptionTodayIso = () => (0, zeniDayJS_1.dateNow)().format('YYYY-MM-DD');
 exports.invoicingSubscriptionTodayIso = invoicingSubscriptionTodayIso;
 /**
  * Clamp a subscription-item quantity to the minimum the API accepts. Shared by
@@ -61,6 +66,24 @@ const toInvoicingSubscriptionQuantity = (quantity) => {
     return Number.isFinite(whole) && whole > 0 ? whole : 1;
 };
 exports.toInvoicingSubscriptionQuantity = toInvoicingSubscriptionQuantity;
+/**
+ * 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.
+ */
+const toInvoicingSubscriptionBillingCycles = (remainingBillingCycles) => {
+    if (remainingBillingCycles.trim() === '') {
+        return undefined;
+    }
+    const whole = Math.floor(Number(remainingBillingCycles));
+    return Number.isFinite(whole) && whole >= 0 ? whole : undefined;
+};
+exports.toInvoicingSubscriptionBillingCycles = toInvoicingSubscriptionBillingCycles;
 exports.initialInvoicingSubscriptionFormLocalData = {
     addonPriceCodes: [],
     addonQuantities: {},

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

@@ -2,7 +2,6 @@ import { FetchState, FetchStateAndError } from '../../../commonStateTypes/common
 import { InvoicingNamedOption, InvoicingQboAccountMappingKindOption, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
 import { RootState } from '../../../reducer';
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { InvoicingOnboardingStatus } from '../invoicingConfigView/invoicingConfigViewPayload';
 import { InvoicingBrandingFormLocalData } from './invoicingBrandingFormConfig';
 /**
  * Shared primitive: the raw invoicing settings. Consumed internally by other
@@ -50,7 +49,6 @@ export interface InvoicingSettingsHubView {
     isEnablingInvoicing: boolean;
     isQboConfigured: boolean;
     isStripeConnected: boolean;
-    status?: InvoicingOnboardingStatus;
 }
 /**
  * The settings hub's composite of everything it derives from the store: whether

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

@@ -86,7 +86,6 @@ const getInvoicingSettingsHubView = (state) => {
         isEnablingInvoicing: enableState.fetchState === 'In-Progress',
         isQboConfigured,
         isStripeConnected,
-        status,
     };
 };
 exports.getInvoicingSettingsHubView = getInvoicingSettingsHubView;

package/package.json

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