@zeniai/client-epic-state 5.2.68 → 5.2.69-beta0MM

package/lib/index.js

@@ -84,9 +84,8 @@ exports.entityToInvoicingCustomerFormLocalData = exports.INVOICING_CUSTOMER_BILL
 exports.runInvoicingSubscriptionAction = exports.runInvoicingDiscountAction = exports.runInvoicingCatalogProductAction = exports.runInvoicingCatalogPlanAction = exports.fetchInvoicingCatalogItemDetailPage = exports.shouldDefaultAdjustmentCreditNote = exports.isBackdatedInvoiceDate = exports.buildVoidInvoiceSubmitBody = exports.updateInvoicingInvoice = exports.runInvoicingInvoiceAction = exports.getInvoicingCouponFormView = exports.getEditInvoicingCouponDetailViewState = exports.initialInvoicingCouponFormLocalData = exports.entityToInvoicingCouponFormLocalData = exports.updateInvoicingCouponFormDraft = exports.submitInvoicingCouponForm = exports.saveInvoicingCoupon = exports.resetEditInvoicingCouponDetailView = exports.fetchInvoicingCouponDetailPage = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.isTieredCatalogPricingModel = exports.initialInvoicingCatalogItemFormLocalData = exports.invoicingProductToCatalogItemFormSubFamily = exports.entityToInvoicingCatalogItemFormLocalData = exports.blankInvoicingCatalogTier = exports.blankInvoicingCatalogSubFamily = exports.INVOICING_CATALOG_TIER_TYPE_VALUES = exports.INVOICING_CATALOG_PRORATION_VALUES = exports.INVOICING_CATALOG_PRICING_MODEL_VALUES = exports.INVOICING_CATALOG_APPLICABILITY_VALUES = exports.updateInvoicingCatalogItemFormDraft = exports.submitInvoicingCatalogItemForm = exports.resetEditInvoicingCatalogItemDetailView = exports.getInvoicingSubscriptionFormView = exports.getEditInvoicingSubscriptionDetailViewState = exports.toInvoicingSubscriptionQuantity = exports.invoicingSubscriptionTodayIso = exports.initialInvoicingSubscriptionFormLocalData = exports.entityToInvoicingSubscriptionFormLocalData = exports.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = exports.updateInvoicingSubscriptionFormDraft = exports.submitInvoicingSubscriptionForm = exports.resetEditInvoicingSubscriptionDetailView = exports.initializeInvoicingSubscriptionAddress = exports.fetchInvoicingSubscriptionFormPage = exports.getInvoicingCustomerFormView = exports.initialInvoicingCustomerFormLocalData = void 0;
 exports.ALL_INVOICING_SUBSCRIPTION_SORT_KEYS = exports.updateInvoicingSubscriptionFilters = exports.setInvoicingSubscriptionActiveTab = exports.fetchInvoicingSubscriptionListPage = exports.fetchInvoicingSubscriptionList = exports.fetchInvoicingSubscriptionCounts = exports.updateInvoicingSubscriptions = exports.removeInvoicingSubscription = exports.resetPromotionalCreditAction = exports.submitAddPromotionalCredits = exports.getInvoicingSetupIntentFetchState = exports.getInvoicingSetupIntent = exports.getInvoicingSentPaymentLinkMagicUrl = exports.getInvoicingSentPaymentLinkEmail = exports.getInvoicingPlaidLinkToken = exports.getInvoicingPaymentMethodSaveState = exports.getInvoicingPaymentLinkSendState = exports.sendInvoicingPaymentLink = exports.saveInvoicingPaymentMethod = exports.resetInvoicingCustomerPaymentMethod = exports.fetchInvoicingPlaidLinkToken = exports.createInvoicingSetupIntent = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.getInvoicingCustomerListView = exports.INVOICING_CUSTOMER_COLUMNS = exports.ALL_INVOICING_CUSTOMER_TAB_IDS = exports.ALL_INVOICING_CUSTOMER_SORT_KEYS = exports.updateInvoicingCustomerFilters = exports.setInvoicingCustomerActiveTab = exports.fetchInvoicingCustomerListPage = exports.fetchInvoicingCustomerList = exports.fetchInvoicingCustomerCounts = exports.updateInvoicingCustomers = exports.removeInvoicingCustomer = exports.INVOICING_LIST_PAGE_SIZE = exports.uploadInvoicingMigrationFiles = exports.startInvoicingMigration = exports.rollbackInvoicingMigration = exports.retryInvoicingMigration = exports.connectInvoicingChargebee = exports.getInvoicingDataImportView = exports.setInvoicingActiveMigrationSessionId = exports.fetchInvoicingMigrationSessions = exports.fetchInvoicingMigrationSession = exports.fetchInvoicingMigrationDiagnostics = exports.fetchInvoicingDataImportStatus = exports.runInvoicingPaymentAction = exports.runInvoicingDunningAction = void 0;
 exports.getInvoicingCouponListView = exports.getInvoicingCouponListNextCursor = exports.getInvoicingCouponListItems = exports.getInvoicingCouponListHasMore = exports.getInvoicingCouponListFilters = exports.getInvoicingCouponListFetchState = exports.getInvoicingCouponCounts = exports.INVOICING_COUPON_COLUMNS = exports.ALL_INVOICING_COUPON_TAB_IDS = exports.ALL_INVOICING_COUPON_SORT_KEYS = exports.updateInvoicingCouponFilters = exports.setInvoicingCouponActiveTab = exports.fetchInvoicingCouponListPage = exports.fetchInvoicingCouponList = exports.fetchInvoicingCouponCounts = exports.updateInvoicingCoupons = exports.removeInvoicingCoupon = exports.getInvoicingCreditNoteDetail = exports.getInvoicingCreditNoteById = exports.fetchInvoicingCreditNoteDetail = exports.getInvoicingCreditNoteListView = exports.INVOICING_CREDIT_NOTE_COLUMNS = exports.ALL_INVOICING_CREDIT_NOTE_TAB_IDS = exports.ALL_INVOICING_CREDIT_NOTE_SORT_KEYS = exports.updateInvoicingCreditNoteFilters = exports.setInvoicingCreditNoteActiveTab = exports.fetchInvoicingCreditNoteListPage = exports.fetchInvoicingCreditNoteList = exports.fetchInvoicingCreditNoteCounts = exports.updateInvoicingCreditNotes = exports.removeInvoicingCreditNote = exports.getInvoicingTransactionDetail = exports.getInvoicingTransactionById = exports.fetchInvoicingTransactionDetail = exports.getInvoicingTransactionListView = exports.INVOICING_TRANSACTION_COLUMNS = exports.ALL_INVOICING_TRANSACTION_TAB_IDS = exports.ALL_INVOICING_TRANSACTION_SORT_KEYS = exports.updateInvoicingTransactionFilters = exports.setInvoicingTransactionActiveTab = exports.fetchInvoicingTransactionListPage = exports.fetchInvoicingTransactionList = exports.updateInvoicingTransactions = exports.removeInvoicingTransaction = exports.getInvoicingSubscriptionById = exports.fetchInvoicingSubscriptionDetailPage = exports.fetchInvoicingSubscriptionDetail = exports.getInvoicingSubscriptionListView = exports.INVOICING_SUBSCRIPTION_COLUMNS = exports.ALL_INVOICING_SUBSCRIPTION_TAB_IDS = void 0;
-exports.updateInvoicingQboSettingsDraft = exports.updateInvoicingBrandingFormDraft = exports.submitInvoicingQboSettings = exports.submitInvoicingBrandingForm = exports.saveInvoicingSettings = exports.resetSaveInvoicingSettings = exports.resetInvoicingQboSettingsDraft = exports.resetInvoicingBrandingFormDraft = exports.fetchInvoicingSettings = exports.disconnectInvoicingStripe = exports.connectInvoicingStripe = exports.getInvoicingProductById = exports.getLowestInvoicingPlanPricePointAmount = exports.getInvoicingPlanById = exports.fetchInvoicingCatalogItemDetail = exports.getInvoicingCatalogListView = exports.INVOICING_PRODUCT_COLUMNS = exports.ALL_INVOICING_PRODUCT_SORT_KEYS = exports.updateInvoicingCatalogProductFilters = exports.updateInvoicingCatalogPlanFilters = exports.fetchInvoicingCatalogProductList = exports.fetchInvoicingCatalogPlanList = exports.fetchInvoicingCatalogListPage = exports.fetchInvoicingCatalogCounts = exports.updateInvoicingProducts = exports.removeInvoicingProduct = exports.updateInvoicingPlans = exports.removeInvoicingPlan = exports.mergeInvoicingPlanSubFamily = exports.getInvoicingDunningEmailPreview = exports.getInvoicingDunningCaseDetail = exports.getInvoicingDunningCaseById = exports.invalidateInvoicingDunningEmailPreview = exports.fetchInvoicingDunningEmailPreviewPage = exports.fetchInvoicingDunningCaseDetailPage = exports.fetchInvoicingDunningCaseDetail = exports.clearInvoicingDunningCaseDetailView = exports.getInvoicingDunningCaseListView = exports.INVOICING_DUNNING_CASE_COLUMNS = exports.ALL_INVOICING_DUNNING_CASE_TAB_IDS = exports.ALL_INVOICING_DUNNING_CASE_SORT_KEYS = exports.updateInvoicingDunningCaseFilters = exports.setInvoicingDunningCaseActiveTab = exports.fetchInvoicingDunningCaseListPage = exports.fetchInvoicingDunningCaseList = exports.fetchInvoicingDunningCaseCounts = exports.updateInvoicingDunningCases = exports.removeInvoicingDunningCase = exports.fetchInvoicingCouponDetail = exports.getInvoicingCouponById = void 0;
-exports.isAutoReversedAccrual = exports.getExpenseAutomationActualMatchingView = exports.getExpenseAutomationActualMatchingMatchView = exports.parseActualMatchingMatchId = exports.getCloseMatchAfterUndoMatchId = exports.getCloseMatchAfterUndo = exports.getCloseMatchAfterIgnoreMatchId = exports.getActualMatchingMatchModalConfirmStatus = exports.getActualMatchingReversalDate = exports.getActualMatchingAmount = exports.isPendingReviewRow = exports.isRenderableOneTimeAccrual = exports.isOneTimeAccrualRow = exports.isExistingTabRow = exports.isAiAccountantSchedule = exports.isAccruedScheduleRow = exports.getJEScheduleRowType = exports.getExpenseAutomationJEOneTimeAccrualDetailView = exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = exports.updateInvoicingConfig = exports.resetInvoicingConfigActionStates = exports.fetchInvoicingConfig = exports.enableInvoicing = exports.acceptInvoicingTerms = exports.toInvoicingQboCustomerMatchingMode = exports.toInvoicingNamedOptionsByKey = exports.getInvoicingQboAccountMappingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTask = exports.fetchInvoicingQboSyncHealth = exports.fetchInvoicingQboConnection = exports.fetchInvoicingAccountingPickers = exports.isStripeConnectedFromSettings = exports.initialInvoicingBrandingFormLocalData = exports.entityToInvoicingBrandingFormLocalData = exports.INVOICING_BUSINESS_ADDRESS_TYPE = exports.invoicingQboSettingsLocalDataToPayload = exports.initialInvoicingQboSettingsLocalData = exports.entityToInvoicingQboSettingsLocalData = exports.getInvoicingSettingsView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = exports.getInvoicingQboSettingsFormView = exports.getInvoicingBrandingFormView = exports.updateInvoicingSettings = void 0;
-exports.isPendingReviewAccrual = exports.isManuallyReversedAccrual = void 0;
+exports.getInvoicingQboSettingsFormView = exports.getInvoicingBrandingFormView = exports.updateInvoicingSettings = exports.updateInvoicingQboSettingsDraft = exports.updateInvoicingBrandingFormDraft = exports.submitInvoicingQboSettings = exports.submitInvoicingBrandingForm = exports.saveInvoicingSettings = exports.resetSaveInvoicingSettings = exports.resetInvoicingQboSettingsDraft = exports.resetInvoicingBrandingFormDraft = exports.fetchInvoicingSettings = exports.disconnectInvoicingStripe = exports.connectInvoicingStripe = exports.getLowestInvoicingCatalogPricePointAmount = exports.getInvoicingCatalogItemById = exports.fetchInvoicingCatalogItemDetail = exports.getInvoicingCatalogListView = exports.INVOICING_PRODUCT_COLUMNS = exports.ALL_INVOICING_PRODUCT_SORT_KEYS = exports.updateInvoicingCatalogProductFilters = exports.updateInvoicingCatalogPlanFilters = exports.fetchInvoicingCatalogProductList = exports.fetchInvoicingCatalogPlanList = exports.fetchInvoicingCatalogListPage = exports.fetchInvoicingCatalogCounts = exports.updateInvoicingCatalogItems = exports.removeInvoicingCatalogItem = exports.mergeInvoicingCatalogPricePoint = exports.getInvoicingDunningEmailPreview = exports.getInvoicingDunningCaseDetail = exports.getInvoicingDunningCaseById = exports.invalidateInvoicingDunningEmailPreview = exports.fetchInvoicingDunningEmailPreviewPage = exports.fetchInvoicingDunningCaseDetailPage = exports.fetchInvoicingDunningCaseDetail = exports.clearInvoicingDunningCaseDetailView = exports.getInvoicingDunningCaseListView = exports.INVOICING_DUNNING_CASE_COLUMNS = exports.ALL_INVOICING_DUNNING_CASE_TAB_IDS = exports.ALL_INVOICING_DUNNING_CASE_SORT_KEYS = exports.updateInvoicingDunningCaseFilters = exports.setInvoicingDunningCaseActiveTab = exports.fetchInvoicingDunningCaseListPage = exports.fetchInvoicingDunningCaseList = exports.fetchInvoicingDunningCaseCounts = exports.updateInvoicingDunningCases = exports.removeInvoicingDunningCase = exports.fetchInvoicingCouponDetail = exports.getInvoicingCouponById = void 0;
+exports.isPendingReviewAccrual = exports.isManuallyReversedAccrual = exports.isAutoReversedAccrual = exports.getExpenseAutomationActualMatchingView = exports.getExpenseAutomationActualMatchingMatchView = exports.parseActualMatchingMatchId = exports.getCloseMatchAfterUndoMatchId = exports.getCloseMatchAfterUndo = exports.getCloseMatchAfterIgnoreMatchId = exports.getActualMatchingMatchModalConfirmStatus = exports.getActualMatchingReversalDate = exports.getActualMatchingAmount = exports.isPendingReviewRow = exports.isRenderableOneTimeAccrual = exports.isOneTimeAccrualRow = exports.isExistingTabRow = exports.isAiAccountantSchedule = exports.isAccruedScheduleRow = exports.getJEScheduleRowType = exports.getExpenseAutomationJEOneTimeAccrualDetailView = exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = exports.updateInvoicingConfig = exports.resetInvoicingConfigActionStates = exports.fetchInvoicingConfig = exports.enableInvoicing = exports.acceptInvoicingTerms = exports.toInvoicingQboCustomerMatchingMode = exports.toInvoicingNamedOptionsByKey = exports.getInvoicingQboAccountMappingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTask = exports.fetchInvoicingQboSyncHealth = exports.fetchInvoicingQboConnection = exports.fetchInvoicingAccountingPickers = exports.isStripeConnectedFromSettings = exports.initialInvoicingBrandingFormLocalData = exports.entityToInvoicingBrandingFormLocalData = exports.INVOICING_BUSINESS_ADDRESS_TYPE = exports.invoicingQboSettingsLocalDataToPayload = exports.initialInvoicingQboSettingsLocalData = exports.entityToInvoicingQboSettingsLocalData = exports.getInvoicingSettingsView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = void 0;
 const allowedValue_1 = require("./commonStateTypes/allowedValue");
 Object.defineProperty(exports, "isAllowedValueWithCode", { enumerable: true, get: function () { return allowedValue_1.isAllowedValueWithCode; } });
 Object.defineProperty(exports, "isAllowedValueWithID", { enumerable: true, get: function () { return allowedValue_1.isAllowedValueWithID; } });
@@ -3151,13 +3150,10 @@ Object.defineProperty(exports, "getInvoicingDunningCaseById", { enumerable: true
 Object.defineProperty(exports, "getInvoicingDunningCaseDetail", { enumerable: true, get: function () { return invoicingDunningCaseDetailViewSelector_1.getInvoicingDunningCaseDetail; } });
 Object.defineProperty(exports, "getInvoicingDunningEmailPreview", { enumerable: true, get: function () { return invoicingDunningCaseDetailViewSelector_1.getInvoicingDunningEmailPreview; } });
 // ── Invoicing: catalog (plans + products) ─────────────────────────────────────
-var planReducer_1 = require("./entity/invoicing/plan/planReducer");
-Object.defineProperty(exports, "mergeInvoicingPlanSubFamily", { enumerable: true, get: function () { return planReducer_1.mergeInvoicingPlanSubFamily; } });
-Object.defineProperty(exports, "removeInvoicingPlan", { enumerable: true, get: function () { return planReducer_1.removeInvoicingPlan; } });
-Object.defineProperty(exports, "updateInvoicingPlans", { enumerable: true, get: function () { return planReducer_1.updateInvoicingPlans; } });
-var productReducer_1 = require("./entity/invoicing/product/productReducer");
-Object.defineProperty(exports, "removeInvoicingProduct", { enumerable: true, get: function () { return productReducer_1.removeInvoicingProduct; } });
-Object.defineProperty(exports, "updateInvoicingProducts", { enumerable: true, get: function () { return productReducer_1.updateInvoicingProducts; } });
+var invoicingCatalogReducer_1 = require("./entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
+Object.defineProperty(exports, "mergeInvoicingCatalogPricePoint", { enumerable: true, get: function () { return invoicingCatalogReducer_1.mergeInvoicingCatalogPricePoint; } });
+Object.defineProperty(exports, "removeInvoicingCatalogItem", { enumerable: true, get: function () { return invoicingCatalogReducer_1.removeInvoicingCatalogItem; } });
+Object.defineProperty(exports, "updateInvoicingCatalogItems", { enumerable: true, get: function () { return invoicingCatalogReducer_1.updateInvoicingCatalogItems; } });
 var invoicingCatalogListViewReducer_1 = require("./view/invoicing/invoicingCatalogListView/invoicingCatalogListViewReducer");
 Object.defineProperty(exports, "fetchInvoicingCatalogCounts", { enumerable: true, get: function () { return invoicingCatalogListViewReducer_1.fetchInvoicingCatalogCounts; } });
 Object.defineProperty(exports, "fetchInvoicingCatalogListPage", { enumerable: true, get: function () { return invoicingCatalogListViewReducer_1.fetchInvoicingCatalogListPage; } });
@@ -3172,11 +3168,9 @@ var invoicingCatalogListViewSelector_1 = require("./view/invoicing/invoicingCata
 Object.defineProperty(exports, "getInvoicingCatalogListView", { enumerable: true, get: function () { return invoicingCatalogListViewSelector_1.getInvoicingCatalogListView; } });
 var editInvoicingCatalogItemDetailViewReducer_3 = require("./view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewReducer");
 Object.defineProperty(exports, "fetchInvoicingCatalogItemDetail", { enumerable: true, get: function () { return editInvoicingCatalogItemDetailViewReducer_3.fetchInvoicingCatalogItemDetail; } });
-var planSelector_1 = require("./entity/invoicing/plan/planSelector");
-Object.defineProperty(exports, "getInvoicingPlanById", { enumerable: true, get: function () { return planSelector_1.getInvoicingPlanById; } });
-Object.defineProperty(exports, "getLowestInvoicingPlanPricePointAmount", { enumerable: true, get: function () { return planSelector_1.getLowestInvoicingPlanPricePointAmount; } });
-var productSelector_1 = require("./entity/invoicing/product/productSelector");
-Object.defineProperty(exports, "getInvoicingProductById", { enumerable: true, get: function () { return productSelector_1.getInvoicingProductById; } });
+var invoicingCatalogSelector_1 = require("./entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
+Object.defineProperty(exports, "getInvoicingCatalogItemById", { enumerable: true, get: function () { return invoicingCatalogSelector_1.getInvoicingCatalogItemById; } });
+Object.defineProperty(exports, "getLowestInvoicingCatalogPricePointAmount", { enumerable: true, get: function () { return invoicingCatalogSelector_1.getLowestInvoicingCatalogPricePointAmount; } });
 // ── Invoicing: settings ───────────────────────────────────────────────────────
 var settingsViewReducer_2 = require("./view/invoicing/settingsView/settingsViewReducer");
 Object.defineProperty(exports, "connectInvoicingStripe", { enumerable: true, get: function () { return settingsViewReducer_2.connectInvoicingStripe; } });

package/lib/reducer.d.ts

@@ -240,8 +240,7 @@ declare const reducers: import("redux").Reducer<import("redux").CombinedState<{
     invoicingCustomerState: import("./entity/invoicing/invoicingCustomer/invoicingCustomerState").InvoicingCustomerState;
     invoicingDunningCaseState: import("./entity/invoicing/dunningCase/dunningCaseState").InvoicingDunningCaseState;
     invoicingInvoiceState: import("./entity/invoicing/invoice/invoiceState").InvoiceState;
-    invoicingPlanState: import("./entity/invoicing/plan/planState").InvoicingPlanState;
-    invoicingProductState: import("./entity/invoicing/product/productState").InvoicingProductState;
+    invoicingCatalogState: import("./entity/invoicing/invoicingCatalog/invoicingCatalogState").InvoicingCatalogState;
     invoicingSubscriptionState: import("./entity/invoicing/invoicingSubscription/invoicingSubscriptionState").InvoicingSubscriptionState;
     invoicingTransactionState: import("./entity/invoicing/invoicingTransaction/invoicingTransactionState").InvoicingTransactionState;
     jeSchedulesState: import("./entity/jeSchedules/jeSchedulesState").JESchedulesState;

package/lib/reducer.js

@@ -41,6 +41,7 @@ const redux_1 = require("redux");
 const accountReducer_1 = __importStar(require("./entity/account/accountReducer"));
 const accountGroupReducer_1 = __importStar(require("./entity/accountGroup/accountGroupReducer"));
 const accountReconReducer_1 = __importStar(require("./entity/accountRecon/accountReconReducer"));
+const actualMatchingReducer_1 = __importStar(require("./entity/actualMatching/actualMatchingReducer"));
 const addressReducer_1 = __importStar(require("./entity/address/addressReducer"));
 const aiAccountantCustomerReducer_1 = __importStar(require("./entity/aiAccountantCustomer/aiAccountantCustomerReducer"));
 const aiCfoReducer_1 = __importStar(require("./entity/aiCfo/aiCfoReducer"));
@@ -79,9 +80,7 @@ const invoiceReducer_1 = __importStar(require("./entity/invoicing/invoice/invoic
 const invoicingCustomerReducer_1 = __importStar(require("./entity/invoicing/invoicingCustomer/invoicingCustomerReducer"));
 const invoicingSubscriptionReducer_1 = __importStar(require("./entity/invoicing/invoicingSubscription/invoicingSubscriptionReducer"));
 const invoicingTransactionReducer_1 = __importStar(require("./entity/invoicing/invoicingTransaction/invoicingTransactionReducer"));
-const planReducer_1 = __importStar(require("./entity/invoicing/plan/planReducer"));
-const productReducer_1 = __importStar(require("./entity/invoicing/product/productReducer"));
-const actualMatchingReducer_1 = __importStar(require("./entity/actualMatching/actualMatchingReducer"));
+const invoicingCatalogReducer_1 = __importStar(require("./entity/invoicing/invoicingCatalog/invoicingCatalogReducer"));
 const jeSchedulesReducer_1 = __importStar(require("./entity/jeSchedules/jeSchedulesReducer"));
 const merchantReducer_1 = __importStar(require("./entity/merchant/merchantReducer"));
 const monthEndCloseChecksReducer_1 = __importStar(require("./entity/monthEndCloseChecks/monthEndCloseChecksReducer"));
@@ -355,8 +354,7 @@ const initialEntitiesState = {
     invoicingCustomerState: invoicingCustomerReducer_1.initialState,
     invoicingDunningCaseState: dunningCaseReducer_1.initialState,
     invoicingInvoiceState: invoiceReducer_1.initialState,
-    invoicingPlanState: planReducer_1.initialState,
-    invoicingProductState: productReducer_1.initialState,
+    invoicingCatalogState: invoicingCatalogReducer_1.initialState,
     invoicingSubscriptionState: invoicingSubscriptionReducer_1.initialState,
     invoicingTransactionState: invoicingTransactionReducer_1.initialState,
     jeSchedulesState: jeSchedulesReducer_1.initialState,
@@ -642,8 +640,7 @@ const entityReducers = {
     invoicingCustomerState: invoicingCustomerReducer_1.default,
     invoicingDunningCaseState: dunningCaseReducer_1.default,
     invoicingInvoiceState: invoiceReducer_1.default,
-    invoicingPlanState: planReducer_1.default,
-    invoicingProductState: productReducer_1.default,
+    invoicingCatalogState: invoicingCatalogReducer_1.default,
     invoicingSubscriptionState: invoicingSubscriptionReducer_1.default,
     invoicingTransactionState: invoicingTransactionReducer_1.default,
     jeSchedulesState: jeSchedulesReducer_1.default,

package/lib/rootStateTypes.d.ts

@@ -1,6 +1,7 @@
 import { AccountState } from './entity/account/accountState';
 import { AccountGroupState } from './entity/accountGroup/accountGroupState';
 import { AccountReconState } from './entity/accountRecon/accountReconState';
+import { ActualMatchingState } from './entity/actualMatching/actualMatchingState';
 import { AddressState } from './entity/address/addressState';
 import { AiAccountantCustomerState } from './entity/aiAccountantCustomer/aiAccountantCustomerState';
 import { AiCfoState } from './entity/aiCfo/aiCfoState';
@@ -39,9 +40,7 @@ import { InvoiceState as InvoicingInvoiceState } from './entity/invoicing/invoic
 import { InvoicingCustomerState } from './entity/invoicing/invoicingCustomer/invoicingCustomerState';
 import { InvoicingSubscriptionState } from './entity/invoicing/invoicingSubscription/invoicingSubscriptionState';
 import { InvoicingTransactionState } from './entity/invoicing/invoicingTransaction/invoicingTransactionState';
-import { InvoicingPlanState } from './entity/invoicing/plan/planState';
-import { InvoicingProductState } from './entity/invoicing/product/productState';
-import { ActualMatchingState } from './entity/actualMatching/actualMatchingState';
+import { InvoicingCatalogState } from './entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { JESchedulesState } from './entity/jeSchedules/jeSchedulesState';
 import { MerchantState } from './entity/merchant/merchant';
 import { MonthEndCloseChecksState } from './entity/monthEndCloseChecks/monthEndCloseChecksState';
@@ -306,13 +305,12 @@ export type EntitiesState = {
     forecastState: ForecastState;
     globalMerchantState: GlobalMerchantState;
     insightState: InsightState;
+    invoicingCatalogState: InvoicingCatalogState;
     invoicingCouponState: InvoicingCouponState;
     invoicingCreditNoteState: InvoicingCreditNoteState;
     invoicingCustomerState: InvoicingCustomerState;
     invoicingDunningCaseState: InvoicingDunningCaseState;
     invoicingInvoiceState: InvoicingInvoiceState;
-    invoicingPlanState: InvoicingPlanState;
-    invoicingProductState: InvoicingProductState;
     invoicingSubscriptionState: InvoicingSubscriptionState;
     invoicingTransactionState: InvoicingTransactionState;
     jeSchedulesState: JESchedulesState;

package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.d.ts

@@ -16,9 +16,9 @@ export declare const clearExpenseAutomationJESchedulesView: import("@reduxjs/too
     localData: NewOneTimeAccrualLocalData;
 }, "expenseAutomationJESchedulesView/createOneTimeAccrual", never, never>, createOneTimeAccrualFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: ZeniAPIStatus;
-}, "expenseAutomationJESchedulesView/createOneTimeAccrualFailure">, createOneTimeAccrualSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/createOneTimeAccrualSuccess">, ignoreOneTimeAccrual: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accrualId: string, reason: "paused" | "no_activity" | "too_small" | "need_invoice" | "other_ignore", note?: string | undefined], {
+}, "expenseAutomationJESchedulesView/createOneTimeAccrualFailure">, createOneTimeAccrualSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/createOneTimeAccrualSuccess">, ignoreOneTimeAccrual: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accrualId: string, reason: "no_activity" | "paused" | "too_small" | "need_invoice" | "other_ignore", note?: string | undefined], {
     accrualId: string;
-    reason: "paused" | "no_activity" | "too_small" | "need_invoice" | "other_ignore";
+    reason: "no_activity" | "paused" | "too_small" | "need_invoice" | "other_ignore";
     note: string | undefined;
 }, "expenseAutomationJESchedulesView/ignoreOneTimeAccrual", never, never>, oneTimeAccrualActionFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     accrualId: ID;

package/lib/view/expenseAutomationView/selectorTypes/actualMatchingViewSelectorTypes.d.ts

@@ -5,13 +5,14 @@ import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelecto
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingTransactionSearchResult, ActualMatchingViewUIState, MatchAndReverseResult } from '../types/actualMatchingViewState';
 export type ActualMatchingRowKind = 'auto_reversed' | 'pending_review' | 'manually_reversed';
+export type ActualMatchingJournalEntryIds = Pick<JEOneTimeAccrual, 'reversalTransactionId' | 'reversalTransactionIntegrationId' | 'transactionId' | 'transactionIntegrationId'>;
 export type ActualMatchingGroupedAccrual = {
     accrualId: ID;
     estimatedAmount?: Amount;
     jeDebitAccountName?: string;
     memo?: string;
     serviceMonth?: string;
-};
+} & ActualMatchingJournalEntryIds;
 export interface ActualMatchingRow extends JEOneTimeAccrual {
     accruedAmount: Amount;
     actualAmount: Amount;

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.js

@@ -20,8 +20,8 @@ exports.getCloseMatchAfterUndoMatchId = getCloseMatchAfterUndoMatchId;
 exports.getCloseMatchAfterIgnoreMatchId = getCloseMatchAfterIgnoreMatchId;
 exports.getActualMatchingMatchModalConfirmStatus = getActualMatchingMatchModalConfirmStatus;
 exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
-const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const toolkit_1 = require("@reduxjs/toolkit");
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualMatchingSelector");
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
@@ -116,7 +116,11 @@ function collectGroupedMembers(members) {
         estimatedAmount: member.estimatedAmount,
         jeDebitAccountName: member.jeDebitAccountName,
         memo: member.memo,
+        reversalTransactionId: member.reversalTransactionId,
+        reversalTransactionIntegrationId: member.reversalTransactionIntegrationId,
         serviceMonth: member.serviceMonth,
+        transactionId: member.transactionId,
+        transactionIntegrationId: member.transactionIntegrationId,
     }));
 }
 function collectLeftoverMembers(leftovers) {
@@ -334,18 +338,22 @@ function toActualMatchingMatchView(match) {
             : match.leftovers.map(toMatchModalAccrual),
     };
 }
-const EMPTY_ACTUAL_MATCHING_ROWS = [];
 const matchViewSelectorById = new Map();
 function getExpenseAutomationActualMatchingMatchView(state, matchId) {
     let selector = matchViewSelectorById.get(matchId);
     if (selector == null) {
         selector = (0, toolkit_1.createSelector)([
-            (root) => root.expenseAutomationActualMatchingViewState.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
             (root) => root.expenseAutomationActualMatchingViewState.ignoreStatusByMatchId[matchId] ?? NOT_STARTED,
-            (root) => root.expenseAutomationActualMatchingViewState.lastMatchResultsByMatchId?.[matchId],
-            (root) => root.expenseAutomationActualMatchingViewState.lastUndoResultsByMatchId?.[matchId],
-            (root) => root.expenseAutomationActualMatchingViewState.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
-            (root) => root.expenseAutomationActualMatchingViewState.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastMatchResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastUndoResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
             (root) => (0, actualMatchingSelector_1.getActualMatchingMatchById)(root.actualMatchingState, matchId),
         ], (detailFetchState, ignoreStatus, lastMatchResults, lastUndoResults, refreshStatus, undoReversalStatus, match) => ({
             detailFetchState,
@@ -375,7 +383,8 @@ function getActualMatchingMatchModalConfirmStatus(state, matchId) {
     if (matchId != null && matchId !== '') {
         return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
     }
-    return state.expenseAutomationActualMatchingViewState.matchModal.confirmStatus;
+    return state.expenseAutomationActualMatchingViewState.matchModal
+        .confirmStatus;
 }
 function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
@@ -389,14 +398,8 @@ function getExpenseAutomationActualMatchingView(state) {
         .filter((match) => match.members.length > 0)
         .map(toActualMatchingRow);
     const rows = allRows.filter((row) => matchesSearch(row, uiState.searchString));
-    const includePendingReview = uiState.statusFilter !== 'reversed';
-    const includeReversed = uiState.statusFilter !== 'pending_review';
-    const reversed = includeReversed
-        ? sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState)
-        : EMPTY_ACTUAL_MATCHING_ROWS;
-    const pendingReview = includePendingReview
-        ? sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState)
-        : EMPTY_ACTUAL_MATCHING_ROWS;
+    const reversed = sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState);
+    const pendingReview = sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState);
     const kpiSummary = buildActualMatchingKpiSummary(allRows, getTenantDisplayCurrency(state)?.currencyCode);
     const searchedAccruals = matchModal.accrualSearch.results
         .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))

package/lib/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -21,9 +21,8 @@ export interface ActualMatchingViewUIState {
     sortKey: ActualMatchingSortKey;
     sortOrder: SortOrder;
     /**
-     * List-only filter. `all` shows both groups; `pending_review` / `reversed`
-     * empty the other group (`reversed` includes auto and manual). KPI summary
-     * stays on the unfiltered period.
+     * Unused by the list: Pending review and Reversed always render as separate
+     * tables. Kept so persisted UI state and older clients still hydrate.
      */
     statusFilter: ActualMatchingStatusFilter;
 }

package/lib/view/invoicing/createInvoice/createInvoiceSelector.d.ts

@@ -1,8 +1,8 @@
 import { ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { Address } from '../../../entity/address/addressState';
+import { InvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { InvoicingFieldHelpByCode, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
-import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingCreateInvoiceFormLocalData } from './createInvoiceState';
 /**
@@ -38,7 +38,7 @@ export interface CreateInvoiceFormView extends SelectorView {
     fieldHelp: InvoicingFieldHelpByCode;
     localData: InvoicingCreateInvoiceFormLocalData;
     planNames: InvoicingPlanNameOption[];
-    products: InvoicingProduct[];
+    products: InvoicingCatalogPricePoint[];
     savedInvoiceId?: ID;
     settings?: InvoicingSettingsPayload;
 }

package/lib/view/invoicing/createInvoice/createInvoiceSelector.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCreateInvoiceFormView = void 0;
 const addressSelector_1 = require("../../../entity/address/addressSelector");
-const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
+const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
 const invoicingCatalogListViewSelector_1 = require("../invoicingCatalogListView/invoicingCatalogListViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingCustomerListViewSelector_1 = require("../invoicingCustomerListView/invoicingCustomerListViewSelector");
@@ -31,7 +31,7 @@ const hasPerUnitRate = (pricingModel) => pricingModel == null ||
  * `undefined` when there is no safe per-unit rate to prefill.
  */
 const planNamePrefillPrice = (pricePoint) => hasPerUnitRate(pricePoint.pricingModel)
-    ? (0, planSelector_1.invoicingPricePointDisplayAmount)(pricePoint)?.amount
+    ? (0, invoicingCatalogSelector_1.invoicingPricePointDisplayAmount)(pricePoint)?.amount
     : undefined;
 /**
  * Display name for a customer option: company, else the full name, else the

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

@@ -1,16 +1,15 @@
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
-import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
-import { InvoicingAccountingDetailPayload, InvoicingProductPayload } from '../../../entity/invoicing/product/productPayload';
+import { InvoicingAccountingDetailPayload, InvoicingCatalogItemPayload, InvoicingCatalogPricePointPayload } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
-export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingPlanPayload>;
+export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
 /**
- * The price-point half of a save body. `InvoicingProductPayload` is the shape
+ * The price-point half of a save body. `InvoicingCatalogPricePointPayload` is the shape
  * the service returns; a save differs in that a field is cleared by sending an
  * explicit `null`, since an absent key reads as "leave it alone".
  */
-export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingProductPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
+export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingCatalogPricePointPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
     accounting_detail?: InvoicingAccountingDetailPayload | null;
     description?: string | null;
     invoice_notes?: string | null;
@@ -25,7 +24,7 @@ export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingProduct
  * by its own request instead; see
  * `localDataToCreateInvoicingCatalogProductPayloads`.
  */
-export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingPlanPayload>, 'sub_families'> & {
+export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingCatalogItemPayload>, 'sub_families'> & {
     sub_families?: InvoicingCatalogSubFamilySavePayload[];
 };
 /**
@@ -67,6 +66,6 @@ export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: Inv
  * price point that does not exist yet to clear.
  */
 export declare const localDataToCreateInvoicingCatalogProductPayloads: (localData: InvoicingCatalogItemFormLocalData, itemId: string, lookup: InvoicingCatalogAccountingLookup) => InvoicingCatalogSubFamilySavePayload[];
-export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingPlanPayload>;
-export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingProductPayload>;
-export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingPlanPayload>;
+export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
+export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingCatalogPricePointPayload>;
+export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;

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

@@ -2,8 +2,8 @@ import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accou
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
+import { InvoicingCatalogItem } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { InvoicingCatalogItemLifecycleAction, InvoicingCatalogLifecycleActionOption, InvoicingCatalogProductLifecycleAction, InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingNamedOptionsByKey } from '../../../entity/invoicing/invoicingCommonPayload';
-import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingCatalogItemFormLocalData, InvoicingCatalogItemKind } from './editInvoicingCatalogItemDetailViewState';
 export declare const getEditInvoicingCatalogItemDetailViewState: (state: RootState) => FetchStateAndError;
@@ -103,7 +103,7 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
      */
     catalogTierTypeOptionsByPricingModel?: InvoicingNamedOptionsByKey;
     kind?: InvoicingCatalogItemKind;
-    plan?: InvoicingPlan;
+    plan?: InvoicingCatalogItem;
     savedItemId?: ID;
     savedKind?: InvoicingCatalogItemKind;
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getEditInvoicingCatalogItemDetailViewState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
-const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
+const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingFormDraft_1 = require("../invoicingFormDraft");
 const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
@@ -42,7 +42,7 @@ const buildApplicableCatalogItemOptions = (plans) => {
  * Kept referentially stable across unrelated dispatches; the form view filters
  * out the item being edited (see `getInvoicingCatalogItemFormView`).
  */
-exports.getInvoicingApplicableCatalogItemOptions = (0, toolkit_1.createSelector)((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (planState, listViewState) => buildApplicableCatalogItemOptions((0, planSelector_1.getInvoicingPlansByIds)(planState, [
+exports.getInvoicingApplicableCatalogItemOptions = (0, toolkit_1.createSelector)((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => buildApplicableCatalogItemOptions((0, invoicingCatalogSelector_1.getInvoicingCatalogItemsByIds)(catalogState, [
     ...listViewState.planIds,
     ...listViewState.productIds,
 ])));
@@ -67,7 +67,9 @@ const getInvoicingCatalogIncomeAccountIds = (0, toolkit_1.createSelector)([
     : invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_IDS);
 const getInvoicingCatalogItemFormView = (state, id) => {
     const { editDraftById, error, fetchState, newItemDraft, savedItemId, savedKind, } = state.editInvoicingCatalogItemDetailViewState;
-    const plan = id != null ? (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id) : undefined;
+    const plan = id != null
+        ? (0, invoicingCatalogSelector_1.getInvoicingCatalogItemById)(state.invoicingCatalogState, id)
+        : undefined;
     const kind = plan != null ? 'plan' : undefined;
     // No entity fallback: the draft is the one source of form values, seeded from
     // the record by `seedInvoicingCatalogItemFormDraftEpic` when the detail load

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

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { fetchInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetailFailure } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetailFailure> | ReturnType<typeof updateInvoicingPlans>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetailFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
 export declare const fetchInvoicingCatalogItemDetailEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchInvoicingCatalogItemDetailEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
+const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.fetchInvoicingCatalogItemDetail.match), (0, operators_1.switchMap)((action) => {
@@ -12,7 +12,7 @@ const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI) => acti
     return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return [
-                (0, planReducer_1.updateInvoicingPlans)([response.data], 'merge'),
+                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([response.data], 'merge'),
                 (0, editInvoicingCatalogItemDetailViewReducer_1.updateInvoicingCatalogItemDetail)({ id: response.data.id, kind }),
             ];
         }

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

@@ -1,5 +1,4 @@
-import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
-import { InvoicingCatalogPricingModel, InvoicingProduct } from '../../../entity/invoicing/product/productState';
+import { InvoicingCatalogItem, InvoicingCatalogPricePoint, InvoicingCatalogPricingModel } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { InvoicingCatalogItemFormLocalData, InvoicingCatalogItemFormSubFamily, InvoicingCatalogItemFormTier } from './editInvoicingCatalogItemDetailViewState';
 /**
  * Value sets the catalog item form still owns locally: the backend has no enum
@@ -13,9 +12,9 @@ export declare const INVOICING_CATALOG_APPLICABILITY_VALUES: readonly ["all", "r
 export declare const isTieredCatalogPricingModel: (model: string) => boolean;
 export declare const blankInvoicingCatalogTier: (startingUnit?: string) => InvoicingCatalogItemFormTier;
 export declare const blankInvoicingCatalogSubFamily: () => InvoicingCatalogItemFormSubFamily;
-export declare const invoicingProductToCatalogItemFormSubFamily: (product?: InvoicingProduct) => InvoicingCatalogItemFormSubFamily;
+export declare const invoicingProductToCatalogItemFormSubFamily: (product?: InvoicingCatalogPricePoint) => InvoicingCatalogItemFormSubFamily;
 export declare const initialInvoicingCatalogItemFormLocalData: InvoicingCatalogItemFormLocalData;
 /**
  * Seed the form draft from a parent catalog item and its embedded Price points.
  */
-export declare const entityToInvoicingCatalogItemFormLocalData: (item?: InvoicingPlan) => InvoicingCatalogItemFormLocalData;
+export declare const entityToInvoicingCatalogItemFormLocalData: (item?: InvoicingCatalogItem) => InvoicingCatalogItemFormLocalData;

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

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { runInvoicingCatalogPlanAction, runInvoicingCatalogPlanActionFailure, runInvoicingCatalogPlanActionSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof runInvoicingCatalogPlanAction> | ReturnType<typeof runInvoicingCatalogPlanActionSuccess> | ReturnType<typeof runInvoicingCatalogPlanActionFailure> | ReturnType<typeof updateInvoicingPlans>;
+export type ActionType = ReturnType<typeof runInvoicingCatalogPlanAction> | ReturnType<typeof runInvoicingCatalogPlanActionSuccess> | ReturnType<typeof runInvoicingCatalogPlanActionFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
 export declare const runInvoicingCatalogPlanActionEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runInvoicingCatalogPlanActionEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
+const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogPlanAction.match), (0, operators_1.mergeMap)((action) => {
@@ -15,7 +15,7 @@ const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) => action
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return [
-                (0, planReducer_1.updateInvoicingPlans)([response.data], 'merge'),
+                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([response.data], 'merge'),
                 (0, editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogPlanActionSuccess)({ id }),
             ];
         }

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

@@ -1,9 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
-import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
+import { mergeInvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { runInvoicingCatalogProductAction, runInvoicingCatalogProductActionFailure, runInvoicingCatalogProductActionSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof runInvoicingCatalogProductAction> | ReturnType<typeof runInvoicingCatalogProductActionSuccess> | ReturnType<typeof runInvoicingCatalogProductActionFailure> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof updateInvoicingProducts>;
+export type ActionType = ReturnType<typeof runInvoicingCatalogProductAction> | ReturnType<typeof runInvoicingCatalogProductActionSuccess> | ReturnType<typeof runInvoicingCatalogProductActionFailure> | ReturnType<typeof mergeInvoicingCatalogPricePoint>;
 export declare const runInvoicingCatalogProductActionEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runInvoicingCatalogProductActionEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
-const productReducer_1 = require("../../../entity/invoicing/product/productReducer");
+const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogProductAction.match), (0, operators_1.mergeMap)((action) => {
@@ -19,9 +18,10 @@ const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => act
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return [
-                (0, productReducer_1.updateInvoicingProducts)([response.data], 'merge'),
                 ...(parentItemId != null
-                    ? [(0, planReducer_1.mergeInvoicingPlanSubFamily)(parentItemId, response.data)]
+                    ? [
+                        (0, invoicingCatalogReducer_1.mergeInvoicingCatalogPricePoint)(parentItemId, response.data),
+                    ]
                     : []),
                 (0, editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogProductActionSuccess)({ id: stateKey }),
             ];

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

@@ -1,11 +1,10 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { mergeInvoicingPlanSubFamily, updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
-import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
+import { mergeInvoicingCatalogPricePoint, updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
 import { submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof submitInvoicingCatalogItemForm> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure> | ReturnType<typeof updateInvoicingPlans> | ReturnType<typeof updateInvoicingProducts> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof addInvoicingCatalogItem> | ReturnType<typeof openSnackbar>;
+export type ActionType = ReturnType<typeof submitInvoicingCatalogItemForm> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure> | ReturnType<typeof updateInvoicingCatalogItems> | ReturnType<typeof mergeInvoicingCatalogPricePoint> | ReturnType<typeof addInvoicingCatalogItem> | ReturnType<typeof openSnackbar>;
 export declare const saveInvoicingCatalogItemEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveInvoicingCatalogItemEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
-const productReducer_1 = require("../../../entity/invoicing/product/productReducer");
+const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
 const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
@@ -54,11 +53,8 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
                 }
                 const savedProducts = productResponses.flatMap((productResponse) => productResponse.data != null ? [productResponse.data] : []);
                 const resultActions = [
-                    (0, planReducer_1.updateInvoicingPlans)([savedItem], 'merge'),
-                    ...(savedProducts.length > 0
-                        ? [(0, productReducer_1.updateInvoicingProducts)(savedProducts, 'merge')]
-                        : []),
-                    ...savedProducts.map((product) => (0, planReducer_1.mergeInvoicingPlanSubFamily)(savedItem.id, product)),
+                    (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([savedItem], 'merge'),
+                    ...savedProducts.map((product) => (0, invoicingCatalogReducer_1.mergeInvoicingCatalogPricePoint)(savedItem.id, product)),
                     (0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormSuccess)({
                         itemId: savedItem.id,
                         kind: 'plan',