@mj-biz-apps/orders-ng 5.11.0 → 5.12.1

package/dist/lib/custom/OrderHeader/order-header-form.component.d.ts

@@ -2,8 +2,8 @@ import type { RunViewParams } from '@memberjunction/core';
 import { type FormNavigationEvent } from '@memberjunction/ng-base-forms';
 import { NavigationService } from '@memberjunction/ng-shared';
 import type { TabConfig } from '@memberjunction/ng-ui-components';
-import { OrderHeaderEntity, type mjBizAppsOrdersPaymentTypeEntity } from '@mj-biz-apps/orders-entities';
-import { type OrderJournalCard } from '../../data/orders-queries.js';
+import { OrderHeaderEntity, type DateCell, type mjBizAppsOrdersPaymentTypeEntity } from '@mj-biz-apps/orders-entities';
+import { type OrderJournalCard, type OrderJournalDateBasis, type OrderJournalEntryRow } from '../../data/orders-queries.js';
 import { mjBizAppsOrdersOrderHeaderFormComponent } from '../../generated/Entities/mjBizAppsOrdersOrderHeader/mjbizappsordersorderheader.form.component.js';
 import type { MJOPricingState } from '../../services/pricing-scheduler.service.js';
 import type { mjBizAppsAccountingJournalEntryEntity } from '@mj-biz-apps/accounting-entities';
@@ -37,11 +37,25 @@ export declare class BizAppsOrderHeaderFormComponent extends mjBizAppsOrdersOrde
     /** Related lists in the header tabs cap at 300px and scroll internally when larger. */
     readonly RelatedGridHeight = 300;
     AccountingView: OrderAccountingView;
-    /** Display-only rollup of every line journal. Never a stored JE. */
+    /** Display-only rollup of every journal this order caused. Never a stored JE. */
     RollupLoading: boolean;
     RollupError: string | null;
     RollupCards: OrderJournalCard[];
     RollupJournalCount: number;
+    /** Every included entry, unnetted — the By line view. */
+    JournalRows: OrderJournalEntryRow[];
+    /** "3 entries scheduled after 2026-09-10", or null when nothing is being hidden. */
+    RollupExcludedLabel: string | null;
+    /** One line per payment fee entry this order shares in full with other orders. */
+    RollupSharedNotes: string[];
+    /**
+     * The two controls above both views, blank/effective by default.
+     *
+     * Blank As-of is the LIFETIME view — every entry, past and future — which is what makes the
+     * deferred-revenue release visible instead of folded into today's picture (#183 item 1).
+     */
+    AccountingAsOf: string | null;
+    AccountingBasis: OrderJournalDateBasis;
     Confirming: boolean;
     ConfirmError: string | null;
     PaymentTypes: mjBizAppsOrdersPaymentTypeEntity[];
@@ -122,18 +136,32 @@ export declare class BizAppsOrderHeaderFormComponent extends mjBizAppsOrdersOrde
     OpenProduct(id: string): void;
     get PaymentParams(): RunViewParams | null;
     get ChargeParams(): RunViewParams | null;
-    get JournalParams(): RunViewParams | null;
     get SubscriptionParams(): RunViewParams | null;
     private get lineIDs();
     private restorePrefs;
     private clampPrefsToVisibleTabs;
     private isVisibleTab;
     RevRecJournalEntries: mjBizAppsAccountingJournalEntryEntity[];
+    /** The one fetched snapshot every accounting view is derived from. Null until the tab is opened. */
+    private journalData;
     private loadPaymentTypes;
+    /**
+     * Load every journal behind this order, once, and derive all three views from it.
+     *
+     * ONE fetch feeds Rolled up, By line and the waterfall. That is not just economy: the As-of date
+     * and the basis toggle are applied to the SAME snapshot by pure functions, so the two views
+     * cannot end up disagreeing about what is included (#183 item 9).
+     */
     private refreshAccountingIfNeeded;
-    private loadRevRecJournalEntries;
+    /** Re-derive both views from the loaded snapshot. No I/O — moving the As-of date must not refetch. */
+    private applyAccountingView;
+    /** The As-of box. Blank means lifetime, which is the default and the point of item 1. */
+    OnAccountingAsOfChanged(value: string): void;
+    SetAccountingBasis(basis: OrderJournalDateBasis): void;
+    SharedOrdersLabel(count: number): string;
+    JournalDate(value: DateCell): string;
+    OnJournalRowSelected(id: string): void;
     OnJournalEntrySelected(je: mjBizAppsAccountingJournalEntryEntity): void;
-    private loadOrderJournalRollup;
     private defaultSellingCompany;
     private openRecord;
     static ɵfac: i0.ɵɵFactoryDeclaration<BizAppsOrderHeaderFormComponent, never>;

package/dist/lib/custom/OrderHeader/order-header-form.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-header-form.component.d.ts","sourceRoot":"","sources":["../../../../src/lib/custom/OrderHeader/order-header-form.component.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-header-form.component.d.ts","sourceRoot":"","sources":["../../../../src/lib/custom/OrderHeader/order-header-form.component.ts"],"names":[],"mappings":"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"}