@zeniai/client-epic-state 5.1.77-betaAK1 → 5.1.77-betaAK2

package/lib/esm/view/invoicing/createCreditNote/createCreditNoteFormConfig.js

@@ -1,11 +1,9 @@
-import { toAmount } from '../../../commonStateTypes/amount';
 export const initialCreateCreditNoteFormLocalData = () => ({
     customerId: '',
     lineItems: [
         {
             description: '',
             quantity: '1',
-            unitAmount: toAmount(0, 'USD', '$'),
         },
     ],
     reasonCode: '',

package/lib/esm/view/invoicing/createCreditNote/createCreditNotePayload.js

@@ -2,7 +2,7 @@ export const localDataToCreateCreditNotePayload = (localData) => {
     const lineItems = localData.lineItems
         .map((lineItem) => {
         const quantity = Math.round(Number.parseFloat(lineItem.quantity));
-        const unitAmount = lineItem.unitAmount.amount;
+        const unitAmount = lineItem.unitAmount?.amount ?? 0;
         return {
             description: lineItem.description.trim(),
             quantity,

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

@@ -1,4 +1,3 @@
-import { toAmount } from '../../../commonStateTypes/amount';
 import { invoicingProductToCatalogItemFormSubFamily, isTieredCatalogPricingModel, } from './invoicingCatalogItemFormConfig';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
 const trimOrNull = (value) => value.trim() !== '' ? value.trim() : null;
@@ -32,7 +31,7 @@ const tierToPayload = (tier) => ({
     package_size: hasValue(tier.packageSize)
         ? Number(tier.packageSize)
         : undefined,
-    price: tier.price.amount,
+    price: tier.price?.amount ?? 0,
     pricing_type: tier.pricingType,
     starting_unit: Number(tier.startingUnit) || 1,
 });
@@ -46,7 +45,7 @@ const subFamilyToProductUpdate = (subFamily, itemType) => {
         is_taxable: subFamily.isTaxable,
         period: hasValue(subFamily.period) ? Number(subFamily.period) : null,
         period_unit: hasValue(subFamily.period) ? subFamily.periodUnit : null,
-        price: tiered ? 0 : subFamily.priceDollars.amount,
+        price: tiered ? 0 : (subFamily.priceDollars?.amount ?? 0),
         pricing_model: subFamily.pricingModel,
         show_description_in_quotes: subFamily.showDescriptionInQuotes,
         tiers: tiered ? subFamily.tiers.map(tierToPayload) : [],
@@ -123,7 +122,7 @@ export const createSubFamilyFormToPayload = (itemId, itemType, values) => {
         is_taxable: true,
         item_id: itemId,
         name,
-        price: values.priceDollars.amount,
+        price: values.priceDollars?.amount ?? 0,
         price_code: priceCode,
         pricing_model: values.pricingModel || 'flat_fee',
         show_description_in_invoices: true,
@@ -162,7 +161,7 @@ export const productToCreateSubFamilyFormValues = (product) => ({
     period: product?.period != null ? String(product.period) : '1',
     periodUnit: product?.periodUnit ?? 'month',
     priceCode: '',
-    priceDollars: product?.price ?? toAmount(0, 'USD', '$'),
+    priceDollars: product?.price,
     pricingModel: product?.pricingModel ?? 'flat_fee',
     prorationType: product?.prorationType ?? 'site_default',
     trialEndAction: product?.trialEndAction ?? 'site_default',

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

@@ -7,16 +7,16 @@ const toProductCode = (value) => value
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-|-$/g, '');
-const buildAccountingDetail = (localData) => {
+const buildAccountingDetail = (subFamily) => {
     const detail = {};
-    if (localData.sku.trim() !== '') {
-        detail.sku = localData.sku.trim();
+    if (subFamily.sku.trim() !== '') {
+        detail.sku = subFamily.sku.trim();
     }
-    if (localData.accountingCode.trim() !== '') {
-        detail.accounting_code = localData.accountingCode.trim();
+    if (subFamily.accountingCode.trim() !== '') {
+        detail.accounting_code = subFamily.accountingCode.trim();
     }
-    if (localData.accountingCategory.trim() !== '') {
-        detail.accounting_category_1 = localData.accountingCategory.trim();
+    if (subFamily.accountingCategory.trim() !== '') {
+        detail.accounting_category_1 = subFamily.accountingCategory.trim();
     }
     return Object.keys(detail).length > 0 ? detail : undefined;
 };
@@ -30,7 +30,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
         free_quantity: Number(subFamily.freeQuantity) || 0,
         is_taxable: subFamily.isTaxable,
         name,
-        price: tiered ? 0 : subFamily.priceDollars.amount,
+        price: tiered ? 0 : (subFamily.priceDollars?.amount ?? 0),
         price_code: priceCode,
         pricing_model: subFamily.pricingModel,
         show_description_in_invoices: subFamily.showDescriptionInInvoices,
@@ -69,12 +69,12 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
         payload.tiers = subFamily.tiers.map((tier) => ({
             ending_unit: tier.endingUnit.trim() !== '' ? Number(tier.endingUnit) : undefined,
             package_size: tier.packageSize.trim() !== '' ? Number(tier.packageSize) : undefined,
-            price: tier.price.amount,
+            price: tier.price?.amount ?? 0,
             pricing_type: tier.pricingType,
             starting_unit: Number(tier.startingUnit) || 1,
         }));
     }
-    const accountingDetail = buildAccountingDetail(localData);
+    const accountingDetail = buildAccountingDetail(subFamily);
     if (accountingDetail != null) {
         payload.accounting_detail = accountingDetail;
     }

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

@@ -1,4 +1,3 @@
-import { toAmount } from '../../../commonStateTypes/amount';
 /**
  * Canonical value sets for the catalog item form. CES owns the values;
  * web-components maps each value to a localized label.
@@ -45,11 +44,12 @@ export const isTieredCatalogPricingModel = (model) => ['tiered', 'volume', 'stai
 export const blankInvoicingCatalogTier = (startingUnit = '1') => ({
     endingUnit: '',
     packageSize: '',
-    price: toAmount(0, 'USD', '$'),
     pricingType: 'per_unit',
     startingUnit,
 });
 export const blankInvoicingCatalogSubFamily = () => ({
+    accountingCategory: '',
+    accountingCode: '',
     billingCycles: '',
     description: '',
     freeQuantity: '0',
@@ -59,12 +59,12 @@ export const blankInvoicingCatalogSubFamily = () => ({
     name: '',
     period: '1',
     periodUnit: 'month',
-    priceDollars: toAmount(0, 'USD', '$'),
     priceCode: '',
     pricingModel: 'flat_fee',
     prorationType: 'site_default',
     showDescriptionInInvoices: true,
     showDescriptionInQuotes: true,
+    sku: '',
     tiers: [blankInvoicingCatalogTier('1')],
     trialEndAction: 'site_default',
     trialPeriod: '',
@@ -77,7 +77,10 @@ export const invoicingProductToCatalogItemFormSubFamily = (product) => {
     }
     return {
         ...base,
+        accountingCategory: product.accountingDetail?.accountingCategory1 ?? '',
+        accountingCode: product.accountingDetail?.accountingCode ?? '',
         billingCycles: product.billingCycles != null ? String(product.billingCycles) : '',
+        sku: product.accountingDetail?.sku ?? '',
         description: product.description ?? '',
         freeQuantity: product.freeQuantity != null ? String(product.freeQuantity) : '0',
         id: product.id,
@@ -86,7 +89,7 @@ export const invoicingProductToCatalogItemFormSubFamily = (product) => {
         name: product.name ?? '',
         period: product.period != null ? String(product.period) : '1',
         periodUnit: product.periodUnit ?? 'month',
-        priceDollars: product.price ?? toAmount(0, 'USD', '$'),
+        priceDollars: product.price,
         priceCode: product.priceCode ?? '',
         pricingModel: product.pricingModel ?? 'flat_fee',
         prorationType: product.prorationType ?? 'site_default',
@@ -107,8 +110,6 @@ export const invoicingProductToCatalogItemFormSubFamily = (product) => {
     };
 };
 export const initialInvoicingCatalogItemFormLocalData = {
-    accountingCategory: '',
-    accountingCode: '',
     applicableItems: [],
     catalogType: 'plan',
     description: '',
@@ -116,7 +117,6 @@ export const initialInvoicingCatalogItemFormLocalData = {
     itemApplicability: 'all',
     name: '',
     productCode: '',
-    sku: '',
     subFamilies: [blankInvoicingCatalogSubFamily()],
     unit: '',
 };
@@ -137,8 +137,6 @@ export const entityToInvoicingCatalogItemFormLocalData = (item) => {
             ? 'addon'
             : 'plan';
     return {
-        accountingCategory: plan.subFamilies?.[0]?.accountingDetail?.accountingCategory1 ?? '',
-        accountingCode: plan.subFamilies?.[0]?.accountingDetail?.accountingCode ?? '',
         applicableItems: item.applicableItems ?? [],
         catalogType,
         description: item.description ?? '',
@@ -146,7 +144,6 @@ export const entityToInvoicingCatalogItemFormLocalData = (item) => {
         itemApplicability: item.itemApplicability ?? 'all',
         name: item.name ?? '',
         productCode: item.productCode ?? '',
-        sku: plan.subFamilies?.[0]?.accountingDetail?.sku ?? '',
         subFamilies: plan?.subFamilies != null && plan.subFamilies.length > 0
             ? plan.subFamilies.map(invoicingProductToCatalogItemFormSubFamily)
             : [invoicingProductToCatalogItemFormSubFamily()],

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

@@ -22,7 +22,7 @@ export const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
         data.discount_percentage = Number(localData.discountPercentage);
     }
     if (localData.discountType === 'fixed_amount') {
-        if (localData.discountAmount.amount !== 0) {
+        if (localData.discountAmount != null) {
             data.discount_amount = localData.discountAmount.amount;
         }
         data.currency_code = 'USD';

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

@@ -1,9 +1,7 @@
-import { toAmount } from '../../../commonStateTypes/amount';
 export const initialInvoicingCouponFormLocalData = {
     applyOn: 'invoice_amount',
     couponCode: '',
     couponId: '',
-    discountAmount: toAmount(0, 'USD', '$'),
     discountPercentage: '',
     discountQuantity: '',
     discountType: 'percentage',
@@ -26,7 +24,7 @@ export const entityToInvoicingCouponFormLocalData = (coupon) => {
         applyOn: coupon.applyOn ?? 'invoice_amount',
         couponCode: coupon.couponCode ?? '',
         couponId: coupon.id ?? '',
-        discountAmount: coupon.discountAmount ?? toAmount(0, 'USD', '$'),
+        discountAmount: coupon.discountAmount,
         discountPercentage: coupon.discountPercentage != null
             ? String(coupon.discountPercentage)
             : '',

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

@@ -24,7 +24,7 @@ export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingA
             quantity: 1,
         })),
     ];
-    const setupFee = localData.setupFee.amount;
+    const setupFee = localData.setupFee?.amount;
     const poNumber = localData.poNumber.trim();
     const trialEnd = localData.trialEnd.trim();
     return {
@@ -34,9 +34,7 @@ export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingA
         currency_code: localData.preferredCurrencyCode,
         customer_id: localData.customerId,
         subscription_items: items,
-        ...(Number.isFinite(setupFee) && setupFee !== 0
-            ? { setup_fee: setupFee }
-            : {}),
+        ...(setupFee != null ? { setup_fee: setupFee } : {}),
         ...(poNumber !== '' ? { po_number: poNumber } : {}),
         ...(trialEnd !== '' ? { trial_end: trialEnd } : {}),
         ...(localData.couponId !== '' ? { coupon_ids: [localData.couponId] } : {}),

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

@@ -1,4 +1,3 @@
-import { toAmount } from '../../../commonStateTypes/amount';
 /** `AddressType` key used when the subscription form opens the shared Address screen. */
 export const INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = 'invoicing_subscription_shipping_address';
 /**
@@ -45,7 +44,6 @@ export const initialInvoicingSubscriptionFormLocalData = {
     planQuantity: 1,
     poNumber: '',
     preferredCurrencyCode: 'USD',
-    setupFee: toAmount(0, 'USD', '$'),
     trialEnd: '',
 };
 /** Seed the form draft from an existing subscription entity (edit mode). */
@@ -67,8 +65,7 @@ export const entityToInvoicingSubscriptionFormLocalData = (subscription) => {
         planQuantity: planItem?.quantity ?? 1,
         poNumber: subscription.poNumber ?? '',
         preferredCurrencyCode: subscription.currencyCode ?? 'USD',
-        setupFee: subscription.setupFee ??
-            toAmount(0, subscription.currencyCode ?? 'USD', '$'),
+        setupFee: subscription.setupFee,
         trialEnd: subscription.trialEnd != null
             ? subscription.trialEnd.format('YYYY-MM-DD')
             : '',

package/lib/esm/view/invoicing/recordPayment/recordPaymentFormConfig.js

@@ -1,4 +1,3 @@
-import { toAmount } from '../../../commonStateTypes/amount';
 /**
  * Canonical value sets for the Record Payment form. CES owns the values;
  * web-components maps each value to a localized label.
@@ -26,7 +25,6 @@ export const INVOICING_PAYMENT_GATEWAY_VALUES = [
     'other',
 ];
 export const initialRecordPaymentFormLocalData = {
-    amount: toAmount(0, 'USD', '$'),
     comment: '',
     customerId: '',
     date: '',

package/lib/esm/view/invoicing/recordPayment/recordPaymentPayload.js

@@ -12,7 +12,7 @@ export const localDataToInvoiceRecordPaymentBody = (localData) => {
     const date = localData.date.trim();
     const referenceNumber = trimOrUndefined(localData.referenceNumber);
     return {
-        amount: localData.amount.amount,
+        amount: localData.amount?.amount ?? 0,
         payment_method: localData.paymentMethod,
         ...(gateway != null ? { gateway } : {}),
         ...(date !== '' ? { date } : {}),
@@ -25,7 +25,7 @@ export const localDataToInvoiceRecordPaymentBody = (localData) => {
  * and the linked invoice into `linked_invoices`. Currency is locked to USD.
  */
 export const localDataToRecordPaymentPayload = (localData) => {
-    const amount = localData.amount.amount;
+    const amount = localData.amount?.amount ?? 0;
     const gateway = trimOrUndefined(localData.gateway);
     const date = localData.date.trim();
     const transactionId = trimOrUndefined(localData.transactionId);