@zeniai/client-epic-state 5.2.69 → 5.2.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (129) hide show
  1. package/lib/entity/aiCfo/aiCfoState.d.ts +2 -2
  2. package/lib/entity/billPay/billTransaction/billTransactionState.d.ts +2 -2
  3. package/lib/entity/chargeCardTransaction/chargeCardTransaction.d.ts +1 -1
  4. package/lib/entity/depositAccountTransaction/depositAccountTransaction.d.ts +1 -1
  5. package/lib/entity/invoicing/plan/planPayload.d.ts +40 -0
  6. package/lib/entity/invoicing/plan/planPayload.js +51 -0
  7. package/lib/entity/invoicing/plan/planReducer.d.ts +14 -0
  8. package/lib/entity/invoicing/{invoicingCatalog/invoicingCatalogReducer.js → plan/planReducer.js} +21 -20
  9. package/lib/entity/invoicing/{invoicingCatalog/invoicingCatalogSelector.d.ts → plan/planSelector.d.ts} +6 -5
  10. package/lib/entity/invoicing/{invoicingCatalog/invoicingCatalogSelector.js → plan/planSelector.js} +12 -12
  11. package/lib/entity/invoicing/plan/planState.d.ts +43 -0
  12. package/lib/entity/invoicing/{invoicingCatalog/invoicingCatalogPayload.d.ts → product/productPayload.d.ts} +6 -44
  13. package/lib/entity/invoicing/{invoicingCatalog/invoicingCatalogPayload.js → product/productPayload.js} +6 -50
  14. package/lib/entity/invoicing/product/productReducer.d.ts +9 -0
  15. package/lib/entity/invoicing/product/productReducer.js +50 -0
  16. package/lib/entity/invoicing/product/productSelector.d.ts +4 -0
  17. package/lib/entity/invoicing/product/productSelector.js +17 -0
  18. package/lib/entity/invoicing/{invoicingCatalog/invoicingCatalogState.d.ts → product/productState.d.ts} +6 -42
  19. package/lib/entity/invoicing/product/productState.js +2 -0
  20. package/lib/entity/jeSchedules/jeSchedulesPayload.d.ts +1 -0
  21. package/lib/entity/jeSchedules/jeSchedulesPayload.js +1 -0
  22. package/lib/entity/jeSchedules/jeSchedulesState.d.ts +1 -0
  23. package/lib/entity/jeSchedules/jeSchedulesTypes.d.ts +4 -4
  24. package/lib/entity/snackbar/snackbarTypes.d.ts +1 -1
  25. package/lib/entity/snackbar/snackbarTypes.js +0 -1
  26. package/lib/epic.d.ts +2 -3
  27. package/lib/epic.js +1 -3
  28. package/lib/esm/entity/invoicing/plan/planPayload.js +47 -0
  29. package/lib/esm/entity/invoicing/{invoicingCatalog/invoicingCatalogReducer.js → plan/planReducer.js} +20 -19
  30. package/lib/esm/entity/invoicing/{invoicingCatalog/invoicingCatalogSelector.js → plan/planSelector.js} +8 -8
  31. package/lib/esm/entity/invoicing/{invoicingCatalog/invoicingCatalogPayload.js → product/productPayload.js} +3 -46
  32. package/lib/esm/entity/invoicing/product/productReducer.js +43 -0
  33. package/lib/esm/entity/invoicing/product/productSelector.js +10 -0
  34. package/lib/esm/entity/invoicing/product/productState.js +1 -0
  35. package/lib/esm/entity/jeSchedules/jeSchedulesPayload.js +1 -0
  36. package/lib/esm/entity/snackbar/snackbarTypes.js +0 -1
  37. package/lib/esm/epic.js +1 -3
  38. package/lib/esm/index.js +8 -6
  39. package/lib/esm/reducer.js +7 -4
  40. package/lib/esm/view/expenseAutomationView/selectors/actualMatchingViewSelector.js +20 -16
  41. package/lib/esm/view/invoicing/createInvoice/createInvoiceEpic.js +1 -9
  42. package/lib/esm/view/invoicing/createInvoice/createInvoiceSelector.js +1 -1
  43. package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.js +3 -5
  44. package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/fetchInvoicingCatalogItemDetailEpic.js +2 -2
  45. package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogPlanActionEpic.js +2 -2
  46. package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogProductActionEpic.js +4 -4
  47. package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js +7 -3
  48. package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/seedInvoicingCatalogItemFormDraftEpic.js +2 -2
  49. package/lib/esm/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer.js +1 -5
  50. package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/saveInvoicingSubscriptionEpic.js +1 -5
  51. package/lib/esm/view/invoicing/invoiceList/invoiceListReducer.js +1 -8
  52. package/lib/esm/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.js +2 -2
  53. package/lib/esm/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.js +2 -2
  54. package/lib/esm/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewSelector.js +4 -4
  55. package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js +11 -31
  56. package/lib/esm/view/onboardingView/customerView/onboardingCustomerViewReducer.js +1 -2
  57. package/lib/esm/view/spendManagement/commonSetup/setupViewReducer.js +1 -21
  58. package/lib/esm/view/spendManagement/commonSetup/setupViewSelector.js +1 -2
  59. package/lib/index.d.ts +14 -11
  60. package/lib/index.js +42 -39
  61. package/lib/reducer.d.ts +2 -1
  62. package/lib/reducer.js +7 -4
  63. package/lib/rootStateTypes.d.ts +5 -3
  64. package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts +1 -1
  65. package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.d.ts +2 -2
  66. package/lib/view/expenseAutomationView/selectorTypes/actualMatchingViewSelectorTypes.d.ts +4 -2
  67. package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.js +20 -16
  68. package/lib/view/expenseAutomationView/types/actualMatchingViewState.d.ts +2 -3
  69. package/lib/view/invoicing/createInvoice/createInvoiceEpic.d.ts +2 -3
  70. package/lib/view/invoicing/createInvoice/createInvoiceEpic.js +0 -8
  71. package/lib/view/invoicing/createInvoice/createInvoiceSelector.d.ts +2 -2
  72. package/lib/view/invoicing/createInvoice/createInvoiceSelector.js +2 -2
  73. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.d.ts +9 -8
  74. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.d.ts +2 -2
  75. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.js +3 -5
  76. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/fetchInvoicingCatalogItemDetailEpic.d.ts +2 -2
  77. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/fetchInvoicingCatalogItemDetailEpic.js +2 -2
  78. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/invoicingCatalogItemFormHelper.d.ts +4 -3
  79. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogPlanActionEpic.d.ts +2 -2
  80. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogPlanActionEpic.js +2 -2
  81. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogProductActionEpic.d.ts +3 -2
  82. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogProductActionEpic.js +4 -4
  83. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.d.ts +3 -2
  84. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js +7 -3
  85. package/lib/view/invoicing/editInvoicingCatalogItemDetailView/seedInvoicingCatalogItemFormDraftEpic.js +2 -2
  86. package/lib/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer.d.ts +1 -3
  87. package/lib/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer.js +2 -6
  88. package/lib/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewSelector.d.ts +2 -2
  89. package/lib/view/invoicing/editInvoicingSubscriptionDetailView/saveInvoicingSubscriptionEpic.d.ts +1 -3
  90. package/lib/view/invoicing/editInvoicingSubscriptionDetailView/saveInvoicingSubscriptionEpic.js +1 -5
  91. package/lib/view/invoicing/invoiceList/invoiceListReducer.d.ts +1 -3
  92. package/lib/view/invoicing/invoiceList/invoiceListReducer.js +2 -9
  93. package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogListPageEpic.d.ts +2 -2
  94. package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.d.ts +2 -2
  95. package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.js +2 -2
  96. package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.d.ts +2 -2
  97. package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.js +2 -2
  98. package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewPayload.d.ts +3 -3
  99. package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewSelector.d.ts +5 -4
  100. package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewSelector.js +4 -4
  101. package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewState.d.ts +1 -1
  102. package/lib/view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewReducer.d.ts +1 -1
  103. package/lib/view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewState.d.ts +1 -1
  104. package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewReducer.d.ts +1 -1
  105. package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState.d.ts +1 -1
  106. package/lib/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js +11 -31
  107. package/lib/view/onboardingView/customerView/onboardingCustomerViewReducer.d.ts +2 -3
  108. package/lib/view/onboardingView/customerView/onboardingCustomerViewReducer.js +1 -2
  109. package/lib/view/onboardingView/customerView/onboardingCustomerViewState.d.ts +0 -4
  110. package/lib/view/scheduleView/scheduleListView/scheduleListTypes.d.ts +1 -1
  111. package/lib/view/spendManagement/billPay/billList/billListReducer.d.ts +5 -5
  112. package/lib/view/spendManagement/billPay/billList/billListState.d.ts +1 -1
  113. package/lib/view/spendManagement/billPay/editBillView/editBillViewReducer.d.ts +2 -2
  114. package/lib/view/spendManagement/commonSetup/setupViewReducer.d.ts +1 -1
  115. package/lib/view/spendManagement/commonSetup/setupViewReducer.js +2 -22
  116. package/lib/view/spendManagement/commonSetup/setupViewSelector.d.ts +0 -1
  117. package/lib/view/spendManagement/commonSetup/setupViewSelector.js +1 -2
  118. package/lib/view/spendManagement/commonSetup/setupViewState.d.ts +0 -1
  119. package/lib/view/spendManagement/commonSetup/types/businessVerification.d.ts +1 -2
  120. package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewReducer.d.ts +2 -2
  121. package/lib/view/spendManagement/reimbursement/remiListView/remiListReducer.d.ts +5 -5
  122. package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts +2 -2
  123. package/package.json +1 -1
  124. package/lib/entity/invoicing/invoicingCatalog/invoicingCatalogReducer.d.ts +0 -12
  125. package/lib/esm/view/spendManagement/commonSetup/epic/setup/resetKycKybEpic.js +0 -37
  126. package/lib/view/spendManagement/commonSetup/epic/setup/resetKycKybEpic.d.ts +0 -8
  127. package/lib/view/spendManagement/commonSetup/epic/setup/resetKycKybEpic.js +0 -41
  128. /package/lib/entity/invoicing/{invoicingCatalog/invoicingCatalogState.js → plan/planState.js} +0 -0
  129. /package/lib/esm/entity/invoicing/{invoicingCatalog/invoicingCatalogState.js → plan/planState.js} +0 -0
@@ -20,8 +20,8 @@ exports.getCloseMatchAfterUndoMatchId = getCloseMatchAfterUndoMatchId;
20
20
  exports.getCloseMatchAfterIgnoreMatchId = getCloseMatchAfterIgnoreMatchId;
21
21
  exports.getActualMatchingMatchModalConfirmStatus = getActualMatchingMatchModalConfirmStatus;
22
22
  exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
23
- const orderBy_1 = __importDefault(require("lodash/orderBy"));
24
23
  const toolkit_1 = require("@reduxjs/toolkit");
24
+ const orderBy_1 = __importDefault(require("lodash/orderBy"));
25
25
  const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
26
26
  const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualMatchingSelector");
27
27
  const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
@@ -116,13 +116,18 @@ function collectGroupedMembers(members) {
116
116
  estimatedAmount: member.estimatedAmount,
117
117
  jeDebitAccountName: member.jeDebitAccountName,
118
118
  memo: member.memo,
119
+ reversalTransactionId: member.reversalTransactionId,
120
+ reversalTransactionIntegrationId: member.reversalTransactionIntegrationId,
119
121
  serviceMonth: member.serviceMonth,
122
+ transactionId: member.transactionId,
123
+ transactionIntegrationId: member.transactionIntegrationId,
120
124
  }));
121
125
  }
122
126
  function collectLeftoverMembers(leftovers) {
123
127
  if (leftovers == null || leftovers.length === 0) {
124
128
  return undefined;
125
129
  }
130
+ // Leftover accruals did not post, so they have no journal-entry ids to open.
126
131
  return leftovers.map((member) => ({
127
132
  accrualId: member.accrualId,
128
133
  estimatedAmount: member.estimatedAmount,
@@ -334,18 +339,22 @@ function toActualMatchingMatchView(match) {
334
339
  : match.leftovers.map(toMatchModalAccrual),
335
340
  };
336
341
  }
337
- const EMPTY_ACTUAL_MATCHING_ROWS = [];
338
342
  const matchViewSelectorById = new Map();
339
343
  function getExpenseAutomationActualMatchingMatchView(state, matchId) {
340
344
  let selector = matchViewSelectorById.get(matchId);
341
345
  if (selector == null) {
342
346
  selector = (0, toolkit_1.createSelector)([
343
- (root) => root.expenseAutomationActualMatchingViewState.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
347
+ (root) => root.expenseAutomationActualMatchingViewState
348
+ .detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
344
349
  (root) => root.expenseAutomationActualMatchingViewState.ignoreStatusByMatchId[matchId] ?? NOT_STARTED,
345
- (root) => root.expenseAutomationActualMatchingViewState.lastMatchResultsByMatchId?.[matchId],
346
- (root) => root.expenseAutomationActualMatchingViewState.lastUndoResultsByMatchId?.[matchId],
347
- (root) => root.expenseAutomationActualMatchingViewState.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
348
- (root) => root.expenseAutomationActualMatchingViewState.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
350
+ (root) => root.expenseAutomationActualMatchingViewState
351
+ .lastMatchResultsByMatchId?.[matchId],
352
+ (root) => root.expenseAutomationActualMatchingViewState
353
+ .lastUndoResultsByMatchId?.[matchId],
354
+ (root) => root.expenseAutomationActualMatchingViewState
355
+ .detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
356
+ (root) => root.expenseAutomationActualMatchingViewState
357
+ .undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
349
358
  (root) => (0, actualMatchingSelector_1.getActualMatchingMatchById)(root.actualMatchingState, matchId),
350
359
  ], (detailFetchState, ignoreStatus, lastMatchResults, lastUndoResults, refreshStatus, undoReversalStatus, match) => ({
351
360
  detailFetchState,
@@ -375,7 +384,8 @@ function getActualMatchingMatchModalConfirmStatus(state, matchId) {
375
384
  if (matchId != null && matchId !== '') {
376
385
  return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
377
386
  }
378
- return state.expenseAutomationActualMatchingViewState.matchModal.confirmStatus;
387
+ return state.expenseAutomationActualMatchingViewState.matchModal
388
+ .confirmStatus;
379
389
  }
380
390
  function getExpenseAutomationActualMatchingView(state) {
381
391
  const { expenseAutomationActualMatchingViewState } = state;
@@ -389,14 +399,8 @@ function getExpenseAutomationActualMatchingView(state) {
389
399
  .filter((match) => match.members.length > 0)
390
400
  .map(toActualMatchingRow);
391
401
  const rows = allRows.filter((row) => matchesSearch(row, uiState.searchString));
392
- const includePendingReview = uiState.statusFilter !== 'reversed';
393
- const includeReversed = uiState.statusFilter !== 'pending_review';
394
- const reversed = includeReversed
395
- ? sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState)
396
- : EMPTY_ACTUAL_MATCHING_ROWS;
397
- const pendingReview = includePendingReview
398
- ? sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState)
399
- : EMPTY_ACTUAL_MATCHING_ROWS;
402
+ const reversed = sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState);
403
+ const pendingReview = sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState);
400
404
  const kpiSummary = buildActualMatchingKpiSummary(allRows, getTenantDisplayCurrency(state)?.currencyCode);
401
405
  const searchedAccruals = matchModal.accrualSearch.results
402
406
  .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
@@ -21,9 +21,8 @@ export interface ActualMatchingViewUIState {
21
21
  sortKey: ActualMatchingSortKey;
22
22
  sortOrder: SortOrder;
23
23
  /**
24
- * List-only filter. `all` shows both groups; `pending_review` / `reversed`
25
- * empty the other group (`reversed` includes auto and manual). KPI summary
26
- * stays on the unfiltered period.
24
+ * Unused by the list: Pending review and Reversed always render as separate
25
+ * tables. Kept so persisted UI state and older clients still hydrate.
27
26
  */
28
27
  statusFilter: ActualMatchingStatusFilter;
29
28
  }
@@ -5,8 +5,7 @@ import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer
5
5
  import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
6
6
  import { RootState } from '../../../rootStateTypes';
7
7
  import { ZeniAPI } from '../../../zeniAPI';
8
- import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
9
- import { addInvoiceToList, invalidateInvoiceListForCustomer } from '../invoiceList/invoiceListReducer';
8
+ import { addInvoiceToList } from '../invoiceList/invoiceListReducer';
10
9
  import { createInvoice, createInvoiceFailure, createInvoiceSuccess } from './createInvoiceReducer';
11
- export type ActionType = ReturnType<typeof createInvoice> | ReturnType<typeof createInvoiceSuccess> | ReturnType<typeof createInvoiceFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoices> | ReturnType<typeof addInvoiceToList> | ReturnType<typeof invalidateInvoicingCustomerDetail> | ReturnType<typeof invalidateInvoiceListForCustomer> | ReturnType<typeof openSnackbar>;
10
+ export type ActionType = ReturnType<typeof createInvoice> | ReturnType<typeof createInvoiceSuccess> | ReturnType<typeof createInvoiceFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoices> | ReturnType<typeof addInvoiceToList> | ReturnType<typeof openSnackbar>;
12
11
  export declare const createInvoiceEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
@@ -9,7 +9,6 @@ const invoiceReducer_1 = require("../../../entity/invoicing/invoice/invoiceReduc
9
9
  const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
10
10
  const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
11
11
  const responsePayload_1 = require("../../../responsePayload");
12
- const editInvoicingCustomerDetailViewReducer_1 = require("../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer");
13
12
  const invoiceListReducer_1 = require("../invoiceList/invoiceListReducer");
14
13
  const createInvoiceReducer_1 = require("./createInvoiceReducer");
15
14
  const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(createInvoiceReducer_1.createInvoice.match), (0, operators_1.mergeMap)((action) => {
@@ -27,13 +26,6 @@ const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, oper
27
26
  id: response.data.id,
28
27
  status: response.data.status,
29
28
  }),
30
- // The customer's page caches their invoices and totals.
31
- (0, editInvoicingCustomerDetailViewReducer_1.invalidateInvoicingCustomerDetail)({
32
- id: response.data.customer_id,
33
- }),
34
- (0, invoiceListReducer_1.invalidateInvoiceListForCustomer)({
35
- customerId: response.data.customer_id,
36
- }),
37
29
  (0, createInvoiceReducer_1.createInvoiceSuccess)({ invoiceId: response.data.id }),
38
30
  (0, snackbarReducer_1.openSnackbar)({
39
31
  messageSection: 'invoicing_invoice_saved',
@@ -1,8 +1,8 @@
1
1
  import { ID } from '../../../commonStateTypes/common';
2
2
  import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
3
3
  import { Address } from '../../../entity/address/addressState';
4
- import { InvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
5
4
  import { InvoicingFieldHelpByCode, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
5
+ import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
6
6
  import { RootState } from '../../../rootStateTypes';
7
7
  import { InvoicingCreateInvoiceFormLocalData } from './createInvoiceState';
8
8
  /**
@@ -38,7 +38,7 @@ export interface CreateInvoiceFormView extends SelectorView {
38
38
  fieldHelp: InvoicingFieldHelpByCode;
39
39
  localData: InvoicingCreateInvoiceFormLocalData;
40
40
  planNames: InvoicingPlanNameOption[];
41
- products: InvoicingCatalogPricePoint[];
41
+ products: InvoicingProduct[];
42
42
  savedInvoiceId?: ID;
43
43
  settings?: InvoicingSettingsPayload;
44
44
  }
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getCreateInvoiceFormView = void 0;
4
4
  const addressSelector_1 = require("../../../entity/address/addressSelector");
5
- const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
5
+ const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
6
6
  const invoicingCatalogListViewSelector_1 = require("../invoicingCatalogListView/invoicingCatalogListViewSelector");
7
7
  const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
8
8
  const invoicingCustomerListViewSelector_1 = require("../invoicingCustomerListView/invoicingCustomerListViewSelector");
@@ -31,7 +31,7 @@ const hasPerUnitRate = (pricingModel) => pricingModel == null ||
31
31
  * `undefined` when there is no safe per-unit rate to prefill.
32
32
  */
33
33
  const planNamePrefillPrice = (pricePoint) => hasPerUnitRate(pricePoint.pricingModel)
34
- ? (0, invoicingCatalogSelector_1.invoicingPricePointDisplayAmount)(pricePoint)?.amount
34
+ ? (0, planSelector_1.invoicingPricePointDisplayAmount)(pricePoint)?.amount
35
35
  : undefined;
36
36
  /**
37
37
  * Display name for a customer option: company, else the full name, else the
@@ -1,15 +1,16 @@
1
1
  import { AccountBase } from '../../../entity/account/accountState';
2
2
  import { ClassBase } from '../../../entity/class/classState';
3
- import { InvoicingAccountingDetailPayload, InvoicingCatalogItemPayload, InvoicingCatalogPricePointPayload } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogPayload';
3
+ import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
4
+ import { InvoicingAccountingDetailPayload, InvoicingProductPayload } from '../../../entity/invoicing/product/productPayload';
4
5
  import { ZeniAPIResponse } from '../../../responsePayload';
5
6
  import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
6
- export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
7
+ export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingPlanPayload>;
7
8
  /**
8
- * The price-point half of a save body. `InvoicingCatalogPricePointPayload` is the shape
9
+ * The price-point half of a save body. `InvoicingProductPayload` is the shape
9
10
  * the service returns; a save differs in that a field is cleared by sending an
10
11
  * explicit `null`, since an absent key reads as "leave it alone".
11
12
  */
12
- export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingCatalogPricePointPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
13
+ export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingProductPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
13
14
  accounting_detail?: InvoicingAccountingDetailPayload | null;
14
15
  description?: string | null;
15
16
  invoice_notes?: string | null;
@@ -24,7 +25,7 @@ export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingCatalog
24
25
  * by its own request instead; see
25
26
  * `localDataToCreateInvoicingCatalogProductPayloads`.
26
27
  */
27
- export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingCatalogItemPayload>, 'sub_families'> & {
28
+ export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingPlanPayload>, 'sub_families'> & {
28
29
  sub_families?: InvoicingCatalogSubFamilySavePayload[];
29
30
  };
30
31
  /**
@@ -66,6 +67,6 @@ export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: Inv
66
67
  * price point that does not exist yet to clear.
67
68
  */
68
69
  export declare const localDataToCreateInvoicingCatalogProductPayloads: (localData: InvoicingCatalogItemFormLocalData, itemId: string, lookup: InvoicingCatalogAccountingLookup) => InvoicingCatalogSubFamilySavePayload[];
69
- export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
70
- export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingCatalogPricePointPayload>;
71
- export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
70
+ export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingPlanPayload>;
71
+ export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingProductPayload>;
72
+ export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingPlanPayload>;
@@ -2,8 +2,8 @@ import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accou
2
2
  import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
3
3
  import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
4
4
  import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
5
- import { InvoicingCatalogItem } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
6
5
  import { InvoicingCatalogItemLifecycleAction, InvoicingCatalogLifecycleActionOption, InvoicingCatalogProductLifecycleAction, InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingNamedOptionsByKey } from '../../../entity/invoicing/invoicingCommonPayload';
6
+ import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
7
7
  import { RootState } from '../../../rootStateTypes';
8
8
  import { InvoicingCatalogItemFormLocalData, InvoicingCatalogItemKind } from './editInvoicingCatalogItemDetailViewState';
9
9
  export declare const getEditInvoicingCatalogItemDetailViewState: (state: RootState) => FetchStateAndError;
@@ -103,7 +103,7 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
103
103
  */
104
104
  catalogTierTypeOptionsByPricingModel?: InvoicingNamedOptionsByKey;
105
105
  kind?: InvoicingCatalogItemKind;
106
- plan?: InvoicingCatalogItem;
106
+ plan?: InvoicingPlan;
107
107
  savedItemId?: ID;
108
108
  savedKind?: InvoicingCatalogItemKind;
109
109
  }
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getEditInvoicingCatalogItemDetailViewState = void 0;
4
4
  const toolkit_1 = require("@reduxjs/toolkit");
5
5
  const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
6
- const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
6
+ const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
7
7
  const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
8
8
  const invoicingFormDraft_1 = require("../invoicingFormDraft");
9
9
  const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
@@ -42,7 +42,7 @@ const buildApplicableCatalogItemOptions = (plans) => {
42
42
  * Kept referentially stable across unrelated dispatches; the form view filters
43
43
  * out the item being edited (see `getInvoicingCatalogItemFormView`).
44
44
  */
45
- exports.getInvoicingApplicableCatalogItemOptions = (0, toolkit_1.createSelector)((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => buildApplicableCatalogItemOptions((0, invoicingCatalogSelector_1.getInvoicingCatalogItemsByIds)(catalogState, [
45
+ exports.getInvoicingApplicableCatalogItemOptions = (0, toolkit_1.createSelector)((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (planState, listViewState) => buildApplicableCatalogItemOptions((0, planSelector_1.getInvoicingPlansByIds)(planState, [
46
46
  ...listViewState.planIds,
47
47
  ...listViewState.productIds,
48
48
  ])));
@@ -67,9 +67,7 @@ const getInvoicingCatalogIncomeAccountIds = (0, toolkit_1.createSelector)([
67
67
  : invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_IDS);
68
68
  const getInvoicingCatalogItemFormView = (state, id) => {
69
69
  const { editDraftById, error, fetchState, newItemDraft, savedItemId, savedKind, } = state.editInvoicingCatalogItemDetailViewState;
70
- const plan = id != null
71
- ? (0, invoicingCatalogSelector_1.getInvoicingCatalogItemById)(state.invoicingCatalogState, id)
72
- : undefined;
70
+ const plan = id != null ? (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id) : undefined;
73
71
  const kind = plan != null ? 'plan' : undefined;
74
72
  // No entity fallback: the draft is the one source of form values, seeded from
75
73
  // the record by `seedInvoicingCatalogItemFormDraftEpic` when the detail load
@@ -1,8 +1,8 @@
1
1
  import { ActionsObservable, StateObservable } from 'redux-observable';
2
2
  import { Observable } from 'rxjs';
3
- import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
3
+ import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
4
4
  import { RootState } from '../../../rootStateTypes';
5
5
  import { ZeniAPI } from '../../../zeniAPI';
6
6
  import { fetchInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetailFailure } from './editInvoicingCatalogItemDetailViewReducer';
7
- export type ActionType = ReturnType<typeof fetchInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetailFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
7
+ export type ActionType = ReturnType<typeof fetchInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetailFailure> | ReturnType<typeof updateInvoicingPlans>;
8
8
  export declare const fetchInvoicingCatalogItemDetailEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fetchInvoicingCatalogItemDetailEpic = void 0;
4
4
  const rxjs_1 = require("rxjs");
5
5
  const operators_1 = require("rxjs/operators");
6
- const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
6
+ const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
7
7
  const responsePayload_1 = require("../../../responsePayload");
8
8
  const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
9
9
  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
12
12
  return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.switchMap)((response) => {
13
13
  if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
14
14
  return [
15
- (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([response.data], 'merge'),
15
+ (0, planReducer_1.updateInvoicingPlans)([response.data], 'merge'),
16
16
  (0, editInvoicingCatalogItemDetailViewReducer_1.updateInvoicingCatalogItemDetail)({ id: response.data.id, kind }),
17
17
  ];
18
18
  }
@@ -1,4 +1,5 @@
1
- import { InvoicingCatalogItem, InvoicingCatalogPricePoint, InvoicingCatalogPricingModel } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
1
+ import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
2
+ import { InvoicingCatalogPricingModel, InvoicingProduct } from '../../../entity/invoicing/product/productState';
2
3
  import { InvoicingCatalogItemFormLocalData, InvoicingCatalogItemFormSubFamily, InvoicingCatalogItemFormTier } from './editInvoicingCatalogItemDetailViewState';
3
4
  /**
4
5
  * Value sets the catalog item form still owns locally: the backend has no enum
@@ -12,9 +13,9 @@ export declare const INVOICING_CATALOG_APPLICABILITY_VALUES: readonly ["all", "r
12
13
  export declare const isTieredCatalogPricingModel: (model: string) => boolean;
13
14
  export declare const blankInvoicingCatalogTier: (startingUnit?: string) => InvoicingCatalogItemFormTier;
14
15
  export declare const blankInvoicingCatalogSubFamily: () => InvoicingCatalogItemFormSubFamily;
15
- export declare const invoicingProductToCatalogItemFormSubFamily: (product?: InvoicingCatalogPricePoint) => InvoicingCatalogItemFormSubFamily;
16
+ export declare const invoicingProductToCatalogItemFormSubFamily: (product?: InvoicingProduct) => InvoicingCatalogItemFormSubFamily;
16
17
  export declare const initialInvoicingCatalogItemFormLocalData: InvoicingCatalogItemFormLocalData;
17
18
  /**
18
19
  * Seed the form draft from a parent catalog item and its embedded Price points.
19
20
  */
20
- export declare const entityToInvoicingCatalogItemFormLocalData: (item?: InvoicingCatalogItem) => InvoicingCatalogItemFormLocalData;
21
+ export declare const entityToInvoicingCatalogItemFormLocalData: (item?: InvoicingPlan) => InvoicingCatalogItemFormLocalData;
@@ -1,8 +1,8 @@
1
1
  import { ActionsObservable, StateObservable } from 'redux-observable';
2
2
  import { Observable } from 'rxjs';
3
- import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
3
+ import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
4
4
  import { RootState } from '../../../rootStateTypes';
5
5
  import { ZeniAPI } from '../../../zeniAPI';
6
6
  import { runInvoicingCatalogPlanAction, runInvoicingCatalogPlanActionFailure, runInvoicingCatalogPlanActionSuccess } from './editInvoicingCatalogItemDetailViewReducer';
7
- export type ActionType = ReturnType<typeof runInvoicingCatalogPlanAction> | ReturnType<typeof runInvoicingCatalogPlanActionSuccess> | ReturnType<typeof runInvoicingCatalogPlanActionFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
7
+ export type ActionType = ReturnType<typeof runInvoicingCatalogPlanAction> | ReturnType<typeof runInvoicingCatalogPlanActionSuccess> | ReturnType<typeof runInvoicingCatalogPlanActionFailure> | ReturnType<typeof updateInvoicingPlans>;
8
8
  export declare const runInvoicingCatalogPlanActionEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.runInvoicingCatalogPlanActionEpic = void 0;
4
4
  const rxjs_1 = require("rxjs");
5
5
  const operators_1 = require("rxjs/operators");
6
- const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
6
+ const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
7
7
  const responsePayload_1 = require("../../../responsePayload");
8
8
  const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
9
9
  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
15
15
  .pipe((0, operators_1.mergeMap)((response) => {
16
16
  if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
17
17
  return [
18
- (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([response.data], 'merge'),
18
+ (0, planReducer_1.updateInvoicingPlans)([response.data], 'merge'),
19
19
  (0, editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogPlanActionSuccess)({ id }),
20
20
  ];
21
21
  }
@@ -1,8 +1,9 @@
1
1
  import { ActionsObservable, StateObservable } from 'redux-observable';
2
2
  import { Observable } from 'rxjs';
3
- import { mergeInvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
3
+ import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
4
+ import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
4
5
  import { RootState } from '../../../rootStateTypes';
5
6
  import { ZeniAPI } from '../../../zeniAPI';
6
7
  import { runInvoicingCatalogProductAction, runInvoicingCatalogProductActionFailure, runInvoicingCatalogProductActionSuccess } from './editInvoicingCatalogItemDetailViewReducer';
7
- export type ActionType = ReturnType<typeof runInvoicingCatalogProductAction> | ReturnType<typeof runInvoicingCatalogProductActionSuccess> | ReturnType<typeof runInvoicingCatalogProductActionFailure> | ReturnType<typeof mergeInvoicingCatalogPricePoint>;
8
+ export type ActionType = ReturnType<typeof runInvoicingCatalogProductAction> | ReturnType<typeof runInvoicingCatalogProductActionSuccess> | ReturnType<typeof runInvoicingCatalogProductActionFailure> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof updateInvoicingProducts>;
8
9
  export declare const runInvoicingCatalogProductActionEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.runInvoicingCatalogProductActionEpic = void 0;
4
4
  const rxjs_1 = require("rxjs");
5
5
  const operators_1 = require("rxjs/operators");
6
- const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
6
+ const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
7
+ const productReducer_1 = require("../../../entity/invoicing/product/productReducer");
7
8
  const responsePayload_1 = require("../../../responsePayload");
8
9
  const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
9
10
  const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogProductAction.match), (0, operators_1.mergeMap)((action) => {
@@ -18,10 +19,9 @@ const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => act
18
19
  .pipe((0, operators_1.mergeMap)((response) => {
19
20
  if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
20
21
  return [
22
+ (0, productReducer_1.updateInvoicingProducts)([response.data], 'merge'),
21
23
  ...(parentItemId != null
22
- ? [
23
- (0, invoicingCatalogReducer_1.mergeInvoicingCatalogPricePoint)(parentItemId, response.data),
24
- ]
24
+ ? [(0, planReducer_1.mergeInvoicingPlanSubFamily)(parentItemId, response.data)]
25
25
  : []),
26
26
  (0, editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogProductActionSuccess)({ id: stateKey }),
27
27
  ];
@@ -1,10 +1,11 @@
1
1
  import { ActionsObservable, StateObservable } from 'redux-observable';
2
2
  import { Observable } from 'rxjs';
3
- import { mergeInvoicingCatalogPricePoint, updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
3
+ import { mergeInvoicingPlanSubFamily, updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
4
+ import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
4
5
  import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
5
6
  import { RootState } from '../../../rootStateTypes';
6
7
  import { ZeniAPI } from '../../../zeniAPI';
7
8
  import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
8
9
  import { submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess } from './editInvoicingCatalogItemDetailViewReducer';
9
- export type ActionType = ReturnType<typeof submitInvoicingCatalogItemForm> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure> | ReturnType<typeof updateInvoicingCatalogItems> | ReturnType<typeof mergeInvoicingCatalogPricePoint> | ReturnType<typeof addInvoicingCatalogItem> | ReturnType<typeof openSnackbar>;
10
+ 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>;
10
11
  export declare const saveInvoicingCatalogItemEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.saveInvoicingCatalogItemEpic = void 0;
4
4
  const rxjs_1 = require("rxjs");
5
5
  const operators_1 = require("rxjs/operators");
6
- const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
6
+ const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
7
+ const productReducer_1 = require("../../../entity/invoicing/product/productReducer");
7
8
  const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
8
9
  const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
9
10
  const responsePayload_1 = require("../../../responsePayload");
@@ -53,8 +54,11 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
53
54
  }
54
55
  const savedProducts = productResponses.flatMap((productResponse) => productResponse.data != null ? [productResponse.data] : []);
55
56
  const resultActions = [
56
- (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([savedItem], 'merge'),
57
- ...savedProducts.map((product) => (0, invoicingCatalogReducer_1.mergeInvoicingCatalogPricePoint)(savedItem.id, product)),
57
+ (0, planReducer_1.updateInvoicingPlans)([savedItem], 'merge'),
58
+ ...(savedProducts.length > 0
59
+ ? [(0, productReducer_1.updateInvoicingProducts)(savedProducts, 'merge')]
60
+ : []),
61
+ ...savedProducts.map((product) => (0, planReducer_1.mergeInvoicingPlanSubFamily)(savedItem.id, product)),
58
62
  (0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormSuccess)({
59
63
  itemId: savedItem.id,
60
64
  kind: 'plan',
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.seedInvoicingCatalogItemFormDraftEpic = void 0;
4
4
  const rxjs_1 = require("rxjs");
5
5
  const operators_1 = require("rxjs/operators");
6
- const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
6
+ const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
7
7
  const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
8
8
  const invoicingCatalogItemFormHelper_1 = require("./invoicingCatalogItemFormHelper");
9
9
  /**
@@ -37,7 +37,7 @@ const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actions$.pip
37
37
  }
38
38
  // Nothing to seed from on a cold open; the detail response triggers this
39
39
  // again once it lands.
40
- const plan = (0, invoicingCatalogSelector_1.getInvoicingCatalogItemById)(state.invoicingCatalogState, id);
40
+ const plan = (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id);
41
41
  if (plan == null) {
42
42
  return rxjs_1.EMPTY;
43
43
  }
@@ -44,9 +44,7 @@ export declare const fetchInvoicingPaymentLinkEmailPreview: import("@reduxjs/too
44
44
  }], {
45
45
  cacheOverride: boolean;
46
46
  id: string;
47
- }, "editInvoicingCustomerDetailView/fetchInvoicingCustomerDetailPage", never, never>, invalidateInvoicingCustomerDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
48
- id: ID;
49
- }, "editInvoicingCustomerDetailView/invalidateInvoicingCustomerDetail">, seedInvoicingCustomerFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
47
+ }, "editInvoicingCustomerDetailView/fetchInvoicingCustomerDetailPage", never, never>, seedInvoicingCustomerFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
50
48
  id: ID;
51
49
  localData: InvoicingCustomerFormLocalData;
52
50
  }, "editInvoicingCustomerDetailView/seedInvoicingCustomerFormDraft">, updateInvoicingCustomerDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  var _a;
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.claimInvoicingCustomerBillingAddress = exports.initializeInvoicingCustomerAddress = exports.resetEditInvoicingCustomerDetailView = exports.submitInvoicingCustomerFormFailure = exports.submitInvoicingCustomerFormSuccess = exports.submitInvoicingCustomerForm = exports.updateInvoicingCustomerFormDraft = exports.updateInvoicingCustomerDetailFailure = exports.submitAddPromotionalCredits = exports.resetPromotionalCreditAction = exports.updateInvoicingCustomerDetail = exports.seedInvoicingCustomerFormDraft = exports.invalidateInvoicingCustomerDetail = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.addPromotionalCreditsSuccess = exports.addPromotionalCreditsFailure = exports.updateInvoicingPaymentLinkEmailPreviewFailure = exports.updateInvoicingPaymentLinkEmailPreview = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingPaymentLinkEmailPreview = exports.initialState = void 0;
4
+ exports.claimInvoicingCustomerBillingAddress = exports.initializeInvoicingCustomerAddress = exports.resetEditInvoicingCustomerDetailView = exports.submitInvoicingCustomerFormFailure = exports.submitInvoicingCustomerFormSuccess = exports.submitInvoicingCustomerForm = exports.updateInvoicingCustomerFormDraft = exports.updateInvoicingCustomerDetailFailure = exports.submitAddPromotionalCredits = exports.resetPromotionalCreditAction = exports.updateInvoicingCustomerDetail = exports.seedInvoicingCustomerFormDraft = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.addPromotionalCreditsSuccess = exports.addPromotionalCreditsFailure = exports.updateInvoicingPaymentLinkEmailPreviewFailure = exports.updateInvoicingPaymentLinkEmailPreview = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingPaymentLinkEmailPreview = exports.initialState = void 0;
5
5
  const toolkit_1 = require("@reduxjs/toolkit");
6
6
  const rootActions_1 = require("../../../rootActions");
7
7
  const invoicingFormDraft_1 = require("../invoicingFormDraft");
@@ -99,10 +99,6 @@ const editInvoicingCustomerDetailView = (0, toolkit_1.createSlice)({
99
99
  error: undefined,
100
100
  };
101
101
  },
102
- // Makes the page epic refetch a record that changed server-side (e.g. a new subscription).
103
- invalidateInvoicingCustomerDetail(draft, action) {
104
- delete draft.recordStateById[action.payload.id];
105
- },
106
102
  fetchInvoicingCustomerDetail(draft, action) {
107
103
  draft.recordStateById[action.payload.id] = {
108
104
  fetchState: 'In-Progress',
@@ -206,5 +202,5 @@ const editInvoicingCustomerDetailView = (0, toolkit_1.createSlice)({
206
202
  });
207
203
  },
208
204
  });
209
- _a = editInvoicingCustomerDetailView.actions, exports.fetchInvoicingPaymentLinkEmailPreview = _a.fetchInvoicingPaymentLinkEmailPreview, exports.fetchInvoicingPaymentLinkEmailPreviewPage = _a.fetchInvoicingPaymentLinkEmailPreviewPage, exports.updateInvoicingPaymentLinkEmailPreview = _a.updateInvoicingPaymentLinkEmailPreview, exports.updateInvoicingPaymentLinkEmailPreviewFailure = _a.updateInvoicingPaymentLinkEmailPreviewFailure, exports.addPromotionalCreditsFailure = _a.addPromotionalCreditsFailure, exports.addPromotionalCreditsSuccess = _a.addPromotionalCreditsSuccess, exports.fetchInvoicingCustomerDetail = _a.fetchInvoicingCustomerDetail, exports.fetchInvoicingCustomerDetailPage = _a.fetchInvoicingCustomerDetailPage, exports.invalidateInvoicingCustomerDetail = _a.invalidateInvoicingCustomerDetail, exports.seedInvoicingCustomerFormDraft = _a.seedInvoicingCustomerFormDraft, exports.updateInvoicingCustomerDetail = _a.updateInvoicingCustomerDetail, exports.resetPromotionalCreditAction = _a.resetPromotionalCreditAction, exports.submitAddPromotionalCredits = _a.submitAddPromotionalCredits, exports.updateInvoicingCustomerDetailFailure = _a.updateInvoicingCustomerDetailFailure, exports.updateInvoicingCustomerFormDraft = _a.updateInvoicingCustomerFormDraft, exports.submitInvoicingCustomerForm = _a.submitInvoicingCustomerForm, exports.submitInvoicingCustomerFormSuccess = _a.submitInvoicingCustomerFormSuccess, exports.submitInvoicingCustomerFormFailure = _a.submitInvoicingCustomerFormFailure, exports.resetEditInvoicingCustomerDetailView = _a.resetEditInvoicingCustomerDetailView, exports.initializeInvoicingCustomerAddress = _a.initializeInvoicingCustomerAddress, exports.claimInvoicingCustomerBillingAddress = _a.claimInvoicingCustomerBillingAddress;
205
+ _a = editInvoicingCustomerDetailView.actions, exports.fetchInvoicingPaymentLinkEmailPreview = _a.fetchInvoicingPaymentLinkEmailPreview, exports.fetchInvoicingPaymentLinkEmailPreviewPage = _a.fetchInvoicingPaymentLinkEmailPreviewPage, exports.updateInvoicingPaymentLinkEmailPreview = _a.updateInvoicingPaymentLinkEmailPreview, exports.updateInvoicingPaymentLinkEmailPreviewFailure = _a.updateInvoicingPaymentLinkEmailPreviewFailure, exports.addPromotionalCreditsFailure = _a.addPromotionalCreditsFailure, exports.addPromotionalCreditsSuccess = _a.addPromotionalCreditsSuccess, exports.fetchInvoicingCustomerDetail = _a.fetchInvoicingCustomerDetail, exports.fetchInvoicingCustomerDetailPage = _a.fetchInvoicingCustomerDetailPage, exports.seedInvoicingCustomerFormDraft = _a.seedInvoicingCustomerFormDraft, exports.updateInvoicingCustomerDetail = _a.updateInvoicingCustomerDetail, exports.resetPromotionalCreditAction = _a.resetPromotionalCreditAction, exports.submitAddPromotionalCredits = _a.submitAddPromotionalCredits, exports.updateInvoicingCustomerDetailFailure = _a.updateInvoicingCustomerDetailFailure, exports.updateInvoicingCustomerFormDraft = _a.updateInvoicingCustomerFormDraft, exports.submitInvoicingCustomerForm = _a.submitInvoicingCustomerForm, exports.submitInvoicingCustomerFormSuccess = _a.submitInvoicingCustomerFormSuccess, exports.submitInvoicingCustomerFormFailure = _a.submitInvoicingCustomerFormFailure, exports.resetEditInvoicingCustomerDetailView = _a.resetEditInvoicingCustomerDetailView, exports.initializeInvoicingCustomerAddress = _a.initializeInvoicingCustomerAddress, exports.claimInvoicingCustomerBillingAddress = _a.claimInvoicingCustomerBillingAddress;
210
206
  exports.default = editInvoicingCustomerDetailView.reducer;
@@ -1,9 +1,9 @@
1
1
  import { Amount } from '../../../commonStateTypes/amount';
2
2
  import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
3
3
  import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
4
- import { InvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
5
4
  import { InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingSubscriptionLifecycleActionOption } from '../../../entity/invoicing/invoicingCommonPayload';
6
5
  import { InvoicingSubscription } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionState';
6
+ import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
7
7
  import { RootState } from '../../../rootStateTypes';
8
8
  import { InvoicingSubscriptionFormLocalData } from './editInvoicingSubscriptionDetailViewState';
9
9
  /**
@@ -107,7 +107,7 @@ export declare const getEditInvoicingSubscriptionDetailViewState: (state: RootSt
107
107
  * Lives here rather than in a screen so the create/edit form and the detail
108
108
  * page's inline edit narrow their pickers by the same rule.
109
109
  */
110
- export declare const getInvoicingItemsAllowedForPlan: (products: InvoicingCatalogPricePoint[], plan: InvoicingCatalogPricePoint | undefined) => InvoicingCatalogPricePoint[];
110
+ export declare const getInvoicingItemsAllowedForPlan: (products: InvoicingProduct[], plan: InvoicingProduct | undefined) => InvoicingProduct[];
111
111
  /**
112
112
  * One entry in a subscription-form picker, ready for the screen to render.
113
113
  *
@@ -6,9 +6,7 @@ import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
6
6
  import { RootState } from '../../../rootStateTypes';
7
7
  import { ZeniAPI } from '../../../zeniAPI';
8
8
  import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
9
- import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
10
- import { invalidateInvoiceListForCustomer } from '../invoiceList/invoiceListReducer';
11
9
  import { addInvoicingSubscriptionToList } from '../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
12
10
  import { submitInvoicingSubscriptionForm, submitInvoicingSubscriptionFormFailure, submitInvoicingSubscriptionFormSuccess, syncInvoicingSubscriptionCoupons } from './editInvoicingSubscriptionDetailViewReducer';
13
- export type ActionType = ReturnType<typeof submitInvoicingSubscriptionForm> | ReturnType<typeof submitInvoicingSubscriptionFormSuccess> | ReturnType<typeof submitInvoicingSubscriptionFormFailure> | ReturnType<typeof syncInvoicingSubscriptionCoupons> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoicingSubscriptions> | ReturnType<typeof addInvoicingSubscriptionToList> | ReturnType<typeof invalidateInvoicingCustomerDetail> | ReturnType<typeof invalidateInvoiceListForCustomer> | ReturnType<typeof openSnackbar>;
11
+ export type ActionType = ReturnType<typeof submitInvoicingSubscriptionForm> | ReturnType<typeof submitInvoicingSubscriptionFormSuccess> | ReturnType<typeof submitInvoicingSubscriptionFormFailure> | ReturnType<typeof syncInvoicingSubscriptionCoupons> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoicingSubscriptions> | ReturnType<typeof addInvoicingSubscriptionToList> | ReturnType<typeof openSnackbar>;
14
12
  export declare const saveInvoicingSubscriptionEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
@@ -10,8 +10,6 @@ const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
10
10
  const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
11
11
  const responsePayload_1 = require("../../../responsePayload");
12
12
  const addressViewReducer_1 = require("../../addressView/addressViewReducer");
13
- const editInvoicingCustomerDetailViewReducer_1 = require("../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer");
14
- const invoiceListReducer_1 = require("../invoiceList/invoiceListReducer");
15
13
  const invoicingSubscriptionListViewReducer_1 = require("../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer");
16
14
  const editInvoicingSubscriptionDetailViewPayload_1 = require("./editInvoicingSubscriptionDetailViewPayload");
17
15
  const editInvoicingSubscriptionDetailViewReducer_1 = require("./editInvoicingSubscriptionDetailViewReducer");
@@ -91,9 +89,7 @@ const saveInvoicingSubscriptionEpic = (actions$, state$, zeniAPI) => actions$.pi
91
89
  resultActions.push((0, invoicingSubscriptionListViewReducer_1.addInvoicingSubscriptionToList)({
92
90
  id: saved.id,
93
91
  status: saved.status,
94
- }),
95
- // The service may bill the first invoice on create.
96
- (0, editInvoicingCustomerDetailViewReducer_1.invalidateInvoicingCustomerDetail)({ id: saved.customer_id }), (0, invoiceListReducer_1.invalidateInvoiceListForCustomer)({ customerId: saved.customer_id }));
92
+ }));
97
93
  }
98
94
  resultActions.push((0, snackbarReducer_1.openSnackbar)({
99
95
  messageSection: 'invoicing_subscription_saved',
@@ -45,8 +45,6 @@ export declare const fetchInvoiceList: import("@reduxjs/toolkit").ActionCreatorW
45
45
  }, "invoicingInvoiceList/updateInvoiceList">, updateInvoiceListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingInvoiceList/updateInvoiceListFailure">, fetchInvoiceCounts: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingInvoiceList/fetchInvoiceCounts">, updateInvoiceCounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingListCounts, "invoicingInvoiceList/updateInvoiceCounts">, updateInvoiceCountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingInvoiceList/updateInvoiceCountsFailure">, fetchInvoiceKPIs: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingInvoiceList/fetchInvoiceKPIs">, updateInvoiceKPIs: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingInvoiceKPIs, "invoicingInvoiceList/updateInvoiceKPIs">, updateInvoiceKPIsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingInvoiceList/updateInvoiceKPIsFailure">, updateInvoiceListFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoiceListFilters, "invoicingInvoiceList/updateInvoiceListFilters">, setInvoiceActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"paid" | "voided" | "partially_paid" | "payment_due" | "not_paid" | "all", "invoicingInvoiceList/setInvoiceActiveTab">, addInvoiceToList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
46
46
  id: ID;
47
47
  status: InvoicingInvoiceStatus;
48
- }, "invoicingInvoiceList/addInvoiceToList">, invalidateInvoiceListForCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
49
- customerId: ID;
50
- }, "invoicingInvoiceList/invalidateInvoiceListForCustomer">;
48
+ }, "invoicingInvoiceList/addInvoiceToList">;
51
49
  declare const _default: import("redux").Reducer<InvoiceListState>;
52
50
  export default _default;