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

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

@@ -1,6 +1,11 @@
 export const initialCreateCreditNoteFormLocalData = () => ({
     customerId: '',
-    lineItems: [{ description: '', quantity: '1', unitAmount: '' }],
+    lineItems: [
+        {
+            description: '',
+            quantity: '1',
+        },
+    ],
     reasonCode: '',
     referenceInvoiceId: '',
 });

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

@@ -1,15 +1,8 @@
-const dollarsFromAmountString = (value) => {
-    const parsed = Number.parseFloat(value);
-    if (Number.isNaN(parsed)) {
-        return 0;
-    }
-    return parsed;
-};
 export const localDataToCreateCreditNotePayload = (localData) => {
     const lineItems = localData.lineItems
         .map((lineItem) => {
         const quantity = Math.round(Number.parseFloat(lineItem.quantity));
-        const unitAmount = dollarsFromAmountString(lineItem.unitAmount);
+        const unitAmount = lineItem.unitAmount?.amount ?? 0;
         return {
             description: lineItem.description.trim(),
             quantity,

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

@@ -31,7 +31,7 @@ const tierToPayload = (tier) => ({
     package_size: hasValue(tier.packageSize)
         ? Number(tier.packageSize)
         : undefined,
-    price: toAmountValue(tier.price),
+    price: tier.price?.amount ?? 0,
     pricing_type: tier.pricingType,
     starting_unit: Number(tier.startingUnit) || 1,
 });
@@ -45,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 : toAmountValue(subFamily.priceDollars),
+        price: tiered ? 0 : (subFamily.priceDollars?.amount ?? 0),
         pricing_model: subFamily.pricingModel,
         show_description_in_quotes: subFamily.showDescriptionInQuotes,
         tiers: tiered ? subFamily.tiers.map(tierToPayload) : [],
@@ -112,7 +112,6 @@ export const catalogDetailEditValuesToSavePayload = (values, itemType = 'plan',
         productUpdates,
     };
 };
-const toAmountValue = (value) => Number(value) || 0;
 /** Build POST /catalog/products body for Create sub-family. */
 export const createSubFamilyFormToPayload = (itemId, itemType, values) => {
     const name = values.name.trim();
@@ -123,7 +122,7 @@ export const createSubFamilyFormToPayload = (itemId, itemType, values) => {
         is_taxable: true,
         item_id: itemId,
         name,
-        price: toAmountValue(values.priceDollars),
+        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 != null ? String(product.price.amount) : '',
+    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,17 +7,16 @@ const toProductCode = (value) => value
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-|-$/g, '');
-const toAmountValue = (value) => Number(value) || 0;
-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;
 };
@@ -31,7 +30,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
         free_quantity: Number(subFamily.freeQuantity) || 0,
         is_taxable: subFamily.isTaxable,
         name,
-        price: tiered ? 0 : toAmountValue(subFamily.priceDollars),
+        price: tiered ? 0 : (subFamily.priceDollars?.amount ?? 0),
         price_code: priceCode,
         pricing_model: subFamily.pricingModel,
         show_description_in_invoices: subFamily.showDescriptionInInvoices,
@@ -70,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: toAmountValue(tier.price),
+            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

@@ -44,11 +44,12 @@ export const isTieredCatalogPricingModel = (model) => ['tiered', 'volume', 'stai
 export const blankInvoicingCatalogTier = (startingUnit = '1') => ({
     endingUnit: '',
     packageSize: '',
-    price: '',
     pricingType: 'per_unit',
     startingUnit,
 });
 export const blankInvoicingCatalogSubFamily = () => ({
+    accountingCategory: '',
+    accountingCode: '',
     billingCycles: '',
     description: '',
     freeQuantity: '0',
@@ -58,12 +59,12 @@ export const blankInvoicingCatalogSubFamily = () => ({
     name: '',
     period: '1',
     periodUnit: 'month',
-    priceDollars: '',
     priceCode: '',
     pricingModel: 'flat_fee',
     prorationType: 'site_default',
     showDescriptionInInvoices: true,
     showDescriptionInQuotes: true,
+    sku: '',
     tiers: [blankInvoicingCatalogTier('1')],
     trialEndAction: 'site_default',
     trialPeriod: '',
@@ -76,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,
@@ -85,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 != null ? String(product.price.amount) : '',
+        priceDollars: product.price,
         priceCode: product.priceCode ?? '',
         pricingModel: product.pricingModel ?? 'flat_fee',
         prorationType: product.prorationType ?? 'site_default',
@@ -95,7 +99,7 @@ export const invoicingProductToCatalogItemFormSubFamily = (product) => {
             ? product.tiers.map((tier) => ({
                 endingUnit: tier.endingUnit != null ? String(tier.endingUnit) : '',
                 packageSize: tier.packageSize != null ? String(tier.packageSize) : '',
-                price: String(tier.price.amount),
+                price: tier.price,
                 pricingType: tier.pricingType ?? 'per_unit',
                 startingUnit: String(tier.startingUnit ?? 1),
             }))
@@ -106,8 +110,6 @@ export const invoicingProductToCatalogItemFormSubFamily = (product) => {
     };
 };
 export const initialInvoicingCatalogItemFormLocalData = {
-    accountingCategory: '',
-    accountingCode: '',
     applicableItems: [],
     catalogType: 'plan',
     description: '',
@@ -115,7 +117,6 @@ export const initialInvoicingCatalogItemFormLocalData = {
     itemApplicability: 'all',
     name: '',
     productCode: '',
-    sku: '',
     subFamilies: [blankInvoicingCatalogSubFamily()],
     unit: '',
 };
@@ -136,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 ?? '',
@@ -145,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,8 +22,8 @@ export const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
         data.discount_percentage = Number(localData.discountPercentage);
     }
     if (localData.discountType === 'fixed_amount') {
-        if (localData.discountAmount.trim() !== '') {
-            data.discount_amount = Number(localData.discountAmount);
+        if (localData.discountAmount != null) {
+            data.discount_amount = localData.discountAmount.amount;
         }
         data.currency_code = 'USD';
     }

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

@@ -2,7 +2,6 @@ export const initialInvoicingCouponFormLocalData = {
     applyOn: 'invoice_amount',
     couponCode: '',
     couponId: '',
-    discountAmount: '',
     discountPercentage: '',
     discountQuantity: '',
     discountType: 'percentage',
@@ -25,7 +24,7 @@ export const entityToInvoicingCouponFormLocalData = (coupon) => {
         applyOn: coupon.applyOn ?? 'invoice_amount',
         couponCode: coupon.couponCode ?? '',
         couponId: coupon.id ?? '',
-        discountAmount: coupon.discountAmount != null ? String(coupon.discountAmount.amount) : '',
+        discountAmount: coupon.discountAmount,
         discountPercentage: coupon.discountPercentage != null
             ? String(coupon.discountPercentage)
             : '',

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

@@ -24,8 +24,7 @@ export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingA
             quantity: 1,
         })),
     ];
-    const setupFee = localData.setupFee.trim();
-    const parsedSetupFee = Number.parseFloat(setupFee);
+    const setupFee = localData.setupFee?.amount;
     const poNumber = localData.poNumber.trim();
     const trialEnd = localData.trialEnd.trim();
     return {
@@ -35,9 +34,7 @@ export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingA
         currency_code: localData.preferredCurrencyCode,
         customer_id: localData.customerId,
         subscription_items: items,
-        ...(setupFee !== '' && !Number.isNaN(parsedSetupFee)
-            ? { setup_fee: parsedSetupFee }
-            : {}),
+        ...(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

@@ -44,7 +44,6 @@ export const initialInvoicingSubscriptionFormLocalData = {
     planQuantity: 1,
     poNumber: '',
     preferredCurrencyCode: 'USD',
-    setupFee: '',
     trialEnd: '',
 };
 /** Seed the form draft from an existing subscription entity (edit mode). */
@@ -66,7 +65,7 @@ export const entityToInvoicingSubscriptionFormLocalData = (subscription) => {
         planQuantity: planItem?.quantity ?? 1,
         poNumber: subscription.poNumber ?? '',
         preferredCurrencyCode: subscription.currencyCode ?? 'USD',
-        setupFee: '',
+        setupFee: subscription.setupFee,
         trialEnd: subscription.trialEnd != null
             ? subscription.trialEnd.format('YYYY-MM-DD')
             : '',

package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboConnectionEpic.js

@@ -6,8 +6,8 @@ import { fetchInvoicingQboConnection, updateInvoicingQboConnection, updateInvoic
 export const fetchInvoicingQboConnectionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingQboConnection.match), switchMap(() => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/connection`;
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
-        if (isSuccessResponse(response) && response.data != null) {
-            return of(updateInvoicingQboConnection(mapInvoicingQboConnection(response.data)));
+        if (isSuccessResponse(response)) {
+            return of(updateInvoicingQboConnection(mapInvoicingQboConnection(response.data ?? { connected: false })));
         }
         return of(updateInvoicingQboConnectionFailure(response.status));
     }), catchError((error) => of(updateInvoicingQboConnectionFailure(createZeniAPIStatus('Unexpected Error', 'Fetch QBO connection REST API call errored out ' +

package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboSyncHealthEpic.js

@@ -6,8 +6,8 @@ import { fetchInvoicingQboSyncHealth, updateInvoicingQboSyncHealth, updateInvoic
 export const fetchInvoicingQboSyncHealthEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingQboSyncHealth.match), switchMap(() => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/sync-health`;
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
-        if (isSuccessResponse(response) && response.data != null) {
-            return of(updateInvoicingQboSyncHealth(mapInvoicingQboSyncHealth(response.data)));
+        if (isSuccessResponse(response)) {
+            return of(updateInvoicingQboSyncHealth(mapInvoicingQboSyncHealth(response.data ?? {})));
         }
         return of(updateInvoicingQboSyncHealthFailure(response.status));
     }), catchError((error) => of(updateInvoicingQboSyncHealthFailure(createZeniAPIStatus('Unexpected Error', 'Fetch QBO sync health REST API call errored out ' +

package/lib/esm/view/invoicing/invoicingQboView/epics/retryInvoicingQboSyncTaskEpic.js

@@ -8,10 +8,10 @@ export const retryInvoicingQboSyncTaskEpic = (actions$, _state$, zeniAPI) => act
     return zeniAPI
         .postAndGetJSON(apiUrl, {})
         .pipe(switchMap((response) => {
-        if (isSuccessResponse(response) && response.data != null) {
+        if (isSuccessResponse(response)) {
             return of(retryInvoicingQboSyncTaskSuccess({
-                status: response.data.status,
-                taskId: response.data.task_id,
+                status: response.data?.status ?? '',
+                taskId: response.data?.task_id ?? taskId,
             }), fetchInvoicingQboSyncHealth());
         }
         return of(retryInvoicingQboSyncTaskFailure({

package/lib/esm/view/invoicing/issueCreditNote/issueCreditNotePayload.js

@@ -1,15 +1,8 @@
-const dollarsFromAmountString = (value) => {
-    const parsed = Number.parseFloat(value);
-    if (Number.isNaN(parsed)) {
-        return 0;
-    }
-    return parsed;
-};
 export const computeIssueCreditNoteTotal = (lineItems) => lineItems
     .filter((lineItem) => lineItem.selected)
     .reduce((total, lineItem) => {
     const quantity = Number.parseFloat(lineItem.quantity);
-    const unitAmount = dollarsFromAmountString(lineItem.unitAmount);
+    const unitAmount = lineItem.unitAmount.amount;
     if (Number.isNaN(quantity) || quantity <= 0 || unitAmount <= 0) {
         return total;
     }
@@ -20,7 +13,7 @@ export const localDataToIssueCreditNotePayload = (localData) => {
         .filter((lineItem) => lineItem.selected)
         .map((lineItem) => {
         const quantity = Math.round(Number.parseFloat(lineItem.quantity));
-        const unitAmount = dollarsFromAmountString(lineItem.unitAmount);
+        const unitAmount = lineItem.unitAmount.amount;
         return {
             description: lineItem.description,
             quantity,
@@ -43,9 +36,9 @@ export const initializeIssueCreditNoteDraftFromInvoice = (invoice) => ({
         description: lineItem.description,
         id: lineItem.id,
         maxQuantity: lineItem.quantity,
-        maxUnitAmount: lineItem.unitAmount.amount,
+        maxUnitAmount: lineItem.unitAmount,
         quantity: String(lineItem.quantity),
         selected: true,
-        unitAmount: lineItem.unitAmount.amount.toFixed(2),
+        unitAmount: lineItem.unitAmount,
     })),
 });

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

@@ -25,7 +25,6 @@ export const INVOICING_PAYMENT_GATEWAY_VALUES = [
     'other',
 ];
 export const initialRecordPaymentFormLocalData = {
-    amount: '',
     comment: '',
     customerId: '',
     date: '',

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

@@ -1,17 +1,8 @@
+import { toAmount } from '../../../commonStateTypes/amount';
 import { dateNow } from '../../../zeniDayJS';
 import { initialRecordPaymentFormLocalData } from './recordPaymentFormConfig';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
-const dollarsFromAmountString = (value) => {
-    const parsed = Number.parseFloat(value);
-    if (Number.isNaN(parsed)) {
-        return 0;
-    }
-    return parsed;
-};
-const amountDueDollarsFromInvoice = (invoice) => {
-    const amountDue = invoice.amountDue?.amount ?? 0;
-    return amountDue.toFixed(2);
-};
+const amountDueFromInvoice = (invoice) => invoice.amountDue ?? toAmount(0, 'USD', '$');
 /**
  * Build the invoice-scoped Record Payment body from the form draft. Amount stays
  * in dollars for the invoice endpoint.
@@ -21,7 +12,7 @@ export const localDataToInvoiceRecordPaymentBody = (localData) => {
     const date = localData.date.trim();
     const referenceNumber = trimOrUndefined(localData.referenceNumber);
     return {
-        amount: dollarsFromAmountString(localData.amount),
+        amount: localData.amount?.amount ?? 0,
         payment_method: localData.paymentMethod,
         ...(gateway != null ? { gateway } : {}),
         ...(date !== '' ? { date } : {}),
@@ -34,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 = dollarsFromAmountString(localData.amount);
+    const amount = localData.amount?.amount ?? 0;
     const gateway = trimOrUndefined(localData.gateway);
     const date = localData.date.trim();
     const transactionId = trimOrUndefined(localData.transactionId);
@@ -60,7 +51,7 @@ export const localDataToRecordPaymentPayload = (localData) => {
 };
 export const initializeRecordPaymentDraftFromInvoice = (invoice) => ({
     ...initialRecordPaymentFormLocalData,
-    amount: amountDueDollarsFromInvoice(invoice),
+    amount: amountDueFromInvoice(invoice),
     customerId: invoice.customerID,
     date: dateNow().format('YYYY-MM-DD'),
     invoiceToLink: invoice.id,