@zeniai/client-epic-state 5.1.50-betaAK1 → 5.1.50-betaAK3

package/lib/entity/invoicing/invoice/invoicePayload.d.ts

@@ -1,4 +1,5 @@
-import { InvoicingBillingAddressPayload, InvoicingPriceType } from '../invoicingCommonPayload';
+import { AddressPayload } from '../../address/addressPayload';
+import { InvoicingPriceType } from '../invoicingCommonPayload';
 import { InvoicingInvoice, InvoicingInvoiceKPIs } from './invoiceState';
 export type InvoicingInvoiceStatus = 'paid' | 'partially_paid' | 'posted' | 'payment_due' | 'not_paid' | 'voided' | 'pending' | 'draft';
 export interface InvoicingLineItemPayload {
@@ -55,7 +56,7 @@ export interface InvoicingInvoicePayload {
     amount_due?: number;
     amount_paid?: number;
     amount_to_collect?: number;
-    billing_address?: InvoicingBillingAddressPayload;
+    billing_address?: AddressPayload | null;
     created_at?: string;
     credits_applied?: number;
     currency_code?: string;
@@ -82,7 +83,7 @@ export interface InvoicingInvoicePayload {
     price_type?: InvoicingPriceType;
     recurring?: boolean;
     round_off_amount?: number;
-    shipping_address?: InvoicingBillingAddressPayload;
+    shipping_address?: AddressPayload | null;
     sub_total?: number;
     subscription_id?: string;
     subscription_name?: string;
@@ -96,5 +97,11 @@ export interface InvoicingInvoiceKPIsPayload {
     pending_total: number;
     total_invoiced: number;
 }
+/**
+ * Collect the embedded billing + shipping addresses from invoice payloads so they
+ * can be pushed into the shared address store (`updateAddresses`), while the
+ * invoice entity keeps only the address ids — mirrors the vendor flow.
+ */
+export declare const extractInvoicingInvoiceAddresses: (payloads: InvoicingInvoicePayload[]) => AddressPayload[];
 export declare const mapInvoicingInvoicePayloadToState: (payload: InvoicingInvoicePayload) => InvoicingInvoice;
 export declare const mapInvoicingInvoiceKPIsPayloadToState: (payload: InvoicingInvoiceKPIsPayload) => InvoicingInvoiceKPIs;

package/lib/entity/invoicing/invoice/invoicePayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapInvoicingInvoiceKPIsPayloadToState = exports.mapInvoicingInvoicePayloadToState = void 0;
+exports.mapInvoicingInvoiceKPIsPayloadToState = exports.mapInvoicingInvoicePayloadToState = exports.extractInvoicingInvoiceAddresses = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const zeniDayJS_1 = require("../../../zeniDayJS");
 // ── Payload → State mappers (snake_case wire shape → camelCase domain shape) ──
@@ -57,6 +57,15 @@ const mapInvoiceNote = (payload) => ({
     entityID: payload.entity_id,
     entityType: payload.entity_type,
 });
+/**
+ * Collect the embedded billing + shipping addresses from invoice payloads so they
+ * can be pushed into the shared address store (`updateAddresses`), while the
+ * invoice entity keeps only the address ids — mirrors the vendor flow.
+ */
+const extractInvoicingInvoiceAddresses = (payloads) => payloads
+    .flatMap((payload) => [payload.billing_address, payload.shipping_address])
+    .filter((address) => address != null);
+exports.extractInvoicingInvoiceAddresses = extractInvoicingInvoiceAddresses;
 const mapInvoicingInvoicePayloadToState = (payload) => {
     const currencyCode = payload.currency_code ?? DEFAULT_CURRENCY_CODE;
     const currencySymbol = DEFAULT_CURRENCY_SYMBOL;
@@ -76,7 +85,9 @@ const mapInvoicingInvoicePayloadToState = (payload) => {
         amountToCollect: payload.amount_to_collect != null
             ? toAmt(payload.amount_to_collect)
             : undefined,
-        billingAddress: payload.billing_address,
+        billingAddressId: payload.billing_address != null
+            ? payload.billing_address.address_id
+            : undefined,
         createdAt: payload.created_at != null ? (0, zeniDayJS_1.date)(payload.created_at) : undefined,
         creditsApplied: payload.credits_applied != null
             ? toAmt(payload.credits_applied)
@@ -107,7 +118,9 @@ const mapInvoicingInvoicePayloadToState = (payload) => {
         roundOffAmount: payload.round_off_amount != null
             ? toAmt(payload.round_off_amount)
             : undefined,
-        shippingAddress: payload.shipping_address,
+        shippingAddressId: payload.shipping_address != null
+            ? payload.shipping_address.address_id
+            : undefined,
         subscriptionID: payload.subscription_id,
         subscriptionName: payload.subscription_name,
         subTotal: payload.sub_total != null ? toAmt(payload.sub_total) : undefined,

package/lib/entity/invoicing/invoice/invoiceState.d.ts

@@ -1,7 +1,7 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import { ID } from '../../../commonStateTypes/common';
 import { ZeniDate } from '../../../zeniDayJS';
-import { InvoicingBillingAddressPayload, InvoicingPriceType } from '../invoicingCommonPayload';
+import { InvoicingPriceType } from '../invoicingCommonPayload';
 import { InvoicingInvoiceStatus } from './invoicePayload';
 export interface InvoicingLineItem {
     amount: Amount;
@@ -57,7 +57,7 @@ export interface InvoicingInvoice {
     amountDue?: Amount;
     amountPaid?: Amount;
     amountToCollect?: Amount;
-    billingAddress?: InvoicingBillingAddressPayload;
+    billingAddressId?: ID;
     createdAt?: ZeniDate;
     creditsApplied?: Amount;
     currencyCode?: string;
@@ -84,7 +84,7 @@ export interface InvoicingInvoice {
     priceType?: InvoicingPriceType;
     recurring?: boolean;
     roundOffAmount?: Amount;
-    shippingAddress?: InvoicingBillingAddressPayload;
+    shippingAddressId?: ID;
     subscriptionID?: ID;
     subscriptionName?: string;
     subTotal?: Amount;

package/lib/entity/invoicing/invoicingCommonPayload.d.ts

@@ -1,17 +1,4 @@
-export interface InvoicingBillingAddressPayload {
-    city?: string;
-    company?: string;
-    country?: string;
-    email?: string;
-    first_name?: string;
-    last_name?: string;
-    line1?: string;
-    line2?: string;
-    phone?: string;
-    state_code?: string;
-    validation_status?: 'not_validated' | 'valid' | 'partially_valid' | 'invalid';
-    zip?: string;
-}
+import { AddressPayload } from '../address/addressPayload';
 export type InvoicingPriceType = 'tax_exclusive' | 'tax_inclusive';
 /**
  * A single select-field option (label + typed value) owned by CES so the value
@@ -33,7 +20,7 @@ export interface InvoicingPaginatedList<T> {
 }
 export interface InvoicingSettingsPayload {
     accent_color?: string;
-    address?: string;
+    address?: AddressPayload | null;
     address_enabled?: boolean;
     auto_collection?: 'on' | 'off';
     chargebee_connected?: boolean;

package/lib/entity/invoicing/invoicingCustomer/invoicingCustomerPayload.d.ts

@@ -1,11 +1,12 @@
-import { InvoicingBillingAddressPayload, InvoicingListCounts } from '../invoicingCommonPayload';
+import { AddressPayload } from '../../address/addressPayload';
+import { InvoicingListCounts } from '../invoicingCommonPayload';
 import { InvoicingSubscriptionPayload } from '../invoicingSubscription/invoicingSubscriptionPayload';
 import { InvoicingCustomer } from './invoicingCustomerState';
 export interface InvoicingCustomerPayload {
     id: string;
     arr?: number;
     auto_collection?: 'on' | 'off';
-    billing_address?: InvoicingBillingAddressPayload;
+    billing_address?: AddressPayload | null;
     billing_address_id?: string;
     card_status?: 'no_card' | 'valid' | 'expiring' | 'expired';
     company?: string;
@@ -52,4 +53,10 @@ export interface InvoicingCustomerCounts extends InvoicingListCounts {
     total: number;
     trial: number;
 }
+/**
+ * Collect the embedded billing addresses from customer payloads so they can be
+ * pushed into the shared address store (`updateAddresses`), while the customer
+ * entity keeps only `billingAddressId` — mirrors the vendor flow.
+ */
+export declare const extractInvoicingCustomerAddresses: (payloads: InvoicingCustomerPayload[]) => AddressPayload[];
 export declare const mapInvoicingCustomerPayloadToState: (payload: InvoicingCustomerPayload) => InvoicingCustomer;

package/lib/entity/invoicing/invoicingCustomer/invoicingCustomerPayload.js

@@ -1,11 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapInvoicingCustomerPayloadToState = void 0;
+exports.mapInvoicingCustomerPayloadToState = exports.extractInvoicingCustomerAddresses = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const currencyHelper_1 = require("../../../commonStateTypes/currencyHelper");
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const invoicingSubscriptionPayload_1 = require("../invoicingSubscription/invoicingSubscriptionPayload");
 // ── Payload → State mappers (snake_case wire shape → camelCase domain shape) ──
+/**
+ * Collect the embedded billing addresses from customer payloads so they can be
+ * pushed into the shared address store (`updateAddresses`), while the customer
+ * entity keeps only `billingAddressId` — mirrors the vendor flow.
+ */
+const extractInvoicingCustomerAddresses = (payloads) => payloads
+    .map((payload) => payload.billing_address)
+    .filter((address) => address != null);
+exports.extractInvoicingCustomerAddresses = extractInvoicingCustomerAddresses;
 const mapInvoicingCustomerPayloadToState = (payload) => {
     const currencyCode = payload.preferred_currency_code ?? currencyHelper_1.defaultCustomerCurrency.currencyCode;
     const currencySymbol = payload.preferred_currency_symbol ?? currencyHelper_1.defaultCustomerCurrency.currencySymbol;
@@ -15,7 +24,6 @@ const mapInvoicingCustomerPayloadToState = (payload) => {
             ? (0, amount_1.toAmount)(payload.arr, currencyCode, currencySymbol)
             : undefined,
         autoCollection: payload.auto_collection,
-        billingAddress: payload.billing_address,
         billingAddressId: payload.billing_address_id,
         cardStatus: payload.card_status,
         company: payload.company,

package/lib/entity/invoicing/invoicingCustomer/invoicingCustomerState.d.ts

@@ -1,13 +1,11 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import { ID } from '../../../commonStateTypes/common';
 import { ZeniDate } from '../../../zeniDayJS';
-import { InvoicingBillingAddressPayload } from '../invoicingCommonPayload';
 import { InvoicingSubscription } from '../invoicingSubscription/invoicingSubscriptionState';
 export interface InvoicingCustomer {
     id: ID;
     arr?: Amount;
     autoCollection?: 'on' | 'off';
-    billingAddress?: InvoicingBillingAddressPayload;
     billingAddressId?: ID;
     cardStatus?: 'no_card' | 'valid' | 'expiring' | 'expired';
     company?: string;

package/lib/entity/invoicing/invoicingSubscription/invoicingSubscriptionPayload.d.ts

@@ -1,4 +1,4 @@
-import { InvoicingBillingAddressPayload } from '../invoicingCommonPayload';
+import { AddressPayload } from '../../address/addressPayload';
 import { InvoicingContractTerm, InvoicingSubscription, InvoicingSubscriptionCoupon, InvoicingSubscriptionItem } from './invoicingSubscriptionState';
 export type InvoicingSubscriptionStatus = 'active' | 'in_trial' | 'future' | 'non_renewing' | 'paused' | 'cancelled';
 export type InvoicingBillingPeriodUnit = 'day' | 'week' | 'month' | 'year';
@@ -62,7 +62,7 @@ export interface InvoicingSubscriptionPayload {
     remaining_billing_cycles?: number;
     resume_date?: string;
     setup_fee?: number;
-    shipping_address?: InvoicingBillingAddressPayload;
+    shipping_address?: AddressPayload | null;
     started_at?: string;
     subscription_items?: InvoicingSubscriptionItemPayload[];
     total_dues?: number;
@@ -73,4 +73,10 @@ export interface InvoicingSubscriptionPayload {
 export declare const mapInvoicingSubscriptionItemPayloadToState: (payload: InvoicingSubscriptionItemPayload, currencyCode: string, currencySymbol: string) => InvoicingSubscriptionItem;
 export declare const mapInvoicingSubscriptionCouponPayloadToState: (payload: InvoicingSubscriptionCouponPayload) => InvoicingSubscriptionCoupon;
 export declare const mapInvoicingContractTermPayloadToState: (payload: InvoicingContractTermPayload, currencyCode: string, currencySymbol: string) => InvoicingContractTerm;
+/**
+ * Collect the embedded shipping addresses from subscription payloads so they can
+ * be pushed into the shared address store (via `updateAddresses`), while the
+ * subscription entity keeps only `shippingAddressId` — mirrors the vendor flow.
+ */
+export declare const extractInvoicingSubscriptionAddresses: (payloads: InvoicingSubscriptionPayload[]) => AddressPayload[];
 export declare const mapInvoicingSubscriptionPayloadToState: (payload: InvoicingSubscriptionPayload) => InvoicingSubscription;

package/lib/entity/invoicing/invoicingSubscription/invoicingSubscriptionPayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapInvoicingSubscriptionPayloadToState = exports.mapInvoicingContractTermPayloadToState = exports.mapInvoicingSubscriptionCouponPayloadToState = exports.mapInvoicingSubscriptionItemPayloadToState = void 0;
+exports.mapInvoicingSubscriptionPayloadToState = exports.extractInvoicingSubscriptionAddresses = exports.mapInvoicingContractTermPayloadToState = exports.mapInvoicingSubscriptionCouponPayloadToState = exports.mapInvoicingSubscriptionItemPayloadToState = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const currencyHelper_1 = require("../../../commonStateTypes/currencyHelper");
 const zeniDayJS_1 = require("../../../zeniDayJS");
@@ -41,6 +41,15 @@ const mapInvoicingContractTermPayloadToState = (payload, currencyCode, currencyS
         : undefined,
 });
 exports.mapInvoicingContractTermPayloadToState = mapInvoicingContractTermPayloadToState;
+/**
+ * Collect the embedded shipping addresses from subscription payloads so they can
+ * be pushed into the shared address store (via `updateAddresses`), while the
+ * subscription entity keeps only `shippingAddressId` — mirrors the vendor flow.
+ */
+const extractInvoicingSubscriptionAddresses = (payloads) => payloads
+    .map((payload) => payload.shipping_address)
+    .filter((address) => address != null);
+exports.extractInvoicingSubscriptionAddresses = extractInvoicingSubscriptionAddresses;
 const mapInvoicingSubscriptionPayloadToState = (payload) => {
     const currencyCode = payload.currency_code ?? currencyHelper_1.defaultCustomerCurrency.currencyCode;
     const currencySymbol = payload.currency_symbol ?? currencyHelper_1.defaultCustomerCurrency.currencySymbol;
@@ -90,7 +99,9 @@ const mapInvoicingSubscriptionPayloadToState = (payload) => {
         setupFee: payload.setup_fee != null
             ? (0, amount_1.toAmount)(payload.setup_fee, currencyCode, currencySymbol)
             : undefined,
-        shippingAddress: payload.shipping_address,
+        shippingAddressId: payload.shipping_address != null
+            ? payload.shipping_address.address_id
+            : undefined,
         startedAt: payload.started_at != null ? (0, zeniDayJS_1.date)(payload.started_at) : undefined,
         subscriptionItems: payload.subscription_items?.map((item) => (0, exports.mapInvoicingSubscriptionItemPayloadToState)(item, currencyCode, currencySymbol)),
         totalDues: payload.total_dues != null

package/lib/entity/invoicing/invoicingSubscription/invoicingSubscriptionState.d.ts

@@ -1,7 +1,6 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import { ID } from '../../../commonStateTypes/common';
 import { ZeniDate } from '../../../zeniDayJS';
-import { InvoicingBillingAddressPayload } from '../invoicingCommonPayload';
 import { InvoicingBillingPeriodUnit, InvoicingSubscriptionStatus } from './invoicingSubscriptionPayload';
 export interface InvoicingSubscriptionItem {
     amount?: Amount;
@@ -62,7 +61,7 @@ export interface InvoicingSubscription {
     remainingBillingCycles?: number;
     resumeDate?: ZeniDate;
     setupFee?: Amount;
-    shippingAddress?: InvoicingBillingAddressPayload;
+    shippingAddressId?: ID;
     startedAt?: ZeniDate;
     subscriptionItems?: InvoicingSubscriptionItem[];
     totalDues?: Amount;

package/lib/esm/entity/invoicing/invoice/invoicePayload.js

@@ -54,6 +54,14 @@ const mapInvoiceNote = (payload) => ({
     entityID: payload.entity_id,
     entityType: payload.entity_type,
 });
+/**
+ * Collect the embedded billing + shipping addresses from invoice payloads so they
+ * can be pushed into the shared address store (`updateAddresses`), while the
+ * invoice entity keeps only the address ids — mirrors the vendor flow.
+ */
+export const extractInvoicingInvoiceAddresses = (payloads) => payloads
+    .flatMap((payload) => [payload.billing_address, payload.shipping_address])
+    .filter((address) => address != null);
 export const mapInvoicingInvoicePayloadToState = (payload) => {
     const currencyCode = payload.currency_code ?? DEFAULT_CURRENCY_CODE;
     const currencySymbol = DEFAULT_CURRENCY_SYMBOL;
@@ -73,7 +81,9 @@ export const mapInvoicingInvoicePayloadToState = (payload) => {
         amountToCollect: payload.amount_to_collect != null
             ? toAmt(payload.amount_to_collect)
             : undefined,
-        billingAddress: payload.billing_address,
+        billingAddressId: payload.billing_address != null
+            ? payload.billing_address.address_id
+            : undefined,
         createdAt: payload.created_at != null ? date(payload.created_at) : undefined,
         creditsApplied: payload.credits_applied != null
             ? toAmt(payload.credits_applied)
@@ -104,7 +114,9 @@ export const mapInvoicingInvoicePayloadToState = (payload) => {
         roundOffAmount: payload.round_off_amount != null
             ? toAmt(payload.round_off_amount)
             : undefined,
-        shippingAddress: payload.shipping_address,
+        shippingAddressId: payload.shipping_address != null
+            ? payload.shipping_address.address_id
+            : undefined,
         subscriptionID: payload.subscription_id,
         subscriptionName: payload.subscription_name,
         subTotal: payload.sub_total != null ? toAmt(payload.sub_total) : undefined,

package/lib/esm/entity/invoicing/invoicingCustomer/invoicingCustomerPayload.js

@@ -3,6 +3,14 @@ import { defaultCustomerCurrency } from '../../../commonStateTypes/currencyHelpe
 import { date } from '../../../zeniDayJS';
 import { mapInvoicingSubscriptionPayloadToState, } from '../invoicingSubscription/invoicingSubscriptionPayload';
 // ── Payload → State mappers (snake_case wire shape → camelCase domain shape) ──
+/**
+ * Collect the embedded billing addresses from customer payloads so they can be
+ * pushed into the shared address store (`updateAddresses`), while the customer
+ * entity keeps only `billingAddressId` — mirrors the vendor flow.
+ */
+export const extractInvoicingCustomerAddresses = (payloads) => payloads
+    .map((payload) => payload.billing_address)
+    .filter((address) => address != null);
 export const mapInvoicingCustomerPayloadToState = (payload) => {
     const currencyCode = payload.preferred_currency_code ?? defaultCustomerCurrency.currencyCode;
     const currencySymbol = payload.preferred_currency_symbol ?? defaultCustomerCurrency.currencySymbol;
@@ -12,7 +20,6 @@ export const mapInvoicingCustomerPayloadToState = (payload) => {
             ? toAmount(payload.arr, currencyCode, currencySymbol)
             : undefined,
         autoCollection: payload.auto_collection,
-        billingAddress: payload.billing_address,
         billingAddressId: payload.billing_address_id,
         cardStatus: payload.card_status,
         company: payload.company,

package/lib/esm/entity/invoicing/invoicingSubscription/invoicingSubscriptionPayload.js

@@ -35,6 +35,14 @@ export const mapInvoicingContractTermPayloadToState = (payload, currencyCode, cu
         ? toAmount(payload.total_contract_value, currencyCode, currencySymbol)
         : undefined,
 });
+/**
+ * Collect the embedded shipping addresses from subscription payloads so they can
+ * be pushed into the shared address store (via `updateAddresses`), while the
+ * subscription entity keeps only `shippingAddressId` — mirrors the vendor flow.
+ */
+export const extractInvoicingSubscriptionAddresses = (payloads) => payloads
+    .map((payload) => payload.shipping_address)
+    .filter((address) => address != null);
 export const mapInvoicingSubscriptionPayloadToState = (payload) => {
     const currencyCode = payload.currency_code ?? defaultCustomerCurrency.currencyCode;
     const currencySymbol = payload.currency_symbol ?? defaultCustomerCurrency.currencySymbol;
@@ -84,7 +92,9 @@ export const mapInvoicingSubscriptionPayloadToState = (payload) => {
         setupFee: payload.setup_fee != null
             ? toAmount(payload.setup_fee, currencyCode, currencySymbol)
             : undefined,
-        shippingAddress: payload.shipping_address,
+        shippingAddressId: payload.shipping_address != null
+            ? payload.shipping_address.address_id
+            : undefined,
         startedAt: payload.started_at != null ? date(payload.started_at) : undefined,
         subscriptionItems: payload.subscription_items?.map((item) => mapInvoicingSubscriptionItemPayloadToState(item, currencyCode, currencySymbol)),
         totalDues: payload.total_dues != null

package/lib/esm/view/invoicing/createInvoice/createInvoiceEpic.js

@@ -1,5 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../entity/address/addressReducer';
+import { extractInvoicingInvoiceAddresses } from '../../../entity/invoicing/invoice/invoicePayload';
 import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { createInvoice, createInvoiceFailure, createInvoiceSuccess, } from './createInvoiceReducer';
@@ -13,6 +15,7 @@ export const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe(f
         if (isSuccessResponse(response) && response.data != null) {
             return [
                 updateInvoices([response.data], 'merge'),
+                updateAddresses(extractInvoicingInvoiceAddresses([response.data])),
                 createInvoiceSuccess({ invoiceId: response.data.id }),
             ];
         }

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

@@ -1,5 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../entity/address/addressReducer';
+import { extractInvoicingCustomerAddresses } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerPayload';
 import { updateInvoicingCustomers } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
@@ -25,6 +27,7 @@ export const saveInvoicingCustomerEpic = (actions$, state$, zeniAPI) => actions$
         if (isSuccessResponse(response) && response.data != null) {
             return [
                 updateInvoicingCustomers([response.data], 'merge'),
+                updateAddresses(extractInvoicingCustomerAddresses([response.data])),
                 submitInvoicingCustomerFormSuccess({
                     customerId: response.data.id,
                 }),

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

@@ -1,4 +1,5 @@
-import { addressUpdatableInfoToInvoicingShippingPayload, billingFrequencyToPeriod, } from './invoicingSubscriptionFormConfig';
+import { toAddressUpdatableInfoPayload } from '../../addressView/addressViewPayload';
+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
@@ -38,9 +39,7 @@ export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingA
         ...(trialEnd !== '' ? { trial_end: trialEnd } : {}),
         ...(localData.couponId !== '' ? { coupon_ids: [localData.couponId] } : {}),
         ...(shippingAddress != null
-            ? {
-                shipping_address: addressUpdatableInfoToInvoicingShippingPayload(shippingAddress),
-            }
+            ? { shipping_address: toAddressUpdatableInfoPayload(shippingAddress) }
             : {}),
     };
 };

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

@@ -27,8 +27,8 @@ export const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID)
             entityToInvoicingSubscriptionFormLocalData(subscription))
         : newSubscriptionDraft;
     // Shipping address is captured via the shared Address screen and seeded there
-    // (from the subscription's inline shipping address) on detail load, so the
-    // formatted label comes from that draft via the shared `getFormattedAddress`.
+    // (looked up in the shared address store by `shippingAddressId`) on detail
+    // load, so the formatted label comes from that draft via `getFormattedAddress`.
     const newAddress = state.addressViewState.newAddressState?.[INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE];
     const shippingAddressLabel = newAddress?.addressToCreate != null
         ? getFormattedAddress(newAddress.addressToCreate)

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

@@ -1,13 +1,15 @@
 import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
+import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoicingSubscriptionById } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionSelector';
 import { newAddressInLocalStore } from '../../addressView/addressViewReducer';
 import { updateInvoicingSubscriptionDetail } from '../invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewReducer';
 import { initializeInvoicingSubscriptionAddress } from './editInvoicingSubscriptionDetailViewReducer';
-import { INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE, invoicingShippingAddressToAddressUpdatableInfo, } from './invoicingSubscriptionFormConfig';
+import { INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE } from './invoicingSubscriptionFormConfig';
 /**
  * Seed the shared Address screen with an existing subscription's saved shipping
- * address (carried inline on the subscription entity as `shippingAddress`).
+ * address (looked up in the shared address store by `shippingAddressId`, same as
+ * the customer billing-address flow).
  * Runs both when the subscription detail loads and on an explicit initialize
  * trigger. Skips when an in-progress draft already exists, so an address the
  * user just entered survives navigating between the form and the Address screen.
@@ -22,10 +24,13 @@ export const initializeInvoicingSubscriptionAddressEpic = (actions$, state$) =>
         return EMPTY;
     }
     const subscription = getInvoicingSubscriptionById(rootState.invoicingSubscriptionState, id);
-    return subscription?.shippingAddress != null
+    const address = subscription?.shippingAddressId != null
+        ? getAddressByAddressId(rootState.addressState, subscription.shippingAddressId)
+        : undefined;
+    return address != null
         ? of(newAddressInLocalStore({
             addressType: INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE,
-            addressToCreate: invoicingShippingAddressToAddressUpdatableInfo(subscription.shippingAddress),
+            addressToCreate: address,
         }))
         : EMPTY;
 }));

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

@@ -67,29 +67,3 @@ export const entityToInvoicingSubscriptionFormLocalData = (subscription) => {
             : '',
     };
 };
-const trimOrUndefined = (value) => value != null && value.trim() !== '' ? value.trim() : undefined;
-/**
- * Convert the shared Address screen's `AddressUpdatableInfo` into the invoicing
- * shipping-address payload shape the subscription API expects
- * (`line1`/`line2`/`city`/`state_code`/`zip`/`country`).
- */
-export const addressUpdatableInfoToInvoicingShippingPayload = (info) => ({
-    city: trimOrUndefined(info.city),
-    country: trimOrUndefined(info.country),
-    line1: trimOrUndefined(info.street?.[0]),
-    line2: trimOrUndefined(info.street?.[1]),
-    state_code: trimOrUndefined(info.state),
-    zip: trimOrUndefined(info.postalCode),
-});
-/**
- * Convert an existing subscription's shipping-address payload into the shared
- * Address screen's `AddressUpdatableInfo` (used to seed the screen on edit).
- */
-export const invoicingShippingAddressToAddressUpdatableInfo = (address) => ({
-    city: address.city ?? '',
-    country: address.country ?? '',
-    postalCode: address.zip ?? '',
-    state: address.state_code ?? '',
-    street: [address.line1, address.line2].filter((part) => part != null && part !== ''),
-    ...(address.country != null ? { countryCode: address.country } : {}),
-});

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

@@ -1,5 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../entity/address/addressReducer';
+import { extractInvoicingSubscriptionAddresses } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionPayload';
 import { updateInvoicingSubscriptions } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
@@ -25,6 +27,7 @@ export const saveInvoicingSubscriptionEpic = (actions$, state$, zeniAPI) => acti
         if (isSuccessResponse(response) && response.data != null) {
             return [
                 updateInvoicingSubscriptions([response.data], 'merge'),
+                updateAddresses(extractInvoicingSubscriptionAddresses([response.data])),
                 submitInvoicingSubscriptionFormSuccess({
                     subscriptionId: response.data.id,
                 }),

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

@@ -1,5 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../entity/address/addressReducer';
+import { extractInvoicingInvoiceAddresses } from '../../../entity/invoicing/invoice/invoicePayload';
 import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingInvoiceAction, runInvoicingInvoiceActionFailure, runInvoicingInvoiceActionSuccess, updateInvoicingInvoice, } from './invoiceActionReducer';
@@ -12,6 +14,7 @@ export const runInvoicingInvoiceActionEpic = (actions$, _state$, zeniAPI) => act
         if (isSuccessResponse(response) && response.data != null) {
             return [
                 updateInvoices([response.data], 'merge'),
+                updateAddresses(extractInvoicingInvoiceAddresses([response.data])),
                 runInvoicingInvoiceActionSuccess({ invoiceId }),
             ];
         }
@@ -34,6 +37,7 @@ export const updateInvoicingInvoiceEpic = (actions$, _state$, zeniAPI) => action
         if (isSuccessResponse(response) && response.data != null) {
             return [
                 updateInvoices([response.data], 'merge'),
+                updateAddresses(extractInvoicingInvoiceAddresses([response.data])),
                 runInvoicingInvoiceActionSuccess({ invoiceId }),
             ];
         }

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

@@ -1,5 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../entity/address/addressReducer';
+import { extractInvoicingInvoiceAddresses } from '../../../entity/invoicing/invoice/invoicePayload';
 import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { fetchInvoiceDetail, updateInvoiceDetail, updateInvoiceDetailFailure, } from './invoiceDetailReducer';
@@ -9,6 +11,7 @@ export const fetchInvoiceDetailEpic = (actions$, _state$, zeniAPI) => actions$.p
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
+                updateAddresses(extractInvoicingInvoiceAddresses([response.data])),
                 updateInvoices([response.data], 'merge'),
                 updateInvoiceDetail({ invoiceId: response.data.id }),
             ];

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

@@ -1,10 +1,18 @@
 import recordGet from 'lodash/get';
+import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoiceById } from '../../../entity/invoicing/invoice/invoiceSelector';
 import { getInvoicingInvoiceActionState } from '../invoiceAction/invoiceActionSelector';
 export const getInvoiceDetail = (state, invoiceId) => {
     const detail = recordGet(state.invoicingInvoiceDetailState.detailById, invoiceId, undefined);
+    const invoice = getInvoiceById(state, invoiceId);
     return {
-        invoice: getInvoiceById(state, invoiceId),
+        invoice,
+        billingAddress: invoice?.billingAddressId != null
+            ? getAddressByAddressId(state.addressState, invoice.billingAddressId)
+            : undefined,
+        shippingAddress: invoice?.shippingAddressId != null
+            ? getAddressByAddressId(state.addressState, invoice.shippingAddressId)
+            : undefined,
         actionState: getInvoicingInvoiceActionState(invoiceId)(state),
         fetchState: detail?.fetchState ?? 'Not-Started',
         error: detail?.error,

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

@@ -1,5 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../entity/address/addressReducer';
+import { extractInvoicingInvoiceAddresses } from '../../../entity/invoicing/invoice/invoicePayload';
 import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { INVOICING_LIST_PAGE_SIZE, applyListSortParams, withQuery, } from '../invoicingApiHelper';
@@ -39,6 +41,7 @@ export const fetchInvoiceListEpic = (actions$, _state$, zeniAPI) => actions$.pip
             const items = response.data?.items ?? [];
             const actions = [
                 updateInvoices(items, 'merge'),
+                updateAddresses(extractInvoicingInvoiceAddresses(items)),
                 updateInvoiceList({
                     invoices: items,
                     nextCursor: response.data?.next_cursor ?? null,

package/lib/esm/view/invoicing/invoicingCustomerDetailView/fetchInvoicingCustomerDetailEpic.js

@@ -1,5 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../entity/address/addressReducer';
+import { extractInvoicingCustomerAddresses } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerPayload';
 import { updateInvoicingCustomers } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { fetchInvoicingCustomerDetail, updateInvoicingCustomerDetail, updateInvoicingCustomerDetailFailure, } from './invoicingCustomerDetailViewReducer';
@@ -9,6 +11,7 @@ export const fetchInvoicingCustomerDetailEpic = (actions$, _state$, zeniAPI) =>
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
+                updateAddresses(extractInvoicingCustomerAddresses([response.data])),
                 updateInvoicingCustomers([response.data], 'merge'),
                 updateInvoicingCustomerDetail({ id: response.data.id }),
             ];