@zeniai/client-epic-state 5.2.22-betaAK1 → 5.2.22-betaAM1

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

@@ -0,0 +1,212 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAutoReversedAccrual = isAutoReversedAccrual;
+exports.isManuallyReversedAccrual = isManuallyReversedAccrual;
+exports.isPendingReviewAccrual = isPendingReviewAccrual;
+exports.getClearedAllocatedActualAmount = getClearedAllocatedActualAmount;
+exports.getActualMatchingAmount = getActualMatchingAmount;
+exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
+exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
+const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
+const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
+function isAutoReversedAccrual(accrual) {
+    return (accrual.accrualStatus === 'reversed' &&
+        accrual.reversalTrigger === 'bill_match');
+}
+function isManuallyReversedAccrual(accrual) {
+    return (accrual.accrualStatus === 'reversed' &&
+        accrual.reversalTrigger === 'manual_reverse');
+}
+function isPendingReviewAccrual(accrual) {
+    if (accrual.accrualStatus !== 'posted' || accrual.matchSuggestion == null) {
+        return false;
+    }
+    const resolution = accrual.matchSuggestion.resolution;
+    return resolution == null || resolution.length === 0;
+}
+function isGroupedClearedMatch(accrual) {
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return false;
+    }
+    const matchShape = accrual.cleared?.matchShape;
+    const accrualIdsLength = accrual.cleared?.accrualIds?.length ?? 0;
+    return matchShape === '1:N' || matchShape === 'N:1' || accrualIdsLength > 1;
+}
+function getClearedAllocatedActualAmount(accrual) {
+    const matchedAmount = accrual.cleared?.matchedAmount?.amount;
+    if (matchedAmount == null) {
+        return undefined;
+    }
+    if (!isGroupedClearedMatch(accrual)) {
+        return matchedAmount;
+    }
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return matchedAmount;
+    }
+    return matchedAmount * (accrual.estimatedAmount.amount / groupSum);
+}
+function getActualMatchingAmount(accrual) {
+    if (isPendingReviewAccrual(accrual)) {
+        return (accrual.matchSuggestion?.matchedAmount?.amount ??
+            accrual.estimatedAmount.amount);
+    }
+    if (isAutoReversedAccrual(accrual) || isManuallyReversedAccrual(accrual)) {
+        return (getClearedAllocatedActualAmount(accrual) ?? accrual.estimatedAmount.amount);
+    }
+    return accrual.estimatedAmount.amount;
+}
+function getActualMatchingReversalDate(accrual) {
+    if (!isAutoReversedAccrual(accrual) && !isManuallyReversedAccrual(accrual)) {
+        return undefined;
+    }
+    return accrual.actualReversalPostDate ?? accrual.cleared?.reversedAt;
+}
+function toActualMatchingRow(accrual, kind) {
+    return {
+        ...accrual,
+        kind,
+        reversalDate: kind === 'pending_review'
+            ? undefined
+            : getActualMatchingReversalDate(accrual),
+    };
+}
+function matchesSearch(accrual, searchString) {
+    const trimmed = searchString.trim().toLowerCase();
+    if (trimmed.length === 0) {
+        return true;
+    }
+    return (accrual.vendorName.toLowerCase().includes(trimmed) ||
+        accrual.memo.toLowerCase().includes(trimmed));
+}
+function getActualMatchingSortValue(row, sortKey) {
+    switch (sortKey) {
+        case 'vendor':
+            return row.vendorName.toLowerCase();
+        case 'date':
+            return row.reversalDate?.valueOf();
+        case 'amount':
+            return getActualMatchingAmount(row);
+        case 'category':
+            return row.jeDebitAccountName?.toLowerCase();
+        case 'class':
+            return row.jeDebitAccountingClassName?.toLowerCase();
+        case 'type':
+            return (row.cleared?.matchedTransactionType ??
+                row.matchSuggestion?.matchedTransactionType)?.toLowerCase();
+        case 'lifecycle':
+            return row.kind;
+        default:
+            return undefined;
+    }
+}
+function sortActualMatchingRows(rows, uiState) {
+    const lodashOrder = uiState.sortOrder === 'ascending' ? 'asc' : 'desc';
+    return (0, orderBy_1.default)(rows, [(row) => getActualMatchingSortValue(row, uiState.sortKey)], [lodashOrder]);
+}
+function emptyKpiSummary() {
+    return {
+        autoReversed: { count: 0, amount: 0 },
+        pendingReview: { count: 0, amount: 0 },
+        totalThisClose: { count: 0, amount: 0 },
+        ai: { count: 0 },
+        manual: { count: 0 },
+    };
+}
+function getExpenseAutomationActualMatchingView(state) {
+    const { expenseAutomationActualMatchingViewState, expenseAutomationViewState } = state;
+    const { accrualKeysByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
+    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
+    const selectedPeriod = expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
+    const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : undefined;
+    const accrualKeys = monthYearPeriodId != null
+        ? accrualKeysByPeriod[monthYearPeriodId]
+        : undefined;
+    const accruals = (accrualKeys ?? [])
+        .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
+        .filter((accrual) => accrual != null);
+    const filtered = accruals.filter((accrual) => matchesSearch(accrual, uiState.searchString));
+    const autoReversed = sortActualMatchingRows(filtered
+        .filter(isAutoReversedAccrual)
+        .map((accrual) => toActualMatchingRow(accrual, 'auto_reversed')), uiState);
+    const pendingReview = sortActualMatchingRows(filtered
+        .filter(isPendingReviewAccrual)
+        .map((accrual) => toActualMatchingRow(accrual, 'pending_review')), uiState);
+    const manuallyReversed = sortActualMatchingRows(filtered
+        .filter(isManuallyReversedAccrual)
+        .map((accrual) => toActualMatchingRow(accrual, 'manually_reversed')), uiState);
+    const listedAccruals = accruals.filter((accrual) => isAutoReversedAccrual(accrual) ||
+        isPendingReviewAccrual(accrual) ||
+        isManuallyReversedAccrual(accrual));
+    const kpiSummary = listedAccruals.length === 0
+        ? emptyKpiSummary()
+        : {
+            autoReversed: {
+                count: listedAccruals.filter(isAutoReversedAccrual).length,
+                amount: listedAccruals
+                    .filter(isAutoReversedAccrual)
+                    .reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
+            },
+            pendingReview: {
+                count: listedAccruals.filter(isPendingReviewAccrual).length,
+                amount: listedAccruals
+                    .filter(isPendingReviewAccrual)
+                    .reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
+            },
+            totalThisClose: {
+                count: listedAccruals.length,
+                amount: listedAccruals.reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
+            },
+            ai: {
+                count: listedAccruals.filter((accrual) => accrual.origin === 'agent').length,
+            },
+            manual: {
+                count: listedAccruals.filter((accrual) => accrual.origin === 'human').length,
+            },
+        };
+    const accrualSearchResults = matchModal.accrualSearch.results
+        .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
+        .filter((accrual) => accrual != null);
+    return {
+        fetchState,
+        error,
+        autoReversed,
+        pendingReview,
+        manuallyReversed,
+        kpiSummary,
+        uiState,
+        refreshStatus,
+        hasLoadedForSelectedPeriod: accrualKeys != null,
+        matchModal: {
+            isOpen: matchModal.isOpen,
+            confirmStatus: matchModal.confirmStatus,
+            lastBatchResults: matchModal.lastBatchResults,
+            transactionSearch: {
+                query: matchModal.transactionSearch.query,
+                results: matchModal.transactionSearch.results,
+                fetchState: {
+                    fetchState: matchModal.transactionSearch.fetchState,
+                    error: matchModal.transactionSearch.error,
+                },
+                nextPageToken: matchModal.transactionSearch.nextPageToken,
+                isLoadingMore: matchModal.transactionSearch.isLoadingMore,
+            },
+            accrualSearch: {
+                query: matchModal.accrualSearch.query,
+                results: accrualSearchResults,
+                fetchState: {
+                    fetchState: matchModal.accrualSearch.fetchState,
+                    error: matchModal.accrualSearch.error,
+                },
+                nextPageToken: matchModal.accrualSearch.nextPageToken,
+                isLoadingMore: matchModal.accrualSearch.isLoadingMore,
+            },
+        },
+    };
+}

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

@@ -382,6 +382,9 @@ function getExpenseAutomationJESchedulesView(state) {
     // reports undefined rather than 0, so the UI can hide the badge instead of asserting "none".
     const scheduleCountsByTab = {};
     jeSchedulesViewState_1.ALL_JE_PAGE_TABS.forEach((pageTab) => {
+        if (pageTab === 'actual_matching') {
+            return;
+        }
         const periodTabKey = monthYearPeriodId != null
             ? (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(pageTab, monthYearPeriodId)
             : null;

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

@@ -0,0 +1,81 @@
+import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
+import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
+import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { JEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
+export declare const toActualMatchingSortKey: (v: string) => "type" | "date" | "vendor" | "category" | "class" | "amount" | "lifecycle";
+export type ActualMatchingSortKey = ReturnType<typeof toActualMatchingSortKey>;
+export declare const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
+export declare const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
+export declare const MATCH_SEARCH_DEBOUNCE_MS = 300;
+export declare const toMatchAndReverseResultStatus: (v: string) => "error" | "reversed" | "noop" | "conflict" | "claim_lost";
+export type MatchAndReverseResultStatus = ReturnType<typeof toMatchAndReverseResultStatus>;
+export interface ActualMatchingViewUIState {
+    scrollPosition: {
+        scrollTop: number;
+        scrollLeft?: number;
+    } | undefined;
+    searchString: string;
+    sortKey: ActualMatchingSortKey;
+    sortOrder: SortOrder;
+}
+/**
+ * Sibling of Missing Receipts `MatchCandidate`. Confirm needs `lineId` and
+ * `transactionIntegrationId` on every row — those fields are required here.
+ */
+export interface ActualMatchingTransactionSearchResult {
+    amount: number;
+    currencyCode: string;
+    currencySymbol: string;
+    lineId: string;
+    transactionDate: string;
+    transactionId: ID;
+    transactionIntegrationId: string;
+    transactionType: string;
+    vendorName: string;
+    accountDescription?: string;
+    accountId?: ID;
+    accountingClassId?: ID;
+    accountingClassName?: string;
+    accountName?: string;
+    transactionDescription?: string;
+    transactionMemo?: string;
+    transactionTypeName?: string;
+    vendorId?: ID;
+}
+export interface MatchAndReverseResult {
+    accrualId: ID;
+    status: MatchAndReverseResultStatus;
+    reason?: string;
+}
+export interface MatchAndReverseAccrualsParams {
+    accrualIds: ID[];
+    lineId: string;
+    transactionId: ID;
+    transactionIntegrationId: string;
+    transactionType: string;
+}
+export interface ActualMatchingTransactionSearchState extends FetchStateAndError {
+    isLoadingMore: boolean;
+    nextPageToken: string | null;
+    query: string;
+    results: ActualMatchingTransactionSearchResult[];
+}
+export interface ActualMatchingAccrualSearchState extends FetchStateAndError {
+    isLoadingMore: boolean;
+    nextPageToken: string | null;
+    query: string;
+    results: JEOneTimeAccrualKey[];
+}
+export interface ActualMatchingMatchModalState {
+    accrualSearch: ActualMatchingAccrualSearchState;
+    confirmStatus: FetchStateAndError;
+    isOpen: boolean;
+    transactionSearch: ActualMatchingTransactionSearchState;
+    lastBatchResults?: MatchAndReverseResult[];
+}
+export interface ActualMatchingViewState extends FetchedState {
+    accrualKeysByPeriod: Record<MonthYearPeriodId, JEOneTimeAccrualKey[]>;
+    matchModal: ActualMatchingMatchModalState;
+    refreshStatus: FetchStateAndError;
+    uiState: ActualMatchingViewUIState;
+}

package/lib/view/expenseAutomationView/types/actualMatchingViewState.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toMatchAndReverseResultStatus = exports.MATCH_SEARCH_DEBOUNCE_MS = exports.MATCH_ACCRUAL_SEARCH_LIMIT = exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = exports.toActualMatchingSortKey = void 0;
+const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
+const ACTUAL_MATCHING_SORT_KEYS = [
+    'vendor',
+    'date',
+    'amount',
+    'category',
+    'class',
+    'type',
+    'lifecycle',
+];
+const toActualMatchingSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_SORT_KEYS);
+exports.toActualMatchingSortKey = toActualMatchingSortKey;
+exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
+exports.MATCH_ACCRUAL_SEARCH_LIMIT = 50;
+exports.MATCH_SEARCH_DEBOUNCE_MS = 300;
+const MATCH_AND_REVERSE_RESULT_STATUSES = [
+    'reversed',
+    'noop',
+    'conflict',
+    'claim_lost',
+    'error',
+];
+const toMatchAndReverseResultStatus = (v) => (0, stringToUnion_1.stringToUnion)(v, MATCH_AND_REVERSE_RESULT_STATUSES);
+exports.toMatchAndReverseResultStatus = toMatchAndReverseResultStatus;

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

@@ -11,7 +11,7 @@ import { ZeniDate } from '../../../zeniDayJS';
 import { JETransactionLink } from '../../scheduleView/scheduleDetailView/scheduleDetailState';
 export declare const toJEScheduleSortKey: (v: string) => "type" | "vendor" | "category" | "class" | "memo" | "jePostingDate" | "runningBalance" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "remainingMonths" | "totalAmount" | "transactionDate";
 export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
-export declare const toJEPageTab: (v: string) => "schedules" | "existing_schedules";
+export declare const toJEPageTab: (v: string) => "schedules" | "actual_matching" | "existing_schedules";
 export type JEPageTab = ReturnType<typeof toJEPageTab>;
 export declare const ALL_JE_PAGE_TABS: readonly JEPageTab[];
 export type JESchedulePeriodTabKey = `${JEPageTab}_${MonthYearPeriodId}`;

package/lib/view/expenseAutomationView/types/jeSchedulesViewState.js

@@ -20,7 +20,11 @@ const JE_SCHEDULE_SORT_KEYS = [
 ];
 const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
 exports.toJEScheduleSortKey = toJEScheduleSortKey;
-const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+const JE_PAGE_TABS = [
+    'schedules',
+    'actual_matching',
+    'existing_schedules',
+];
 const toJEPageTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_PAGE_TABS);
 exports.toJEPageTab = toJEPageTab;
 exports.ALL_JE_PAGE_TABS = JE_PAGE_TABS;

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewPayload.d.ts

@@ -54,7 +54,6 @@ export interface InvoicingConfigPayload {
     qbo_account_mapping_kind_options?: InvoicingQboAccountMappingKindOptionWire[];
     qbo_customer_matching_options?: InvoicingNamedOptionWire[];
     qbo_sync_status_options?: InvoicingNamedOptionWire[];
-    subscription_cancel_reason_code_options?: InvoicingNamedOptionWire[];
     subscription_status_options?: InvoicingNamedOptionWire[];
     taxability_options?: InvoicingNamedOptionWire[];
     transaction_status_options?: InvoicingNamedOptionWire[];

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewReducer.d.ts

@@ -2,7 +2,7 @@ import { ZeniAPIStatus } from '../../../responsePayload';
 import { InvoicingConfigPayload } from './invoicingConfigViewPayload';
 import { InvoicingConfigViewState } from './invoicingConfigViewState';
 export declare const initialState: InvoicingConfigViewState;
-export declare function mapInvoicingConfigPayloadToState(payload: InvoicingConfigPayload): Pick<InvoicingConfigViewState, 'auditLogEntityRouteOptions' | 'auditLogListSortFieldOptions' | 'auditLogSourceLabels' | 'autoCollectionOptions' | 'billingPeriodUnitOptions' | 'catalogTierTypeOptionsByPricingModel' | 'catalogTrialEndActionOptions' | 'catalogTrialUnitOptions' | 'customerTypeOptions' | 'dateFormatOptions' | 'fieldHelp' | 'discountApplyOnOptions' | 'discountDurationTypeOptions' | 'discountTypeOptions' | 'manualPaymentMethodOptions' | 'netTermDayOptions' | 'paymentGatewayOptions' | 'taxabilityOptions' | 'cardStatusOptions' | 'catalogItemStatusOptions' | 'catalogItemTypeOptions' | 'creditNoteReasonCodeOptions' | 'creditNoteStatusOptions' | 'creditNoteTypeOptions' | 'customerStatusOptions' | 'discountStatusOptions' | 'dunningCaseStatusOptions' | 'invoiceStatusOptions' | 'subscriptionCancelReasonCodeOptions' | 'subscriptionStatusOptions' | 'transactionStatusOptions' | 'transactionTypeOptions' | 'createdAt' | 'updatedAt' | 'dunningScheduleActionOptions' | 'subscriptionLifecycleActionOptions' | 'subscriptionCommercialEditAllowedFromStatuses' | 'subscriptionMetadataEditAllowedFromStatuses' | 'subscriptionEditFieldOptions' | 'subscriptionCancelTimingOptions' | 'subscriptionChangeOptionOptions' | 'catalogItemLifecycleActionOptions' | 'catalogProductLifecycleActionOptions' | 'discountLifecycleActionOptions' | 'qboAccountMappingKindOptions' | 'qboCustomerMatchingOptions' | 'qboSyncStatusOptions' | 'isInvoicingEnabled' | 'isInvoicingTosAccepted' | 'invoicingTosAcceptanceIp' | 'invoicingTosAcceptanceTime' | 'invoicingTosAcceptanceUserAgent' | 'invoicingTosAcceptanceUserId' | 'isInvoicingSettingsSeeded'>;
+export declare function mapInvoicingConfigPayloadToState(payload: InvoicingConfigPayload): Pick<InvoicingConfigViewState, 'auditLogEntityRouteOptions' | 'auditLogListSortFieldOptions' | 'auditLogSourceLabels' | 'autoCollectionOptions' | 'billingPeriodUnitOptions' | 'catalogTierTypeOptionsByPricingModel' | 'catalogTrialEndActionOptions' | 'catalogTrialUnitOptions' | 'customerTypeOptions' | 'dateFormatOptions' | 'fieldHelp' | 'discountApplyOnOptions' | 'discountDurationTypeOptions' | 'discountTypeOptions' | 'manualPaymentMethodOptions' | 'netTermDayOptions' | 'paymentGatewayOptions' | 'taxabilityOptions' | 'cardStatusOptions' | 'catalogItemStatusOptions' | 'catalogItemTypeOptions' | 'creditNoteReasonCodeOptions' | 'creditNoteStatusOptions' | 'creditNoteTypeOptions' | 'customerStatusOptions' | 'discountStatusOptions' | 'dunningCaseStatusOptions' | 'invoiceStatusOptions' | 'subscriptionStatusOptions' | 'transactionStatusOptions' | 'transactionTypeOptions' | 'createdAt' | 'updatedAt' | 'dunningScheduleActionOptions' | 'subscriptionLifecycleActionOptions' | 'subscriptionCommercialEditAllowedFromStatuses' | 'subscriptionMetadataEditAllowedFromStatuses' | 'subscriptionEditFieldOptions' | 'subscriptionCancelTimingOptions' | 'subscriptionChangeOptionOptions' | 'catalogItemLifecycleActionOptions' | 'catalogProductLifecycleActionOptions' | 'discountLifecycleActionOptions' | 'qboAccountMappingKindOptions' | 'qboCustomerMatchingOptions' | 'qboSyncStatusOptions' | 'isInvoicingEnabled' | 'isInvoicingTosAccepted' | 'invoicingTosAcceptanceIp' | 'invoicingTosAcceptanceTime' | 'invoicingTosAcceptanceUserAgent' | 'invoicingTosAcceptanceUserId' | 'isInvoicingSettingsSeeded'>;
 export declare const fetchInvoicingConfig: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload?: {
     cacheOverride?: boolean;
 } | undefined], {

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewReducer.js

@@ -39,7 +39,6 @@ exports.initialState = {
     discountStatusOptions: [],
     dunningCaseStatusOptions: [],
     invoiceStatusOptions: [],
-    subscriptionCancelReasonCodeOptions: [],
     subscriptionStatusOptions: [],
     transactionStatusOptions: [],
     transactionTypeOptions: [],
@@ -109,7 +108,6 @@ function mapInvoicingConfigPayloadToState(payload) {
         discountStatusOptions: (payload.discount_status_options ?? []).map(invoicingCommonPayload_1.toInvoicingNamedOption),
         dunningCaseStatusOptions: (payload.dunning_case_status_options ?? []).map(invoicingCommonPayload_1.toInvoicingNamedOption),
         invoiceStatusOptions: (payload.invoice_status_options ?? []).map(invoicingCommonPayload_1.toInvoicingNamedOption),
-        subscriptionCancelReasonCodeOptions: (payload.subscription_cancel_reason_code_options ?? []).map(invoicingCommonPayload_1.toInvoicingNamedOption),
         subscriptionStatusOptions: (payload.subscription_status_options ?? []).map(invoicingCommonPayload_1.toInvoicingNamedOption),
         transactionStatusOptions: (payload.transaction_status_options ?? []).map(invoicingCommonPayload_1.toInvoicingNamedOption),
         transactionTypeOptions: (payload.transaction_type_options ?? []).map(invoicingCommonPayload_1.toInvoicingNamedOption),

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewState.d.ts

@@ -38,7 +38,6 @@ export interface InvoicingConfigViewState extends FetchedState {
     qboAccountMappingKindOptions: InvoicingQboAccountMappingKindOption[];
     qboCustomerMatchingOptions: InvoicingNamedOption[];
     qboSyncStatusOptions: InvoicingNamedOption[];
-    subscriptionCancelReasonCodeOptions: InvoicingNamedOption[];
     subscriptionCancelTimingOptions: InvoicingNamedOption[];
     subscriptionChangeOptionOptions: InvoicingNamedOption[];
     subscriptionCommercialEditAllowedFromStatuses: string[];

package/lib/view/invoicing/invoicingOverview/invoicingOverviewPayload.d.ts

@@ -35,6 +35,7 @@ export interface InvoicingPlanRevenuePointPayload {
     mrr: number;
     pct: number;
     plan: string;
+    product_code?: string;
 }
 export interface InvoicingDashboardSummaryPayload {
     customer_movement: {

package/lib/view/invoicing/invoicingOverview/invoicingOverviewPayload.js

@@ -44,6 +44,7 @@ const mapInvoicingPlanRevenuePointPayloadToState = (payload) => ({
     mrr: (0, amount_1.toAmount)(payload.mrr, 'USD', '$'),
     pct: payload.pct,
     planID: payload.plan,
+    productCode: payload.product_code,
 });
 exports.mapInvoicingPlanRevenuePointPayloadToState = mapInvoicingPlanRevenuePointPayloadToState;
 const mapInvoicingDashboardSummaryPayloadToState = (payload) => ({

package/lib/view/invoicing/invoicingOverview/invoicingOverviewState.d.ts

@@ -39,6 +39,7 @@ export interface InvoicingPlanRevenuePoint {
     mrr: Amount;
     pct: number;
     planID: ID;
+    productCode?: string;
 }
 export interface InvoicingDashboardSummary {
     customerMovement: {

package/lib/view/invoicing/invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewSelector.d.ts

@@ -1,6 +1,6 @@
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import type { InvoicingFieldHelpByCode, InvoicingNamedOption } from '../../../entity/invoicing/invoicingCommonPayload';
+import type { InvoicingFieldHelpByCode } from '../../../entity/invoicing/invoicingCommonPayload';
 import { InvoicingSubscription } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionState';
 import { RootState } from '../../../rootStateTypes';
 /**
@@ -10,8 +10,6 @@ import { RootState } from '../../../rootStateTypes';
  */
 export interface InvoicingSubscriptionDetailView extends SelectorView {
     actionState: FetchStateAndError;
-    /** Cancel reasons from `/1.0/config`, so the dialog hardcodes nothing. */
-    cancelReasonCodeOptions: InvoicingNamedOption[];
     /**
      * Backend help copy for this screen's field group, keyed by field code.
      * Folded in here so the screen never reaches for the config view itself.

package/lib/view/invoicing/invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewSelector.js

@@ -10,7 +10,6 @@ const getInvoicingSubscriptionDetail = (state, invoicingSubscriptionID) => {
     const { error, fetchState } = state.invoicingSubscriptionDetailViewState;
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'subscription'),
-        cancelReasonCodeOptions: (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).subscriptionCancelReasonCodeOptions,
         actionState: (0, subscriptionActionSelector_1.getInvoicingSubscriptionActionState)(invoicingSubscriptionID)(state),
         subscription: (0, exports.getInvoicingSubscriptionById)(state, invoicingSubscriptionID),
         fetchState,

package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewSelector.d.ts

@@ -7,8 +7,6 @@ import { InvoicingListSort } from '../invoicingApiHelper';
 import { InvoicingSubscriptionColumnConfig, InvoicingSubscriptionFilters, InvoicingSubscriptionTabId } from './invoicingSubscriptionListViewState';
 export interface InvoicingSubscriptionListView extends SelectorView {
     activeTab: InvoicingSubscriptionTabId;
-    /** Cancel reasons from `/1.0/config`, so the dialog hardcodes nothing. */
-    cancelReasonCodeOptions: InvoicingNamedOption[];
     columns: InvoicingSubscriptionColumnConfig[];
     count: InvoicingListCounts;
     countsFetchState: FetchStateAndError;

package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewSelector.js

@@ -31,7 +31,6 @@ exports.getInvoicingSubscriptionListView = (0, toolkit_1.createSelector)((state)
         count: listViewState.counts,
         countsFetchState: listViewState.countsFetchState,
         subscriptionCommercialEditAllowedFromStatuses: configState.subscriptionCommercialEditAllowedFromStatuses,
-        cancelReasonCodeOptions: configState.subscriptionCancelReasonCodeOptions,
         subscriptionLifecycleActionOptions: configState.subscriptionLifecycleActionOptions,
         subscriptionMetadataEditAllowedFromStatuses: configState.subscriptionMetadataEditAllowedFromStatuses,
         statusOptions,

package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState.d.ts

@@ -7,8 +7,8 @@ export interface InvoicingSubscriptionFilters {
     startedFrom?: string;
     startedTo?: string;
 }
-export declare const ALL_INVOICING_SUBSCRIPTION_SORT_KEYS: readonly ["subscription", "customer", "plan", "term_end", "next_billing", "auto_collect", "status", "mrr"];
-export declare const toInvoicingSubscriptionSortKey: (v: string) => "status" | "customer" | "subscription" | "plan" | "term_end" | "next_billing" | "auto_collect" | "mrr";
+export declare const ALL_INVOICING_SUBSCRIPTION_SORT_KEYS: readonly ["subscription", "customer", "plan", "product_code", "term_end", "next_billing", "auto_collect", "status", "mrr"];
+export declare const toInvoicingSubscriptionSortKey: (v: string) => "status" | "customer" | "subscription" | "plan" | "product_code" | "term_end" | "next_billing" | "auto_collect" | "mrr";
 export type InvoicingSubscriptionSortKey = ReturnType<typeof toInvoicingSubscriptionSortKey>;
 /**
  * Structural column descriptor owned by CES so the subscription-list column set,

package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState.js

@@ -6,6 +6,7 @@ exports.ALL_INVOICING_SUBSCRIPTION_SORT_KEYS = [
     'subscription',
     'customer',
     'plan',
+    'product_code',
     'term_end',
     'next_billing',
     'auto_collect',
@@ -18,6 +19,7 @@ exports.INVOICING_SUBSCRIPTION_COLUMNS = [
     { key: 'subscription', sortable: true },
     { key: 'customer', sortable: false },
     { key: 'plan', sortable: true },
+    { key: 'product_code', sortable: true },
     { key: 'term_end', sortable: true },
     { key: 'next_billing', sortable: true },
     { key: 'auto_collect', sortable: true },

package/lib/view/invoicing/issueCreditNote/issueCreditNotePayload.d.ts

@@ -9,6 +9,7 @@ export interface IssueCreditNoteLineItemRequest {
     amount?: number;
     entity_type?: string;
     id?: string;
+    product_code?: string;
 }
 export interface IssueCreditNoteRequest {
     line_items: IssueCreditNoteLineItemRequest[];

package/lib/view/invoicing/settingsView/invoicingBrandingFormConfig.d.ts

@@ -14,7 +14,6 @@ export interface InvoicingBrandingFormLocalData {
     dateFormat: string;
     defaultMemo: string;
     email: string;
-    invoiceFooterText: string;
     invoicePrefix: string;
     logoFileId: string;
     phone: string;

package/lib/view/invoicing/settingsView/invoicingBrandingFormConfig.js

@@ -10,7 +10,6 @@ exports.initialInvoicingBrandingFormLocalData = {
     dateFormat: '',
     defaultMemo: '',
     email: '',
-    invoiceFooterText: '',
     invoicePrefix: '',
     logoFileId: '',
     phone: '',
@@ -23,7 +22,6 @@ const entityToInvoicingBrandingFormLocalData = (settings) => ({
     dateFormat: settings?.date_format ?? '',
     defaultMemo: settings?.default_memo ?? '',
     email: settings?.email ?? '',
-    invoiceFooterText: settings?.invoice_footer_text ?? '',
     invoicePrefix: settings?.invoice_prefix ?? '',
     logoFileId: settings?.logo_file_id ?? '',
     phone: settings?.phone ?? '',
@@ -45,9 +43,6 @@ const brandingLocalDataToSettingsPayload = (localData, address) => ({
     date_format: trimOrUndefined(localData.dateFormat),
     default_memo: trimOrUndefined(localData.defaultMemo),
     email: trimOrUndefined(localData.email),
-    // Sent even when blank: "" is how the API is told to hide the footer line,
-    // so this one must not collapse to `undefined` like the fields above.
-    invoice_footer_text: localData.invoiceFooterText.trim(),
     invoice_prefix: trimOrUndefined(localData.invoicePrefix),
     logo_file_id: localData.logoFileId,
     phone: trimOrUndefined(localData.phone),

package/lib/view/invoicing/subscriptionAction/subscriptionActionRequestPayload.d.ts

@@ -18,14 +18,6 @@ export type PauseSubscriptionBody = {
     pause_reason?: string;
     resume_date?: string;
 };
-/**
- * What the cancel dialog collects. Form values, not the request body: the screen
- * turns these into {@link CancelSubscriptionBody}.
- */
-export type InvoicingCancelSubscriptionValues = {
-    cancelReasonCode: string;
-    cancelReason?: string;
-};
 export type CancelSubscriptionBody = {
     cancel_reason?: string;
     cancel_reason_code?: string;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.d.ts

@@ -4,6 +4,7 @@ import { updateApprovalRules } from '../../../../../entity/approvalRule/approval
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { RootState } from '../../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../../zeniAPI';
+import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewFailure, fetchBillPaySetupApproverViewSuccess } from '../billPaySetupApproverViewReducer';
-export type ActionType = ReturnType<typeof fetchBillPaySetupApproverView> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof fetchBillPaySetupApproverViewSuccess> | ReturnType<typeof fetchBillPaySetupApproverViewFailure>;
+export type ActionType = ReturnType<typeof fetchBillPaySetupApproverView> | ReturnType<typeof fetchClassList> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof fetchBillPaySetupApproverViewSuccess> | ReturnType<typeof fetchBillPaySetupApproverViewFailure>;
 export declare const fetchBillPaySetupApproverViewEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js

@@ -5,13 +5,20 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const approvalRuleReducer_1 = require("../../../../../entity/approvalRule/approvalRuleReducer");
 const approvalRuleSelector_1 = require("../../../../../entity/approvalRule/approvalRuleSelector");
+const tenantSelector_1 = require("../../../../../entity/tenant/tenantSelector");
 const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
+const classListReducer_1 = require("../../../../classList/classListReducer");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView.match), (0, operators_1.switchMap)((action) => {
     const { cacheOverride, useV3 } = action.payload;
-    const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
+    const { billPaySetupApproverViewState, approvalRuleState, classListState } = state$.value;
+    const isAccountingClassesEnabled = (0, tenantSelector_1.getIsAccountingClassesEnabled)(state$.value);
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
+    const shouldFetchClassList = isAccountingClassesEnabled &&
+        (cacheOverride === true ||
+            (classListState.hasValidState() === false &&
+                classListState.fetchState !== 'In-Progress'));
     if (cacheOverride === true ||
         approvalRules.length !==
             billPaySetupApproverViewState.approvalRuleIds.length ||
@@ -31,6 +38,9 @@ const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions
                     (0, approvalRuleReducer_1.updateApprovalRules)(response.data.approval_rules),
                     (0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverViewSuccess)(approvalRuleIds),
                 ];
+                if (shouldFetchClassList) {
+                    actions.push((0, classListReducer_1.fetchClassList)());
+                }
                 return (0, rxjs_1.from)(actions);
             }
             else {
@@ -40,7 +50,13 @@ const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions
     }
     else {
         const { approvalRuleIds } = billPaySetupApproverViewState;
-        return (0, rxjs_1.of)((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverViewSuccess)(approvalRuleIds));
+        const actions = [
+            (0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverViewSuccess)(approvalRuleIds),
+        ];
+        if (shouldFetchClassList) {
+            actions.push((0, classListReducer_1.fetchClassList)());
+        }
+        return (0, rxjs_1.from)(actions);
     }
 }));
 exports.fetchBillPaySetupApproverViewEpic = fetchBillPaySetupApproverViewEpic;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.js

@@ -24,7 +24,6 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
                 name: approvalRule.name,
                 description: approvalRule.description,
                 separationOfDuties: approvalRule.separationOfDuties,
-                isFallback: approvalRule.isFallback,
             };
             fetchActions.push((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewUpdateData));
         }