@powerhousedao/service-offering 1.0.0-dev.1 → 1.0.0-dev.10

package/dist/editors/subscription-instance-editor/components/MockDataButton.js

@@ -10,28 +10,240 @@ export function MockDataButton({ document, dispatch }) {
         const oneMonthAgo = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000).toISOString();
         const oneMonthFromNow = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString();
         const twoMonthsFromNow = new Date(Date.now() + 60 * 24 * 60 * 60 * 1000).toISOString();
+        // 1. Initialize subscription with full service group structure
+        //    Pricing lives at the SERVICE GROUP level, not per-service
         if (!document.state.global.customerId) {
             dispatch(initializeSubscription({
                 createdAt: oneMonthAgo,
                 customerId: `phid:customer:${generateId()}`,
                 customerName: "Acme Corporation",
                 customerEmail: "billing@acme.example.com",
+                resourceId: `phid:resource:${generateId()}`,
+                resourceLabel: "Enterprise Cloud Platform",
                 tierName: "Professional",
                 tierPricingOptionId: generateId(),
                 tierPrice: 726,
                 tierCurrency: "USD",
-                tierPricingMode: "FIXED",
+                tierPricingMode: "CALCULATED",
                 selectedBillingCycle: "MONTHLY",
                 globalCurrency: "USD",
+                autoRenew: true,
+                serviceGroups: [
+                    // === Core Infrastructure (recurring, group-level price: $726/mo) ===
+                    {
+                        id: generateId(),
+                        name: "Core Infrastructure",
+                        optional: false,
+                        costType: "RECURRING",
+                        recurringAmount: 726,
+                        recurringCurrency: "USD",
+                        recurringBillingCycle: "MONTHLY",
+                        setupAmount: 500,
+                        setupCurrency: "USD",
+                        services: [
+                            {
+                                id: generateId(),
+                                name: "Cloud Compute",
+                                description: "Scalable virtual machines with automatic load balancing",
+                                metrics: [
+                                    {
+                                        id: generateId(),
+                                        name: "vCPU Hours",
+                                        unitName: "hours",
+                                        currentUsage: 1250,
+                                        freeLimit: 1000,
+                                        paidLimit: 2000,
+                                        unitCostAmount: 0.05,
+                                        unitCostCurrency: "USD",
+                                        unitCostBillingCycle: "MONTHLY",
+                                        usageResetPeriod: "MONTHLY",
+                                    },
+                                    {
+                                        id: generateId(),
+                                        name: "RAM GB-Hours",
+                                        unitName: "GB-hours",
+                                        currentUsage: 3200,
+                                        freeLimit: 3000,
+                                        paidLimit: 5000,
+                                        usageResetPeriod: "MONTHLY",
+                                    },
+                                    {
+                                        id: generateId(),
+                                        name: "Active Instances",
+                                        unitName: "instances",
+                                        currentUsage: 8,
+                                        freeLimit: 10,
+                                        paidLimit: 20,
+                                    },
+                                ],
+                            },
+                            {
+                                id: generateId(),
+                                name: "Object Storage",
+                                description: "Unlimited cloud storage with CDN integration",
+                                metrics: [
+                                    {
+                                        id: generateId(),
+                                        name: "Storage Used",
+                                        unitName: "GB",
+                                        currentUsage: 450,
+                                        freeLimit: 500,
+                                        paidLimit: 2000,
+                                        unitCostAmount: 0.02,
+                                        unitCostCurrency: "USD",
+                                        unitCostBillingCycle: "MONTHLY",
+                                    },
+                                    {
+                                        id: generateId(),
+                                        name: "Bandwidth Out",
+                                        unitName: "GB",
+                                        currentUsage: 280,
+                                        freeLimit: 500,
+                                        usageResetPeriod: "MONTHLY",
+                                    },
+                                    {
+                                        id: generateId(),
+                                        name: "API Requests",
+                                        unitName: "requests",
+                                        currentUsage: 125000,
+                                        freeLimit: 100000,
+                                        paidLimit: 500000,
+                                        unitCostAmount: 0.001,
+                                        unitCostCurrency: "USD",
+                                        unitCostBillingCycle: "MONTHLY",
+                                        usageResetPeriod: "MONTHLY",
+                                    },
+                                ],
+                            },
+                            {
+                                id: generateId(),
+                                name: "Managed Database",
+                                description: "PostgreSQL with automatic backups and failover",
+                                metrics: [
+                                    {
+                                        id: generateId(),
+                                        name: "Database Size",
+                                        unitName: "GB",
+                                        currentUsage: 85,
+                                        freeLimit: 50,
+                                        paidLimit: 100,
+                                        unitCostAmount: 0.5,
+                                        unitCostCurrency: "USD",
+                                        unitCostBillingCycle: "MONTHLY",
+                                    },
+                                    {
+                                        id: generateId(),
+                                        name: "Connections",
+                                        unitName: "connections",
+                                        currentUsage: 45,
+                                        freeLimit: 50,
+                                        paidLimit: 100,
+                                    },
+                                ],
+                            },
+                            {
+                                id: generateId(),
+                                name: "Global CDN",
+                                description: "Content delivery network with edge caching",
+                                metrics: [
+                                    {
+                                        id: generateId(),
+                                        name: "Cache Hit Rate",
+                                        unitName: "%",
+                                        currentUsage: 94,
+                                        limit: 100,
+                                    },
+                                    {
+                                        id: generateId(),
+                                        name: "Edge Requests",
+                                        unitName: "M requests",
+                                        currentUsage: 12,
+                                        freeLimit: 10,
+                                        paidLimit: 50,
+                                        unitCostAmount: 5,
+                                        unitCostCurrency: "USD",
+                                        unitCostBillingCycle: "MONTHLY",
+                                        usageResetPeriod: "MONTHLY",
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                    // === Security Suite (optional add-on, group-level price: $178/mo) ===
+                    {
+                        id: generateId(),
+                        name: "Security Suite",
+                        optional: true,
+                        costType: "RECURRING",
+                        recurringAmount: 178,
+                        recurringCurrency: "USD",
+                        recurringBillingCycle: "MONTHLY",
+                        setupAmount: 750,
+                        setupCurrency: "USD",
+                        services: [
+                            {
+                                id: generateId(),
+                                name: "DDoS Protection",
+                                description: "Advanced DDoS mitigation with real-time monitoring",
+                            },
+                            {
+                                id: generateId(),
+                                name: "WAF",
+                                description: "Web Application Firewall with custom rules",
+                            },
+                            {
+                                id: generateId(),
+                                name: "Security Audit & Onboarding",
+                                description: "Initial security assessment and configuration",
+                            },
+                        ],
+                    },
+                    // === Premium Support (optional add-on, group-level price: $498/mo) ===
+                    {
+                        id: generateId(),
+                        name: "Premium Support",
+                        optional: true,
+                        costType: "RECURRING",
+                        recurringAmount: 498,
+                        recurringCurrency: "USD",
+                        recurringBillingCycle: "MONTHLY",
+                        setupAmount: 1200,
+                        setupCurrency: "USD",
+                        services: [
+                            {
+                                id: generateId(),
+                                name: "24/7 Priority Support",
+                                description: "Direct access to senior engineers with 15-min response time",
+                            },
+                            {
+                                id: generateId(),
+                                name: "Dedicated Account Manager",
+                                description: "Personal account manager for strategic guidance",
+                            },
+                            {
+                                id: generateId(),
+                                name: "Team Onboarding Workshop",
+                                description: "Customized training sessions for your engineering team",
+                            },
+                        ],
+                    },
+                ],
             }));
         }
+        // 2. Activate subscription
         dispatch(activateSubscription({
-            activatedAt: oneMonthAgo,
+            activatedSince: oneMonthAgo,
         }));
+        // 3. Set renewal date
         dispatch(setRenewalDate({ renewalDate: twoMonthsFromNow }));
+        // 4. Set customer type
         dispatch(setCustomerType({
             customerType: "TEAM",
+            teamMemberCount: 12,
         }));
+        // 5. Billing projection
+        // Core: $726/mo + Security: $178/mo + Support: $498/mo = $1,402/mo
+        // Plus metric overages: vCPU 250 × $0.05 = $12.50, API 25k × $0.001 = $25, DB 35 × $0.50 = $17.50, Edge 2M × $5 = $10
         dispatch(updateBillingProjection({
             nextBillingDate: oneMonthFromNow,
             projectedBillAmount: 1467,

package/dist/editors/subscription-instance-editor/components/OperatorNotes.js

@@ -6,7 +6,7 @@ export function OperatorNotes({ document, dispatch }) {
     const [isEditing, setIsEditing] = useState(false);
     const [notes, setNotes] = useState(currentNotes);
     const handleSave = useCallback(() => {
-        dispatch(setOperatorNotes({ notes: notes || null }));
+        dispatch(setOperatorNotes({ operatorNotes: notes || null }));
         setIsEditing(false);
     }, [dispatch, notes]);
     const handleCancel = useCallback(() => {

package/dist/editors/subscription-instance-editor/components/ServicesPanel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServicesPanel.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/ServicesPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,uEAAuE,CAAC;AAK/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,4BAA4B,CAAC;IACvC,QAAQ,EAAE,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;IACvD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAkKD,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,QAAQ,EACR,IAAI,GACL,EAAE,kBAAkB,2CAmKpB"}
+{"version":3,"file":"ServicesPanel.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/ServicesPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,uEAAuE,CAAC;AAK/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQ5C,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,4BAA4B,CAAC;IACvC,QAAQ,EAAE,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;IACvD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAkKD,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,QAAQ,EACR,IAAI,GACL,EAAE,kBAAkB,2CA6KpB"}

package/dist/editors/subscription-instance-editor/components/ServicesPanel.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { MetricActions } from "./MetricActions.js";
-import { formatCurrency as fmtCurrency } from "./billing-utils.js";
-function UsageBar({ serviceId, metric, dispatch, isOperator, customerName, currency, }) {
+import { formatCurrency as fmtCurrency, formatBillingCycleSuffix, formatDiscountBadge, } from "./billing-utils.js";
+function UsageBar({ serviceId, metric, dispatch, isOperator, customerName, }) {
     const freeLimit = metric.freeLimit ?? metric.limit ?? 0;
     const paidLimit = metric.paidLimit ?? null;
     const displayLimit = paidLimit ?? freeLimit;
@@ -17,35 +17,24 @@ function UsageBar({ serviceId, metric, dispatch, isOperator, customerName, curre
         return "si-usage-bar__fill--normal";
     };
     const isOverFree = metric.currentUsage > freeLimit && freeLimit > 0;
-    return (_jsxs("div", { className: "si-metric", children: [_jsxs("div", { className: "si-metric__header", children: [_jsx("span", { className: "si-metric__name", children: metric.name }), _jsxs("span", { className: "si-metric__value", children: [metric.currentUsage.toLocaleString(), displayLimit > 0 && ` / ${displayLimit.toLocaleString()}`, _jsxs("span", { className: "si-metric__unit", children: [" ", metric.unitName] })] })] }), _jsxs("div", { className: "si-metric__body", children: [displayLimit > 0 && (_jsxs("div", { className: "si-usage-bar", children: [paidLimit != null && freeLimit > 0 && freeLimit < paidLimit && (_jsx("div", { className: "si-usage-bar__free-marker", style: { left: `${freePortion}%` }, title: `${freeLimit.toLocaleString()} free` })), _jsx("div", { className: `si-usage-bar__fill ${getBarColor()}`, style: { width: `${percentage}%` }, role: "progressbar", "aria-valuenow": metric.currentUsage, "aria-valuemin": 0, "aria-valuemax": displayLimit })] })), _jsx(MetricActions, { serviceId: serviceId, metric: metric, dispatch: dispatch, isOperator: isOperator, customerName: customerName })] }), paidLimit != null && freeLimit > 0 && freeLimit !== paidLimit && (_jsxs("p", { className: "si-metric__paid-limit", children: [freeLimit.toLocaleString(), " free \u00B7 ", paidLimit.toLocaleString(), " max", metric.unitCost != null && (_jsxs("span", { children: [" · ", "overage: ", fmtCurrency(metric.unitCost, currency), "/", metric.unitName] }))] })), isOverFree && metric.unitCost != null && (_jsxs("div", { className: "si-metric__overage", children: [_jsx("strong", { children: (metric.currentUsage - freeLimit).toLocaleString() }), " ", metric.unitName, " over free limit"] })), (metric.nextUsageReset || metric.usageResetPeriod) && (_jsxs("p", { className: "si-metric__reset", children: [metric.usageResetPeriod && (_jsxs("span", { className: "si-metric__reset-period", children: [metric.usageResetPeriod.charAt(0) +
+    return (_jsxs("div", { className: "si-metric", children: [_jsxs("div", { className: "si-metric__header", children: [_jsx("span", { className: "si-metric__name", children: metric.name }), _jsxs("span", { className: "si-metric__value", children: [metric.currentUsage.toLocaleString(), displayLimit > 0 && ` / ${displayLimit.toLocaleString()}`, _jsxs("span", { className: "si-metric__unit", children: [" ", metric.unitName] })] })] }), _jsxs("div", { className: "si-metric__body", children: [displayLimit > 0 && (_jsxs("div", { className: "si-usage-bar", children: [paidLimit != null && freeLimit > 0 && freeLimit < paidLimit && (_jsx("div", { className: "si-usage-bar__free-marker", style: { left: `${freePortion}%` }, title: `${freeLimit.toLocaleString()} free` })), _jsx("div", { className: `si-usage-bar__fill ${getBarColor()}`, style: { width: `${percentage}%` }, role: "progressbar", "aria-valuenow": metric.currentUsage, "aria-valuemin": 0, "aria-valuemax": displayLimit })] })), _jsx(MetricActions, { serviceId: serviceId, metric: metric, dispatch: dispatch, isOperator: isOperator, customerName: customerName })] }), paidLimit != null && freeLimit > 0 && freeLimit !== paidLimit && (_jsxs("p", { className: "si-metric__paid-limit", children: [freeLimit.toLocaleString(), " free \u00B7 ", paidLimit.toLocaleString(), " max", metric.unitCost && (_jsxs("span", { children: [" · ", "overage:", " ", fmtCurrency(metric.unitCost.amount, metric.unitCost.currency), "/", metric.unitName] }))] })), isOverFree && metric.unitCost && (_jsxs("div", { className: "si-metric__overage", children: [_jsx("strong", { children: (metric.currentUsage - freeLimit).toLocaleString() }), " ", metric.unitName, " over free limit"] })), (metric.nextUsageReset || metric.usageResetPeriod) && (_jsxs("p", { className: "si-metric__reset", children: [metric.usageResetPeriod && (_jsxs("span", { className: "si-metric__reset-period", children: [metric.usageResetPeriod.charAt(0) +
                                 metric.usageResetPeriod.slice(1).toLowerCase(), " ", "reset"] })), metric.nextUsageReset && (_jsxs("span", { children: [metric.usageResetPeriod ? " · " : "Resets ", new Date(metric.nextUsageReset).toLocaleDateString()] }))] }))] }));
 }
-function ServiceCard({ service, mode, dispatch, customerName, currency, }) {
-    return (_jsxs("div", { className: "si-service-card", children: [_jsxs("div", { className: "si-service-card__header", children: [_jsx("h4", { className: "si-service-card__name", children: service.name || "Service" }), service.customValue && (_jsx("span", { className: "si-service-card__custom-value", children: service.customValue }))] }), service.description && (_jsx("p", { className: "si-service-card__desc", children: service.description })), service.metrics.length > 0 && (_jsx("div", { className: "si-service-card__metrics", children: service.metrics.map((metric) => (_jsx(UsageBar, { serviceId: service.id, metric: metric, dispatch: dispatch, isOperator: mode === "operator", customerName: customerName, currency: currency }, metric.id))) }))] }));
+function ServiceCard({ service, mode, dispatch, customerName, }) {
+    return (_jsxs("div", { className: "si-service-card", children: [_jsxs("div", { className: "si-service-card__header", children: [_jsx("h4", { className: "si-service-card__name", children: service.name || "Service" }), service.customValue && (_jsx("span", { className: "si-service-card__custom-value", children: service.customValue }))] }), service.description && (_jsx("p", { className: "si-service-card__desc", children: service.description })), service.metrics.length > 0 && (_jsx("div", { className: "si-service-card__metrics", children: service.metrics.map((metric) => (_jsx(UsageBar, { serviceId: service.id, metric: metric, dispatch: dispatch, isOperator: mode === "operator", customerName: customerName }, metric.id))) }))] }));
 }
 export function ServicesPanel({ document, dispatch, mode, }) {
     const state = document.state.global;
-    const currency = state.globalCurrency || state.tierCurrency || "USD";
-    const allGroupedServiceIds = new Set(state.serviceGroups.flatMap((g) => g.services));
-    const standaloneServices = state.services.filter((s) => !allGroupedServiceIds.has(s.id));
+    // Split groups into recurring (non-optional) and add-ons (optional)
     const recurringGroups = state.serviceGroups.filter((g) => !g.optional);
     const addonGroups = state.serviceGroups.filter((g) => g.optional);
-    const hasRecurring = standaloneServices.length > 0 || recurringGroups.length > 0;
+    const hasRecurring = state.services.length > 0 || recurringGroups.length > 0;
     const hasAddons = addonGroups.length > 0;
-    const recurringServiceCount = standaloneServices.length +
+    const recurringServiceCount = state.services.length +
         recurringGroups.reduce((acc, g) => acc + g.services.length, 0);
     const addonServiceCount = addonGroups.reduce((acc, g) => acc + g.services.length, 0);
     if (!hasRecurring && !hasAddons) {
         return (_jsxs("div", { className: "si-panel", children: [_jsx("div", { className: "si-panel__header", children: _jsx("h3", { className: "si-panel__title", children: "Services" }) }), _jsxs("div", { className: "si-empty", children: [_jsx("svg", { className: "si-empty__icon", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: 1.5, children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" }) }), _jsx("p", { className: "si-empty__text", children: "No services configured" })] })] }));
     }
-    const resolveGroupServices = (serviceIds) => serviceIds
-        .map((id) => state.services.find((s) => s.id === id))
-        .filter((s) => s != null);
-    return (_jsxs(_Fragment, { children: [hasRecurring && (_jsxs("div", { className: "si-panel", children: [_jsxs("div", { className: "si-panel__header", children: [_jsx("h3", { className: "si-panel__title", children: "Recurring Services" }), _jsxs("span", { className: "si-panel__count", children: [recurringServiceCount, " services"] })] }), standaloneServices.length > 0 && (_jsx("div", { className: "si-services-grid", children: standaloneServices.map((service) => (_jsx(ServiceCard, { service: service, mode: mode, dispatch: dispatch, customerName: state.customerName, currency: currency }, service.id))) })), recurringGroups.map((group) => {
-                        const groupServices = resolveGroupServices(group.services);
-                        return (_jsxs("div", { className: "si-service-group", children: [_jsxs("div", { className: "si-service-group__header", children: [_jsx("h4", { className: "si-service-group__name", children: group.name }), group.recurringCost && (_jsx("span", { className: "si-service-group__price", children: fmtCurrency(group.recurringCost.amount, group.recurringCost.currency) }))] }), _jsx("div", { className: "si-services-grid", children: groupServices.map((service) => (_jsx(ServiceCard, { service: service, mode: mode, dispatch: dispatch, customerName: state.customerName, currency: currency }, service.id))) })] }, group.id));
-                    })] })), hasAddons && (_jsxs("div", { className: "si-panel", children: [_jsxs("div", { className: "si-panel__header", children: [_jsx("h3", { className: "si-panel__title", children: "Add-ons" }), _jsxs("span", { className: "si-panel__count", children: [addonGroups.length, " groups, ", addonServiceCount, " services"] })] }), addonGroups.map((group) => {
-                        const groupServices = resolveGroupServices(group.services);
-                        return (_jsxs("div", { className: "si-service-group", children: [_jsxs("div", { className: "si-service-group__header", children: [_jsx("h4", { className: "si-service-group__name", children: group.name }), _jsx("span", { className: "si-badge si-badge--violet si-badge--sm", children: "Optional" }), group.recurringCost && (_jsx("span", { className: "si-service-group__price", children: fmtCurrency(group.recurringCost.amount, group.recurringCost.currency) }))] }), _jsx("div", { className: "si-services-grid", children: groupServices.map((service) => (_jsx(ServiceCard, { service: service, mode: mode, dispatch: dispatch, customerName: state.customerName, currency: currency }, service.id))) })] }, group.id));
-                    })] }))] }));
+    return (_jsxs(_Fragment, { children: [hasRecurring && (_jsxs("div", { className: "si-panel", children: [_jsxs("div", { className: "si-panel__header", children: [_jsx("h3", { className: "si-panel__title", children: "Recurring Services" }), _jsxs("span", { className: "si-panel__count", children: [recurringServiceCount, " services"] })] }), state.services.length > 0 && (_jsx("div", { className: "si-services-grid", children: state.services.map((service) => (_jsx(ServiceCard, { service: service, mode: mode, dispatch: dispatch, customerName: state.customerName }, service.id))) })), recurringGroups.map((group) => (_jsxs("div", { className: "si-service-group", children: [_jsxs("div", { className: "si-service-group__header", children: [_jsx("h4", { className: "si-service-group__name", children: group.name }), group.recurringCost && (_jsxs("span", { className: "si-service-group__price", children: [group.recurringCost.discount && (_jsxs(_Fragment, { children: [_jsx("span", { className: "si-service-group__original-price", children: fmtCurrency(group.recurringCost.discount.originalAmount, group.recurringCost.currency) }), _jsx("span", { className: "si-service-group__discount-badge", children: formatDiscountBadge(group.recurringCost.discount) })] })), fmtCurrency(group.recurringCost.amount, group.recurringCost.currency), formatBillingCycleSuffix(group.recurringCost.billingCycle)] }))] }), _jsx("div", { className: "si-services-grid", children: group.services.map((service) => (_jsx(ServiceCard, { service: service, mode: mode, dispatch: dispatch, customerName: state.customerName }, service.id))) })] }, group.id)))] })), hasAddons && (_jsxs("div", { className: "si-panel", children: [_jsxs("div", { className: "si-panel__header", children: [_jsx("h3", { className: "si-panel__title", children: "Add-ons" }), _jsxs("span", { className: "si-panel__count", children: [addonGroups.length, " groups, ", addonServiceCount, " services"] })] }), addonGroups.map((group) => (_jsxs("div", { className: "si-service-group", children: [_jsxs("div", { className: "si-service-group__header", children: [_jsx("h4", { className: "si-service-group__name", children: group.name }), _jsx("span", { className: "si-badge si-badge--violet si-badge--sm", children: "Optional" }), group.recurringCost && (_jsxs("span", { className: "si-service-group__price", children: [group.recurringCost.discount && (_jsxs(_Fragment, { children: [_jsx("span", { className: "si-service-group__original-price", children: fmtCurrency(group.recurringCost.discount.originalAmount, group.recurringCost.currency) }), _jsx("span", { className: "si-service-group__discount-badge", children: formatDiscountBadge(group.recurringCost.discount) })] })), fmtCurrency(group.recurringCost.amount, group.recurringCost.currency), formatBillingCycleSuffix(group.recurringCost.billingCycle)] }))] }), _jsx("div", { className: "si-services-grid", children: group.services.map((service) => (_jsx(ServiceCard, { service: service, mode: mode, dispatch: dispatch, customerName: state.customerName }, service.id))) })] }, group.id)))] }))] }));
 }

package/dist/editors/subscription-instance-editor/components/SubscriptionActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionActions.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/SubscriptionActions.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,uEAAuE,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAS5C,UAAU,wBAAwB;IAChC,QAAQ,EAAE,4BAA4B,CAAC;IACvC,QAAQ,EAAE,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;IACvD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAsED,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,QAAQ,EACR,IAAI,GACL,EAAE,wBAAwB,2CA2P1B"}
+{"version":3,"file":"SubscriptionActions.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/SubscriptionActions.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,uEAAuE,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAS5C,UAAU,wBAAwB;IAChC,QAAQ,EAAE,4BAA4B,CAAC;IACvC,QAAQ,EAAE,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;IACvD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAsED,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,QAAQ,EACR,IAAI,GACL,EAAE,wBAAwB,2CA2P1B"}

package/dist/editors/subscription-instance-editor/components/SubscriptionActions.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useCallback } from "react";
-import { generateId } from "document-model/core";
 import { activateSubscription, pauseSubscription, resumeSubscription, cancelSubscription, renewExpiringSubscription, } from "../../../document-models/subscription-instance/v1/gen/subscription/creators.js";
 function ConfirmModal({ isOpen, title, message, confirmLabel, confirmVariant = "primary", onConfirm, onCancel, showReasonInput, reason, onReasonChange, }) {
     if (!isOpen)
@@ -19,32 +18,32 @@ export function SubscriptionActions({ document, dispatch, mode, }) {
     // Operator direct actions
     const handleActivate = useCallback(() => {
         dispatch(activateSubscription({
-            activatedAt: new Date().toISOString(),
+            activatedSince: new Date().toISOString(),
         }));
     }, [dispatch]);
     const handleOperatorPause = useCallback(() => {
         dispatch(pauseSubscription({
-            pausedAt: new Date().toISOString(),
+            pausedSince: new Date().toISOString(),
         }));
         setConfirmAction(null);
     }, [dispatch]);
     const handleOperatorResume = useCallback(() => {
         dispatch(resumeSubscription({
-            resumedAt: new Date().toISOString(),
+            timestamp: new Date().toISOString(),
         }));
         setConfirmAction(null);
     }, [dispatch]);
     const handleOperatorCancel = useCallback(() => {
         dispatch(cancelSubscription({
-            cancelledAt: new Date().toISOString(),
-            reason: reason || undefined,
+            cancelledSince: new Date().toISOString(),
+            cancellationReason: reason || null,
         }));
         setConfirmAction(null);
         setReason("");
     }, [dispatch, reason]);
     const handleOperatorRenew = useCallback(() => {
         dispatch(renewExpiringSubscription({
-            renewedAt: new Date().toISOString(),
+            timestamp: new Date().toISOString(),
         }));
         setConfirmAction(null);
     }, [dispatch]);
@@ -70,12 +69,12 @@ export function SubscriptionActions({ document, dispatch, mode, }) {
         handleOperatorCancel,
         handleOperatorRenew,
     ]);
-    const isDraft = state.status === "DRAFT";
+    const isPending = state.status === "PENDING";
     const isActive = state.status === "ACTIVE";
     const isPaused = state.status === "PAUSED";
     const isExpiring = state.status === "EXPIRING";
     const isCancelled = state.status === "CANCELLED";
-    return (_jsxs(_Fragment, { children: [_jsx("div", { className: "si-actions", children: mode === "operator" && (_jsxs("div", { className: "si-actions__buttons", children: [isDraft && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--success", onClick: handleActivate, children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z", clipRule: "evenodd" }) }), "Activate"] })), isActive && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--warning", onClick: () => setConfirmAction("pause"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z", clipRule: "evenodd" }) }), "Pause"] })), isPaused && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--success", onClick: () => setConfirmAction("resume"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z", clipRule: "evenodd" }) }), "Resume"] })), isExpiring && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--primary", onClick: () => setConfirmAction("renew"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z", clipRule: "evenodd" }) }), "Renew"] })), !isCancelled && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--danger-ghost", onClick: () => setConfirmAction("cancel"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z", clipRule: "evenodd" }) }), "Cancel"] }))] })) }), _jsx(ConfirmModal, { isOpen: confirmAction === "pause", title: "Pause Subscription", message: "Are you sure you want to pause this subscription? Services will be temporarily suspended.", confirmLabel: "Pause Subscription", confirmVariant: "warning", onConfirm: handleConfirm, onCancel: () => {
+    return (_jsxs(_Fragment, { children: [_jsx("div", { className: "si-actions", children: mode === "operator" && (_jsxs("div", { className: "si-actions__buttons", children: [isPending && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--success", onClick: handleActivate, children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z", clipRule: "evenodd" }) }), "Activate"] })), isActive && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--warning", onClick: () => setConfirmAction("pause"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z", clipRule: "evenodd" }) }), "Pause"] })), isPaused && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--success", onClick: () => setConfirmAction("resume"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z", clipRule: "evenodd" }) }), "Resume"] })), isExpiring && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--primary", onClick: () => setConfirmAction("renew"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z", clipRule: "evenodd" }) }), "Renew"] })), !isCancelled && (_jsxs("button", { type: "button", className: "si-btn si-btn--sm si-btn--danger-ghost", onClick: () => setConfirmAction("cancel"), children: [_jsx("svg", { className: "si-btn__icon", viewBox: "0 0 20 20", fill: "currentColor", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z", clipRule: "evenodd" }) }), "Cancel"] }))] })) }), _jsx(ConfirmModal, { isOpen: confirmAction === "pause", title: "Pause Subscription", message: "Are you sure you want to pause this subscription? Services will be temporarily suspended.", confirmLabel: "Pause Subscription", confirmVariant: "warning", onConfirm: handleConfirm, onCancel: () => {
                     setConfirmAction(null);
                     setReason("");
                 } }), _jsx(ConfirmModal, { isOpen: confirmAction === "resume", title: "Resume Subscription", message: "Are you sure you want to resume this subscription? Services will be reactivated.", confirmLabel: "Resume Subscription", confirmVariant: "primary", onConfirm: handleConfirm, onCancel: () => {

package/dist/editors/subscription-instance-editor/components/SubscriptionHeader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionHeader.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/SubscriptionHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,uEAAuE,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAiD5C,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,4BAA4B,CAAC;IACvC,QAAQ,EAAE,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;IACvD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,IAAI,GACL,EAAE,uBAAuB,2CAwIzB"}
+{"version":3,"file":"SubscriptionHeader.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/SubscriptionHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,uEAAuE,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAiD5C,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,4BAA4B,CAAC;IACvC,QAAQ,EAAE,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;IACvD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,IAAI,GACL,EAAE,uBAAuB,2CAkJzB"}

package/dist/editors/subscription-instance-editor/components/SubscriptionHeader.js

@@ -40,7 +40,7 @@ export function SubscriptionHeader({ document, dispatch, mode, }) {
             year: "numeric",
         });
     };
-    return (_jsxs("div", { className: "si-header", children: [_jsxs("div", { className: "si-header__main", children: [_jsxs("div", { className: "si-header__title-row", children: [_jsx("div", { className: "si-header__info", children: _jsx("div", { children: _jsx("h1", { className: "si-header__title", children: state.tierName || "Subscription" }) }) }), _jsx(StatusBadge, { status: state.status })] }), _jsxs("div", { className: "si-header__meta", children: [mode === "operator" && state.customerName && (_jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Customer" }), _jsx("span", { className: "si-header__meta-value", children: state.customerName })] })), state.createdAt && (_jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Created" }), _jsx("span", { className: "si-header__meta-value", children: formatDate(state.createdAt) })] })), state.activatedSince && (_jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Active Since" }), _jsx("span", { className: "si-header__meta-value", children: formatDate(state.activatedSince) })] })), _jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Auto-Renew" }), _jsx("span", { className: "si-header__meta-value", style: {
+    return (_jsxs("div", { className: "si-header", children: [_jsxs("div", { className: "si-header__main", children: [_jsxs("div", { className: "si-header__title-row", children: [_jsxs("div", { className: "si-header__info", children: [state.resource?.thumbnailUrl && (_jsx("img", { src: state.resource.thumbnailUrl, alt: "", className: "si-header__thumbnail" })), _jsxs("div", { children: [_jsx("h1", { className: "si-header__title", children: state.resource?.label || state.tierName || "Subscription" }), state.tierName && state.resource?.label && (_jsxs("p", { className: "si-header__subtitle", children: [state.tierName, " Tier"] }))] })] }), _jsx(StatusBadge, { status: state.status })] }), _jsxs("div", { className: "si-header__meta", children: [mode === "operator" && state.customerName && (_jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Customer" }), _jsx("span", { className: "si-header__meta-value", children: state.customerName })] })), state.createdAt && (_jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Created" }), _jsx("span", { className: "si-header__meta-value", children: formatDate(state.createdAt) })] })), state.activatedSince && (_jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Active Since" }), _jsx("span", { className: "si-header__meta-value", children: formatDate(state.activatedSince) })] })), _jsxs("div", { className: "si-header__meta-item", children: [_jsx("span", { className: "si-header__meta-label", children: "Auto-Renew" }), _jsx("span", { className: "si-header__meta-value", style: {
                                             color: state.autoRenew
                                                 ? "var(--si-emerald-600)"
                                                 : "var(--si-slate-400)",

package/dist/editors/subscription-instance-editor/components/billing-utils.d.ts

@@ -1,12 +1,9 @@
-import type { SubscriptionInstanceState, ServiceMetric } from "../../../document-models/subscription-instance/v1/gen/schema/types.js";
+import type { SubscriptionInstanceState, ServiceMetric, DiscountInfo } from "../../../document-models/subscription-instance/v1/gen/schema/types.js";
 export declare function formatCurrency(amount: number, currency: string): string;
 export declare function formatDate(date: string | null | undefined): string;
 export declare function formatBillingCycleSuffix(cycle: string | null | undefined): string;
 export declare const BILLING_CYCLE_LABELS: Record<string, string>;
-export declare function formatDiscountBadge(discount: {
-    discountType: string;
-    discountValue: number;
-}): string;
+export declare function formatDiscountBadge(discount: DiscountInfo): string;
 export declare function getDiscountSourceLabel(source: string): string;
 export interface MetricOverage {
     metricId: string;
@@ -20,13 +17,17 @@ export interface MetricOverage {
     unitCostCurrency: string;
     projectedCost: number;
 }
-export declare function computeMetricOverage(metric: ServiceMetric, currency?: string): MetricOverage | null;
+export declare function computeMetricOverage(metric: ServiceMetric): MetricOverage | null;
 export interface GroupBillingBreakdown {
     groupId: string;
     groupName: string;
     optional: boolean;
+    /** Group-level recurring cost (fixed cost) */
     recurringAmount: number | null;
     recurringCurrency: string;
+    recurringCycle: string | null;
+    discount: DiscountInfo | null;
+    /** Dynamic costs from service metrics */
     metricOverages: MetricOverage[];
     dynamicTotal: number;
 }
@@ -39,12 +40,19 @@ export interface SetupCostLine {
 }
 export interface BillingBreakdown {
     currency: string;
+    /** Sum of group recurring costs */
     fixedTotal: number;
+    /** Sum of metric overage projections */
     dynamicTotal: number;
+    /** fixedTotal + dynamicTotal */
     projectedTotal: number;
+    /** Standalone service recurring costs (not in groups) */
     standaloneFixedTotal: number;
+    /** Breakdown per service group */
     groupBreakdowns: GroupBillingBreakdown[];
+    /** Standalone services with metrics */
     standaloneOverages: MetricOverage[];
+    /** All setup costs */
     setupLines: SetupCostLine[];
     setupTotal: number;
     billingCycle: string | null;

package/dist/editors/subscription-instance-editor/components/billing-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"billing-utils.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/billing-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,aAAa,EACd,MAAM,uEAAuE,CAAC;AAI/E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKvE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAOlE;AAUD,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC/B,MAAM,CAGR;AAED,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAMvD,CAAC;AAIF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,MAAM,CAKT;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAW7D;AAID,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,MAAc,GACvB,aAAa,GAAG,IAAI,CAuBtB;AAID,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,kBAAkB,EAAE,aAAa,EAAE,CAAC;IACpC,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,yBAAyB,GAC/B,gBAAgB,CA8GlB"}
+{"version":3,"file":"billing-utils.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/billing-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,aAAa,EACb,YAAY,EACb,MAAM,uEAAuE,CAAC;AAI/E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKvE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAOlE;AAUD,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC/B,MAAM,CAGR;AAED,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAMvD,CAAC;AAIF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,CAKlE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAW7D;AAID,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,GACpB,aAAa,GAAG,IAAI,CAuBtB;AAID,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,8CAA8C;IAC9C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAC9B,yCAAyC;IACzC,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,YAAY,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,yDAAyD;IACzD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kCAAkC;IAClC,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,uCAAuC;IACvC,kBAAkB,EAAE,aAAa,EAAE,CAAC;IACpC,sBAAsB;IACtB,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,yBAAyB,GAC/B,gBAAgB,CAuGlB"}

package/dist/editors/subscription-instance-editor/components/billing-utils.js

@@ -52,48 +52,41 @@ export function getDiscountSourceLabel(source) {
             return "Discount";
     }
 }
-export function computeMetricOverage(metric, currency = "USD") {
+export function computeMetricOverage(metric) {
     const freeLimit = metric.freeLimit ?? metric.limit ?? 0;
     const paidLimit = metric.paidLimit ?? null;
     if (freeLimit <= 0 && paidLimit == null)
         return null;
     if (metric.currentUsage <= freeLimit)
         return null;
-    if (metric.unitCost == null)
+    if (!metric.unitCost)
         return null;
     const excess = metric.currentUsage - freeLimit;
-    const projectedCost = excess * metric.unitCost;
+    const projectedCost = excess * metric.unitCost.amount;
     return {
         metricId: metric.id,
         metricName: metric.name,
-        unitName: metric.unitName ?? "units",
+        unitName: metric.unitName,
         currentUsage: metric.currentUsage,
         freeLimit,
         paidLimit,
         excess,
-        unitCostAmount: metric.unitCost,
-        unitCostCurrency: currency,
+        unitCostAmount: metric.unitCost.amount,
+        unitCostCurrency: metric.unitCost.currency,
         projectedCost,
     };
 }
 export function computeBillingBreakdown(state) {
     const currency = state.globalCurrency || state.tierCurrency || "USD";
     const billingCycle = state.selectedBillingCycle || null;
+    // Group breakdowns
     const groupBreakdowns = [];
     const setupLines = [];
-    const allGroupedServiceIds = new Set();
-    for (const group of state.serviceGroups) {
-        for (const svcId of group.services) {
-            allGroupedServiceIds.add(svcId);
-        }
-    }
     for (const group of state.serviceGroups) {
         const metricOverages = [];
-        const groupServiceIds = new Set(group.services);
-        const groupServices = state.services.filter((svc) => groupServiceIds.has(svc.id));
-        for (const svc of groupServices) {
+        for (const svc of group.services) {
             for (const metric of svc.metrics) {
-                const overage = computeMetricOverage(metric, currency);
+                const overage = computeMetricOverage(metric);
                 if (overage)
                     metricOverages.push(overage);
             }
@@ -105,40 +98,43 @@ export function computeBillingBreakdown(state) {
             optional: group.optional,
             recurringAmount: group.recurringCost?.amount ?? null,
             recurringCurrency: group.recurringCost?.currency ?? currency,
+            recurringCycle: group.recurringCost?.billingCycle ?? billingCycle,
+            discount: group.recurringCost?.discount ?? null,
             metricOverages,
             dynamicTotal,
         });
+        // Collect setup costs from group level
         if (group.setupCost) {
             setupLines.push({
                 name: group.name,
                 amount: group.setupCost.amount,
                 currency: group.setupCost.currency,
-                paid: !!group.setupCost.paidAt,
+                paid: !!group.setupCost.paymentDate,
                 source: "group",
             });
         }
-        for (const svc of groupServices) {
+        // Collect setup costs from services in group
+        for (const svc of group.services) {
             if (svc.setupCost) {
                 setupLines.push({
                     name: `${svc.name || "Service"} (${group.name})`,
                     amount: svc.setupCost.amount,
                     currency: svc.setupCost.currency,
-                    paid: !!svc.setupCost.paidAt,
+                    paid: !!svc.setupCost.paymentDate,
                     source: "service",
                 });
             }
         }
     }
+    // Standalone services (not in groups)
     const standaloneOverages = [];
     let standaloneFixedTotal = 0;
     for (const svc of state.services) {
-        if (allGroupedServiceIds.has(svc.id))
-            continue;
         if (svc.recurringCost) {
             standaloneFixedTotal += svc.recurringCost.amount;
         }
         for (const metric of svc.metrics) {
-            const overage = computeMetricOverage(metric, currency);
+            const overage = computeMetricOverage(metric);
             if (overage)
                 standaloneOverages.push(overage);
         }
@@ -147,7 +143,7 @@ export function computeBillingBreakdown(state) {
                 name: svc.name || "Service",
                 amount: svc.setupCost.amount,
                 currency: svc.setupCost.currency,
-                paid: !!svc.setupCost.paidAt,
+                paid: !!svc.setupCost.paymentDate,
                 source: "service",
             });
         }