@zeniai/client-epic-state 4.19.95 → 4.19.96-beta0ND

package/lib/view/expenseAutomationView/epics/accountRecon/saveReconciliationReviewEpic.js

@@ -7,6 +7,7 @@ const formatZeniDateFY_1 = require("../../../../commonStateTypes/fiscalYearHelpe
 const accountReconReducer_1 = require("../../../../entity/accountRecon/accountReconReducer");
 const accountReconSelector_1 = require("../../../../entity/accountRecon/accountReconSelector");
 const accountReconState_1 = require("../../../../entity/accountRecon/accountReconState");
+const entitySelector_1 = require("../../../../entity/genericEntity/entitySelector");
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
@@ -15,6 +16,7 @@ const responsePayload_1 = require("../../../../responsePayload");
 const reconciliationViewReducer_1 = require("../../reducers/reconciliationViewReducer");
 const saveReconciliationReviewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(reconciliationViewReducer_1.saveReconciliationReview.match), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
+    const entityState = state.entityState;
     const { transactionId } = action.payload;
     const localData = state.expenseAutomationReconciliationViewState.reconTabsState.review
         .localData[transactionId];
@@ -62,7 +64,7 @@ const saveReconciliationReviewEpic = (actions$, state$, zeniAPI) => actions$.pip
                 payload = getPayloadForCCPayment(updatedTransaction, localData, reconciliationData?.account.accountType);
                 break;
             case 'record_deposit':
-                payload = getPayloadForDeposit(updatedTransaction, localData);
+                payload = getPayloadForDeposit(updatedTransaction, localData, entityState);
                 break;
         }
     }
@@ -163,7 +165,10 @@ function getPayloadForExpenseRecord(updatedTransaction, localData) {
         currency_code: updatedTransaction.amount.currencyCode,
     };
 }
-function getPayloadForDeposit(updatedTransaction, localData) {
+function getPayloadForDeposit(updatedTransaction, localData, entityState) {
+    const customerZeniId = localData.customer?.id != null
+        ? (0, entitySelector_1.getEntityByEntityIDs)(entityState, [localData.customer?.id])[0]?.zeniId
+        : undefined;
     return {
         amount: updatedTransaction.amount.amount,
         transaction_memo: updatedTransaction.memo,
@@ -171,7 +176,7 @@ function getPayloadForDeposit(updatedTransaction, localData) {
         transaction_date: updatedTransaction.transactionDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT),
         transaction_direction: updatedTransaction.transactionDirection,
         transaction_id: updatedTransaction.transactionId,
-        customer_id: localData.customer?.id,
+        customer_id: customerZeniId,
         customer_name: localData.customer?.name,
         account_id: localData.categoryId,
         accounting_class_id: localData.classId,

package/lib/view/financeStatement/financeStatementReducer.js

@@ -48,19 +48,20 @@ const financeStatement = (0, toolkit_1.createSlice)({
         updateFinanceStatementThisPeriod(draft, action) {
             const { firstMonthOfFY, coaBalances, maxNumOfPeriodsToHighlight } = action.payload;
             const { timeframe, selectedCOABalancesRange } = draft;
-            if (coaBalances.length > 0) {
-                const prevThisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
+            const safeCoaBalances = coaBalances != null ? coaBalances : [];
+            if (safeCoaBalances.length > 0) {
+                const prevThisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
                 if (prevThisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
                         thisPeriod: prevThisPeriod,
                     };
-                    const newThisPeriod = (0, thisPeriodHelpers_1.getMatchingThisPeriod)(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, coaBalances);
+                    const newThisPeriod = (0, thisPeriodHelpers_1.getMatchingThisPeriod)(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, safeCoaBalances);
                     if (newThisPeriod != null) {
                         const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
                             firstMonthOfFY,
                             thisPeriod: newThisPeriod,
-                            coaBalances,
+                            coaBalances: safeCoaBalances,
                             timeframe,
                             maxNumOfPeriodsToSelect: maxNumOfPeriodsToHighlight,
                             currentSelection: {
@@ -79,7 +80,9 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.selectedReportId = action.payload;
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
-            const { firstMonthOfFY, additionalBalances, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
+            const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
+            const safeCoaBalances = coaBalances != null ? coaBalances : [];
+            const additionalBalances = additionalBalancesPayload ?? [];
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||
                 additionalBalances.includes('this_period_vs_last_period_percent')) {
@@ -95,8 +98,8 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
             const { timeframe, selectedCOABalancesRange } = draft;
-            if (coaBalances.length > 0) {
-                const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
+            if (safeCoaBalances.length > 0) {
+                const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
                 if (thisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
@@ -105,7 +108,7 @@ const financeStatement = (0, toolkit_1.createSlice)({
                     const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
                         firstMonthOfFY,
                         thisPeriod: thisPeriod,
-                        coaBalances,
+                        coaBalances: safeCoaBalances,
                         timeframe,
                         maxNumOfPeriodsToHighlight: maxNumOfPeriodsToHighlight,
                         currentSelection: {

package/lib/view/financeStatement/financeStatementSelector.d.ts

@@ -8,6 +8,7 @@ import { RootState } from '../../reducer';
 import { BalanceSheetReport } from '../balanceSheet/balanceSheetSelectorTypes';
 import { CashFlowReport } from '../cashFlow/cashFlowSelectorTypes';
 import { ProfitAndLossReport } from '../profitAndLoss/profitAndLossSelector';
+import { ProfitAndLossByClassHorizontalReport } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes';
 import { ProfitAndLossClassesViewReport } from '../profitAndLossClassesView/profitAndLossClassesViewSelectorTypes';
 export interface FinanceStatementReport extends SelectorReport {
     allTimeframeTicks: TimeframeTickWithMetaData[];
@@ -18,6 +19,7 @@ export interface FinanceStatementReport extends SelectorReport {
     downloadState: FetchState;
     filter: COABalancesFilter;
     isCompareModeOn: boolean;
+    profitAndLossByClassHorizontalReport: ProfitAndLossByClassHorizontalReport;
     profitAndLossByClassReport: ProfitAndLossClassesViewReport;
     profitAndLossReport: ProfitAndLossReport;
     reportFormat: ReportFormat;

package/lib/view/financeStatement/financeStatementSelector.js

@@ -11,6 +11,7 @@ const thisPeriodHelpers_1 = require("../../commonStateTypes/viewAndReport/thisPe
 const balanceSheetSelector_1 = require("../balanceSheet/balanceSheetSelector");
 const cashFlowSelector_1 = require("../cashFlow/cashFlowSelector");
 const profitAndLossSelector_1 = require("../profitAndLoss/profitAndLossSelector");
+const profitAndLossClassesByClassHorizontalSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector");
 const profitAndLossClassesViewSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesViewSelector");
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
@@ -45,11 +46,11 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     if (dataAvailable != null) {
         const noFilter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable, 'ascending_date', []);
         const profitAndLossForTimeframeTicks = (0, profitAndLossSelector_1.getProfitAndLossReport)(noFilter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
-        if (profitAndLossForTimeframeTicks.sections.expenses != null) {
-            balancesInTimeframe =
-                profitAndLossForTimeframeTicks.sections.expenses.balances.length > 0
-                    ? profitAndLossForTimeframeTicks.sections['expenses'].balances
-                    : profitAndLossForTimeframeTicks.sections['income'].balances;
+        const expensesBalances = profitAndLossForTimeframeTicks.sections.expenses?.balances ?? [];
+        const incomeBalances = profitAndLossForTimeframeTicks.sections.income?.balances ?? [];
+        balancesInTimeframe =
+            expensesBalances.length > 0 ? expensesBalances : incomeBalances;
+        if (balancesInTimeframe.length > 0) {
             allTimeframeTicks = balancesInTimeframe.map((balance) => (0, timeframeTick_1.toTimeframeTick)(balance));
         }
     }
@@ -63,6 +64,9 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     const profitAndLossReport = (0, profitAndLossSelector_1.getProfitAndLossReport)(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = (0, coaBalancesFilterClassesView_1.newBalancesFilterClassesView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = (0, profitAndLossClassesViewSelector_1.getProfitAndLossClassesView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
+    const profitAndLossByClassHorizontalReport = (0, profitAndLossClassesByClassHorizontalSelector_1.getProfitAndLossClassesHorizontalView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, profitAndLossClassesViewState.uiState.classViewLayout === 'horizontal'
+        ? thisPeriod
+        : undefined);
     const balanceSheetReport = (0, balanceSheetSelector_1.getBalanceSheet)(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = (0, cashFlowSelector_1.getCashFlow)(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
@@ -110,6 +114,7 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         dataAvailable,
         profitAndLossReport,
         profitAndLossByClassReport,
+        profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         cashFlowReport,
         filter,

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector.d.ts

@@ -0,0 +1,13 @@
+import { COABalancesFilterClassesView } from '../../commonStateTypes/coaBalance/coaBalancesFilterClassesView';
+import { AccountState } from '../../entity/account/accountState';
+import { ClassState } from '../../entity/class/classState';
+import { SectionClassesViewStateV2 } from '../../entity/sectionClassesViewV2/sectionClassesViewState';
+import { ZeniDate } from '../../zeniDayJS';
+import { ProfitAndLossByClassHorizontalReport } from './profitAndLossClassesByClassHorizontalSelectorTypes';
+import { PandLReportViewCalculatedSectionID, PandLReportViewSectionID } from './profitAndLossClassesViewSelectorTypes';
+import { ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
+export declare const profitAndLossHorizontalIdsInOrder: (PandLReportViewSectionID | PandLReportViewCalculatedSectionID)[];
+export declare const getProfitAndLossClassesHorizontalView: (filter: COABalancesFilterClassesView, accountState: AccountState, classState: ClassState, sectionsState: SectionClassesViewStateV2, profitAndLossClassesViewState: ProfitAndLossClassesViewState, selectedPeriod: {
+    endDate: ZeniDate;
+    startDate: ZeniDate;
+} | undefined) => ProfitAndLossByClassHorizontalReport;

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector.js

@@ -0,0 +1,322 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProfitAndLossClassesHorizontalView = exports.profitAndLossHorizontalIdsInOrder = void 0;
+const amount_1 = require("../../commonStateTypes/amount");
+const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
+const sectionClassesViewSelector_1 = require("../../entity/sectionClassesViewV2/sectionClassesViewSelector");
+/** If `ProfitAndLossClassesViewState.currency` is unset (e.g. tests). */
+const FALLBACK_REPORT_CURRENCY = {
+    currencyCode: 'USD',
+    currencySymbol: '$',
+};
+exports.profitAndLossHorizontalIdsInOrder = [
+    'income',
+    'cogs',
+    'grossProfit',
+    'expenses',
+    'earningsBeforeInterestAndTax',
+    'otherIncome',
+    'otherExpenses',
+    'netOtherIncome',
+    'netIncome',
+];
+const SECTION_TITLES = {
+    income: 'Income',
+    cogs: 'Cost of Goods Sold',
+    grossProfit: 'Gross Profit',
+    expenses: 'Expenses',
+    earningsBeforeInterestAndTax: 'Net Operating Income',
+    otherIncome: 'Other Income',
+    otherExpenses: 'Other Expenses',
+    netOtherIncome: 'Net Other Income',
+    netIncome: 'Net Income',
+};
+/** Sections fetched and pivoted for horizontal layout (excludes e.g. `netOperatingIncome`). */
+const HORIZONTAL_PANDL_SECTION_IDS = [
+    'income',
+    'cogs',
+    'expenses',
+    'otherIncome',
+    'otherExpenses',
+];
+const getProfitAndLossClassesHorizontalView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState, selectedPeriod) => {
+    const fetchState = (0, reduceFetchState_1.reduceFetchStateParallelTimeframes)([
+        profitAndLossClassesViewState.fetchState.month,
+        profitAndLossClassesViewState.fetchState.quarter,
+        profitAndLossClassesViewState.fetchState.year,
+    ]);
+    const reportId = 'profit_and_loss_by_classes';
+    // Build class columns from the class hierarchy (top-level only).
+    // Use `filter.classesToFilterOut` so PDF/Excel downloads (fresh store, empty UI state)
+    // respect `classes_to_filter_out` from the request; in-app `classFilter` mirrors uiState.
+    const classColumns = buildClassColumns(profitAndLossClassesViewState.classHierarchy, filter.classesToFilterOut);
+    const sections = {};
+    const calculatedSections = {};
+    let reportCurrency = FALLBACK_REPORT_CURRENCY;
+    if (fetchState.fetchState === 'Completed' && selectedPeriod != null) {
+        // Get section reports using existing selector infrastructure
+        const sectionReports = {};
+        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
+            sectionReports[sectionId] = (0, sectionClassesViewSelector_1.getSectionClassesViewReport)(accountState, classState, sectionsState, { reportId, sectionId }, filter);
+        });
+        reportCurrency =
+            profitAndLossClassesViewState.currency ?? FALLBACK_REPORT_CURRENCY;
+        // Pivot each section from class→account to account→class
+        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
+            const sectionReport = sectionReports[sectionId];
+            if (sectionReport != null) {
+                sections[sectionId] = pivotSectionToHorizontal(sectionReport, classColumns, SECTION_TITLES[sectionId] ?? sectionId, reportCurrency);
+            }
+        });
+        // Calculate derived sections
+        const incomeSection = sections['income'];
+        const cogsSection = sections['cogs'];
+        const expensesSection = sections['expenses'];
+        const otherIncomeSection = sections['otherIncome'];
+        const otherExpensesSection = sections['otherExpenses'];
+        // Gross Profit = Income - COGS
+        if (incomeSection != null && cogsSection != null) {
+            calculatedSections['grossProfit'] = computeCalculatedSection(incomeSection.classTotals, cogsSection.classTotals, incomeSection.sectionTotal, cogsSection.sectionTotal, 'subtract', SECTION_TITLES['grossProfit']);
+        }
+        // EBIT = Gross Profit - Expenses
+        const grossProfit = calculatedSections['grossProfit'];
+        if (grossProfit != null && expensesSection != null) {
+            calculatedSections['earningsBeforeInterestAndTax'] =
+                computeCalculatedSection(grossProfit.classTotals, expensesSection.classTotals, grossProfit.sectionTotal, expensesSection.sectionTotal, 'subtract', SECTION_TITLES['earningsBeforeInterestAndTax']);
+        }
+        // Net Other Income = Other Income - Other Expenses
+        if (otherIncomeSection != null && otherExpensesSection != null) {
+            calculatedSections['netOtherIncome'] = computeCalculatedSection(otherIncomeSection.classTotals, otherExpensesSection.classTotals, otherIncomeSection.sectionTotal, otherExpensesSection.sectionTotal, 'subtract', SECTION_TITLES['netOtherIncome']);
+        }
+        // Net Income = EBIT + Net Other Income
+        const ebit = calculatedSections['earningsBeforeInterestAndTax'];
+        const netOtherIncome = calculatedSections['netOtherIncome'];
+        if (ebit != null && netOtherIncome != null) {
+            calculatedSections['netIncome'] = computeCalculatedSection(ebit.classTotals, netOtherIncome.classTotals, ebit.sectionTotal, netOtherIncome.sectionTotal, 'add', SECTION_TITLES['netIncome']);
+        }
+    }
+    // Build synthetic header COABalances for rendering class names as column headers
+    const headerBalances = buildHeaderBalances(classColumns, filter.timeframe, selectedPeriod, reportCurrency);
+    return {
+        reportId,
+        reportTitle: 'Profit and Loss by Class',
+        firstMonthOfFY: profitAndLossClassesViewState.firstMonthOfFY,
+        fetchState: fetchState.fetchState,
+        bookCloseDate: profitAndLossClassesViewState.bookCloseDate,
+        dataAvailable: profitAndLossClassesViewState.dataAvailable,
+        selectedPeriod,
+        classColumns,
+        sections,
+        calculatedSections,
+        idsInOrder: exports.profitAndLossHorizontalIdsInOrder,
+        uiState: profitAndLossClassesViewState.uiState,
+        headerBalances,
+    };
+};
+exports.getProfitAndLossClassesHorizontalView = getProfitAndLossClassesHorizontalView;
+/**
+ * Build column definitions from class hierarchy (top-level classes only).
+ */
+function buildClassColumns(classHierarchy, classesToFilterOut) {
+    const filteredIds = new Set(classesToFilterOut.map((id) => id[0]));
+    return classHierarchy
+        .filter((c) => !filteredIds.has(c.classId[0]))
+        .map((c) => ({
+        classId: c.classId[0],
+        className: c.className,
+        nestedClassId: c.classId,
+        qboId: c.qboId,
+    }))
+        .sort((a, b) => a.className.localeCompare(b.className, [], { sensitivity: 'base' }));
+}
+/**
+ * Pivot a section from class→account→balances to account→class→balance (single period).
+ */
+function pivotSectionToHorizontal(section, classColumns, title, currency) {
+    // Map: accountId -> { accountName, classId -> balance }
+    const accountMap = new Map();
+    // Also track class totals
+    const classTotalMap = new Map();
+    classColumns.forEach((col) => classTotalMap.set(col.classId, 0));
+    // Iterate over each class in the section
+    section.classes.forEach((classReport) => {
+        const classId = classReport.id[0];
+        // Only process classes that are in our columns
+        if (!classTotalMap.has(classId)) {
+            return;
+        }
+        // Sum all sliced period balances (same slice as vertical columns; multi-period = range total)
+        const classBalance = sumBalancesInSlice(classReport.childrenBalancesTotal.balances);
+        classTotalMap.set(classId, classBalance);
+        // Iterate through accounts in this class
+        collectAccountsFromClass(classReport, classId, accountMap);
+    });
+    // Build account rows in COA tree order (same parent/child ordering as vertical P&L by class).
+    // Sorting by depth + name flattened the hierarchy and broke sub-account grouping.
+    const orderedIds = collectAccountIdsInTreeOrder(section, classColumns);
+    const usedIds = new Set();
+    const accounts = [];
+    const pushAccountRow = (accountId) => {
+        const accountData = accountMap.get(accountId);
+        if (accountData == null) {
+            return;
+        }
+        usedIds.add(accountId);
+        const classBalances = classColumns.map((col) => ({
+            classId: col.classId,
+            balance: (0, amount_1.toAmountWC)(accountData.classBalances.get(col.classId) ?? 0, currency),
+        }));
+        const rowTotal = classBalances.reduce((sum, cb) => sum + cb.balance.amount, 0);
+        accounts.push({
+            accountId,
+            accountName: accountData.accountName,
+            depth: accountData.depth,
+            classBalances,
+            rowTotal: (0, amount_1.toAmountWC)(rowTotal, currency),
+        });
+    };
+    for (const id of orderedIds) {
+        pushAccountRow(id);
+    }
+    for (const accountId of accountMap.keys()) {
+        if (!usedIds.has(accountId)) {
+            pushAccountRow(accountId);
+        }
+    }
+    // Build class totals
+    const classTotals = classColumns.map((col) => ({
+        classId: col.classId,
+        balance: (0, amount_1.toAmountWC)(classTotalMap.get(col.classId) ?? 0, currency),
+    }));
+    const sectionTotal = classTotals.reduce((sum, ct) => sum + ct.balance.amount, 0);
+    return {
+        title,
+        accounts,
+        classTotals,
+        sectionTotal: (0, amount_1.toAmountWC)(sectionTotal, currency),
+    };
+}
+/**
+ * DFS account ids in the same order as vertical P&L by class, using the first class
+ * column that appears in this section as the canonical tree (structure is identical per class).
+ */
+function collectAccountIdsInTreeOrder(section, classColumns) {
+    const ids = [];
+    const visitNested = (nested) => {
+        ids.push(nested.account.accountId);
+        nested.children.forEach(visitNested);
+    };
+    for (const col of classColumns) {
+        const classReport = section.classes.find((c) => c.id[0] === col.classId);
+        if (classReport == null) {
+            continue;
+        }
+        classReport.class.accounts.forEach(visitNested);
+        return ids;
+    }
+    return ids;
+}
+/**
+ * Recursively collect account balances from a NestedClassReportV2 into accountMap.
+ */
+function collectAccountsFromClass(classReport, classId, accountMap) {
+    // Process accounts directly on this class (depth 2 matches vertical `AccountsSection` first level)
+    classReport.class.accounts.forEach((nestedAccount) => {
+        collectAccountsFromNestedAccount(nestedAccount, classId, accountMap, 2);
+    });
+}
+/**
+ * Recursively collect accounts from NestedAccountReport (handles sub-accounts).
+ */
+function collectAccountsFromNestedAccount(nestedAccount, classId, accountMap, depth) {
+    const accountId = nestedAccount.account.accountId;
+    const accountName = nestedAccount.account.accountName;
+    const balance = sumBalancesInSlice(nestedAccount.account.balancesInTimeframe.balances);
+    if (!accountMap.has(accountId)) {
+        accountMap.set(accountId, {
+            accountName,
+            depth,
+            classBalances: new Map(),
+        });
+    }
+    const accountData = accountMap.get(accountId);
+    if (accountData == null) {
+        return;
+    }
+    accountData.depth = Math.max(accountData.depth, depth);
+    const existing = accountData.classBalances.get(classId) ?? 0;
+    accountData.classBalances.set(classId, existing + balance);
+    // Process sub-accounts
+    nestedAccount.children.forEach((child) => {
+        collectAccountsFromNestedAccount(child, classId, accountMap, depth + 1);
+    });
+}
+/**
+ * Total amount for the current report slice. `balances` is already narrowed by
+ * `getCOABalances` / `sliceCOABalances` to the selected range; summing matches
+ * multi-period selections and avoids mismatches when `thisPeriod` does not
+ * align with a row (e.g. slice fallback) or when several period rows are shown.
+ */
+function sumBalancesInSlice(balances) {
+    let sum = 0;
+    for (const bal of balances) {
+        sum += bal.balance?.amount ?? 0;
+    }
+    return sum;
+}
+/**
+ * Compute a calculated section by adding or subtracting two sets of class totals.
+ */
+function computeCalculatedSection(aTotals, bTotals, aTotal, bTotal, operation, title) {
+    const currency = {
+        currencyCode: aTotal.currencyCode,
+        currencySymbol: aTotal.currencySymbol,
+    };
+    const bTotalsMap = new Map(bTotals.map((b) => [b.classId, b.balance.amount]));
+    const classTotals = aTotals.map((a) => {
+        const bAmount = bTotalsMap.get(a.classId) ?? 0;
+        const resultAmount = operation === 'add'
+            ? a.balance.amount + bAmount
+            : a.balance.amount - bAmount;
+        return {
+            classId: a.classId,
+            balance: (0, amount_1.toAmountWC)(resultAmount, currency),
+        };
+    });
+    const sectionTotalAmount = operation === 'add'
+        ? aTotal.amount + bTotal.amount
+        : aTotal.amount - bTotal.amount;
+    return {
+        title,
+        classTotals,
+        sectionTotal: (0, amount_1.toAmountWC)(sectionTotalAmount, currency),
+    };
+}
+/**
+ * Build synthetic COABalance array for header rendering.
+ * One entry per class column + one for "Total".
+ */
+function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency) {
+    if (selectedPeriod == null) {
+        return [];
+    }
+    const { endDate, startDate } = selectedPeriod;
+    const balances = classColumns.map((col) => ({
+        balance: (0, amount_1.toAmountWC)(0, currency),
+        balanceTimeFrame: timeframe,
+        endDate,
+        startDate,
+        type: 'default',
+        label: col.className,
+    }));
+    // Add a "Total" column
+    balances.push({
+        balance: (0, amount_1.toAmountWC)(0, currency),
+        balanceTimeFrame: timeframe,
+        endDate,
+        startDate,
+        type: 'default',
+        label: 'Total',
+    });
+    return balances;
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes.d.ts

@@ -0,0 +1,59 @@
+import { Amount } from '../../commonStateTypes/amount';
+import { NestedClassID } from '../../commonStateTypes/classesView/nestedClassID';
+import { COABalance } from '../../commonStateTypes/coaBalance/coaBalance';
+import { FetchState, ID } from '../../commonStateTypes/common';
+import { DataAvailable } from '../../commonStateTypes/dataAvailable';
+import { Month } from '../../commonStateTypes/timePeriod';
+import { ReportID } from '../../commonStateTypes/viewAndReport/viewAndReport';
+import { ZeniDate } from '../../zeniDayJS';
+import { PandLReportViewCalculatedSectionID, PandLReportViewSectionID } from './profitAndLossClassesViewSelectorTypes';
+import { ProfitAndLossClassesViewUIState } from './profitAndLossClassesViewState';
+export interface ClassColumnDefinition {
+    classId: string;
+    className: string;
+    nestedClassId: NestedClassID;
+    qboId?: ID;
+}
+export interface HorizontalClassBalance {
+    balance: Amount;
+    classId: string;
+}
+export interface HorizontalAccountRow {
+    accountId: string;
+    accountName: string;
+    classBalances: HorizontalClassBalance[];
+    /** Matches vertical classes PDF account indentation (`depth * 6` pt); top-level rows use 2. */
+    depth: number;
+    rowTotal: Amount;
+}
+export interface HorizontalSectionReport {
+    accounts: HorizontalAccountRow[];
+    classTotals: HorizontalClassBalance[];
+    sectionTotal: Amount;
+    title: string;
+}
+export interface HorizontalCalculatedSection {
+    classTotals: HorizontalClassBalance[];
+    sectionTotal: Amount;
+    title: string;
+}
+export interface ProfitAndLossByClassHorizontalReport {
+    calculatedSections: Partial<Record<PandLReportViewCalculatedSectionID, HorizontalCalculatedSection>>;
+    classColumns: ClassColumnDefinition[];
+    fetchState: FetchState;
+    firstMonthOfFY: Month;
+    /** Synthetic COABalance array for header rendering — one per class column + total */
+    headerBalances: COABalance[];
+    idsInOrder: (PandLReportViewSectionID | PandLReportViewCalculatedSectionID)[];
+    reportId: ReportID;
+    reportTitle: string;
+    sections: Partial<Record<PandLReportViewSectionID, HorizontalSectionReport>>;
+    selectedPeriod: {
+        endDate: ZeniDate;
+        startDate: ZeniDate;
+        label?: string;
+    } | undefined;
+    uiState: ProfitAndLossClassesViewUIState;
+    bookCloseDate?: ZeniDate;
+    dataAvailable?: DataAvailable;
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.d.ts

@@ -2,7 +2,7 @@ import { NestedClassID } from '../../commonStateTypes/classesView/nestedClassID'
 import { AccountViewMode, ID } from '../../commonStateTypes/common';
 import { ZeniAPIStatus, ZeniReportData } from '../../responsePayload';
 import { ProfitAndLossClassesViewPayload } from './profitAndLossClassesViewPayload';
-import { ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
+import { ClassViewLayout, ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
 export declare const initialState: ProfitAndLossClassesViewState;
 export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
     cacheOverride: boolean;
@@ -30,6 +30,8 @@ export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").A
     };
 }, "profitAndLossClassesView/updateProfitAndLossClassesViewUIState">, updateAccountViewMode: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     viewMode: AccountViewMode;
-}, "profitAndLossClassesView/updateAccountViewMode">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
+}, "profitAndLossClassesView/updateAccountViewMode">, updateClassViewLayout: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    classViewLayout: ClassViewLayout;
+}, "profitAndLossClassesView/updateClassViewLayout">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
 declare const _default: import("redux").Reducer<ProfitAndLossClassesViewState>;
 export default _default;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
+exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateClassViewLayout = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
 const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/classesView/getNestedClassIDHierarchyForReport");
@@ -27,6 +27,7 @@ exports.initialState = {
         nodeCollapseState: {},
         scrollPosition: undefined,
         accountViewMode: 'account_group',
+        classViewLayout: 'vertical',
         classesToFilterOut: [],
     },
     firstMonthOfFY: 1,
@@ -98,6 +99,9 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         updateAccountViewMode(draft, action) {
             draft.uiState.accountViewMode = action.payload.viewMode;
         },
+        updateClassViewLayout(draft, action) {
+            draft.uiState.classViewLayout = action.payload.classViewLayout;
+        },
         resetProfitAndLossClassesNodeCollapseState(draft) {
             draft.uiState.nodeCollapseState = {};
         },
@@ -106,10 +110,11 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
+_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.updateClassViewLayout = _a.updateClassViewLayout, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
 exports.default = profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(pandLReport.report);
+    draft.currency = report.currency;
     draft.dataAvailable = report.dataAvailable;
     draft.firstMonthOfFY = report.firstMonthOfFY;
     draft.bookCloseDate = report.bookCloseDate;