From 7e888ea926df8d3b07dbb043fe164d65d44fc364 Mon Sep 17 00:00:00 2001 From: codex Date: Sun, 1 Nov 2026 17:56:51 +0800 Subject: [PATCH] feat(billing): show immutable invoice line items --- web/app/Controllers/CloudPageController.php | 15 +++++ web/public/cloud/client.css | 7 ++ web/public/cloud/invoice-detail-runtime.js | 22 +++++++ .../venix/cloud/pages/invoice-detail.tpl | 12 ++++ web/tests/CloudInvoiceDetailContractTest.php | 20 ++++++ web/tests/CloudInvoicePresentationTest.php | 66 +++++++++++++++++++ 6 files changed, 142 insertions(+) create mode 100644 web/tests/CloudInvoicePresentationTest.php diff --git a/web/app/Controllers/CloudPageController.php b/web/app/Controllers/CloudPageController.php index f644ffb4..bd43e9ad 100644 --- a/web/app/Controllers/CloudPageController.php +++ b/web/app/Controllers/CloudPageController.php @@ -586,6 +586,19 @@ final class CloudPageController )]; } + $lineItems = []; + foreach (is_array($invoice['items'] ?? null) ? $invoice['items'] : [] + as $item) { + if (!is_array($item) || !is_numeric($item['amount'] ?? null)) { + continue; + } + $label = trim((string) ($item['label'] ?? '')); + $lineItems[] = [ + 'label' => $label !== '' ? $label : '费用项目', + 'amount_display' => $this->formatUsd($item['amount']), + ]; + } + $specification = []; if (in_array($purpose, ['provision', 'renewal', 'upgrade'], true)) { $subject = $this->firstText($invoice['requested_name'] ?? null, @@ -688,6 +701,8 @@ final class CloudPageController 'status_label' => $statusLabel, 'status_class' => $statusClass, 'facts' => $facts, + 'show_line_items' => $lineItems !== [], + 'line_items' => $lineItems, 'show_specification' => $specification !== [], 'specification' => $specification, 'show_payment' => $payable && $paymentMethods !== [], diff --git a/web/public/cloud/client.css b/web/public/cloud/client.css index 41b50c83..c21e531a 100644 --- a/web/public/cloud/client.css +++ b/web/public/cloud/client.css @@ -304,6 +304,11 @@ body.vu-embedded .dashboard > .main-area > .vu-main > .vu-topbar { margin: 0; } .invoice-detail-section-heading { display: flex; align-items: center; justify-content: space-between; gap: 20px; padding: 22px 28px 18px; border-bottom: 1px solid #edf1f5; } .invoice-detail-section-heading h2 { margin: 0; color: #22384e; font-size: 17px; } .invoice-detail-section-heading p { margin: 6px 0 0; color: #8b9baa; font-size: 11px; line-height: 1.55; } +.invoice-line-items { display: grid; margin: 0; padding: 8px 28px 18px; } +.invoice-line-item { display: grid; grid-template-columns: minmax(0,1fr) auto; align-items: center; gap: 18px; min-width: 0; padding: 15px 0; border-bottom: 1px solid #edf1f5; } +.invoice-line-item:last-child { border-bottom: 0; } +.invoice-line-item span { min-width: 0; color: #62778a; font-size: 12px; line-height: 1.55; overflow-wrap: anywhere; } +.invoice-line-item strong { color: #20374e; font-size: 14px; white-space: nowrap; } .invoice-payment-method-grid { display: grid; grid-template-columns: repeat(auto-fit,minmax(210px,1fr)); gap: 13px; padding: 24px 28px 8px; } .invoice-payment-method-card { position: relative; display: grid; gap: 7px; min-height: 104px; padding: 18px 46px 18px 18px; border: 1px solid #dce6ec; border-radius: 11px; background: #fff; color: #2c4358; text-align: left; cursor: pointer; transition: border-color .15s,box-shadow .15s,background .15s; } .invoice-payment-method-card:hover { border-color: #9dd4d7; } @@ -422,6 +427,8 @@ body.vu-embedded .dashboard > .main-area > .vu-main > .vu-topbar { margin: 0; } .invoice-detail-total > strong { font-size: 22px; } .invoice-detail-facts,.invoice-specification-grid { grid-template-columns: 1fr 1fr; padding: 5px 18px 15px; } .invoice-detail-section-heading { padding: 19px 18px 16px; } + .invoice-line-items { padding: 4px 18px 14px; } + .invoice-line-item { gap: 12px; padding: 14px 0; } .invoice-payment-method-grid { grid-template-columns: 1fr; padding: 19px 18px 6px; } #invoice-payment-error { margin-inline: 18px; } .invoice-payment-actions { padding: 16px 18px 20px; } diff --git a/web/public/cloud/invoice-detail-runtime.js b/web/public/cloud/invoice-detail-runtime.js index ddf87dec..f7d9ac5f 100644 --- a/web/public/cloud/invoice-detail-runtime.js +++ b/web/public/cloud/invoice-detail-runtime.js @@ -437,6 +437,27 @@ function invoiceSpecification(invoice) { }; } +function renderInvoiceLineItems(invoice) { + const panel = byId('invoice-line-items-panel'); + const container = byId('invoice-line-items'); + if (!panel || !container) return; + const items = Array.isArray(invoice?.items) ? invoice.items : []; + const rows = items.flatMap(item => { + if (!item || typeof item !== 'object' || Array.isArray(item)) return []; + const amount = Number(item.amount); + if (!Number.isFinite(amount) || amount < 0) return []; + const row = makeElement('div', 'invoice-line-item'); + row.setAttribute('role', 'listitem'); + row.append( + makeElement('span', '', firstText(item.label, '费用项目')), + makeElement('strong', '', formatUsd(item.amount)), + ); + return [row]; + }); + container.replaceChildren(...rows); + panel.hidden = rows.length === 0; +} + function renderInvoiceSpecification(invoice) { const panel = byId('invoice-specification-panel'); const container = byId('invoice-specification'); @@ -1402,6 +1423,7 @@ function renderInvoiceDetail(invoice, payload) { if (invoice.paid_via) facts.push(invoiceFact('支付方式', paymentLabel(invoice.paid_via))); byId('invoice-detail-facts')?.replaceChildren(...facts); + renderInvoiceLineItems(invoice); renderInvoiceSpecification(invoice); renderInvoicePaymentMethods(invoice, payload.balance, Array.isArray(payload.payment_methods) ? payload.payment_methods : []); diff --git a/web/resources/views/venix/cloud/pages/invoice-detail.tpl b/web/resources/views/venix/cloud/pages/invoice-detail.tpl index 006e5b3d..fb661cf3 100644 --- a/web/resources/views/venix/cloud/pages/invoice-detail.tpl +++ b/web/resources/views/venix/cloud/pages/invoice-detail.tpl @@ -33,6 +33,18 @@ +
+

费用明细

以下项目来自账单生成时冻结的费用快照。

+
+ {foreach $cloud_invoice_detail_view.line_items as $item} +
+ {$item.label|escape:"html"} + {$item.amount_display|escape:"html"} +
+ {/foreach} +
+
+

套餐与服务

该账单对应的实例规格、服务周期与流量额度。

diff --git a/web/tests/CloudInvoiceDetailContractTest.php b/web/tests/CloudInvoiceDetailContractTest.php index 76e2bd9e..e31e9391 100644 --- a/web/tests/CloudInvoiceDetailContractTest.php +++ b/web/tests/CloudInvoiceDetailContractTest.php @@ -95,6 +95,26 @@ $assert(str_contains($invoiceDetailTemplate, 'id="invoice-detail-bootstrap"') && !str_contains($invoiceDetailTemplate, '正在读取账单信息') && !str_contains($invoiceDetailTemplate, '>读取中<'), 'Invoice-detail HTML must contain meaningful first-paint content, not a client-only shell.'); +$assert(str_contains($invoiceDetailTemplate, 'id="invoice-line-items-panel"') + && str_contains($invoiceDetailTemplate, 'id="invoice-line-items"') + && str_contains($invoiceDetailTemplate, + '{foreach $cloud_invoice_detail_view.line_items as $item}') + && str_contains($invoiceDetailTemplate, + '{$item.label|escape:"html"}') + && str_contains($invoiceDetailTemplate, + '{$item.amount_display|escape:"html"}') + && !str_contains($invoiceDetailTemplate, 'snapshot_json'), + 'Invoice-detail SSR must safely render frozen line items without internal snapshots.'); +$lineItemRuntime = $section($invoiceDetailRuntime, + 'function renderInvoiceLineItems(', 'function renderInvoiceSpecification('); +$assert(str_contains($lineItemRuntime, "byId('invoice-line-items-panel')") + && str_contains($lineItemRuntime, "byId('invoice-line-items')") + && str_contains($lineItemRuntime, 'makeElement(') + && str_contains($lineItemRuntime, 'replaceChildren(') + && !str_contains($lineItemRuntime, 'innerHTML') + && !str_contains($lineItemRuntime, 'snapshot_json') + && str_contains($invoiceDetailRuntime, 'renderInvoiceLineItems(invoice);'), + 'Invoice-detail refresh must replace safe text-only line items.'); $assert(str_contains($pageController, "\$invoice['renews_expires_at'] ?? \$invoice['due_at'] ?? null") && str_contains($invoiceDetailRuntime, diff --git a/web/tests/CloudInvoicePresentationTest.php b/web/tests/CloudInvoicePresentationTest.php new file mode 100644 index 00000000..c41eea2c --- /dev/null +++ b/web/tests/CloudInvoicePresentationTest.php @@ -0,0 +1,66 @@ +invokeArgs($target, $arguments); +}; + +$payload = [ + 'invoice' => [ + 'id' => '17', + 'purpose' => 'renewal', + 'title' => '实例续费', + 'created_at' => 2_000_000_000, + 'amount' => '12.51', + 'status' => 'open', + 'renews_expires_at' => 2_000_100_000, + 'payment_deadline_at' => 2_000_359_200, + 'payable' => true, + 'validity_days' => 30, + 'traffic_quota_bytes' => 0, + 'items' => [ + [ + 'id' => '31', + 'code' => 'instance', + 'label' => '实例套餐续费', + 'amount' => '10.00', + 'currency' => 'USD', + ], + [ + 'id' => '32', + 'code' => 'automatic_backup', + 'label' => '自动备份', + 'amount' => '2.50', + 'currency' => 'USD', + ], + ], + ], + 'balance_payment_allowed' => false, + 'payment_methods' => [], +]; + +$controller = new CloudPageController(); +$view = $invoke($controller, 'invoiceDetailView', [$payload]); + +$assert(($view['show_line_items'] ?? false) === true, + 'Invoice first paint does not expose its frozen line items.'); +$assert(($view['line_items'] ?? null) === [ + ['label' => '实例套餐续费', 'amount_display' => '$10.00'], + [ + 'label' => '自动备份', + 'amount_display' => '$2.50', + ], +], 'Invoice line-item projection changed labels or frozen amounts.'); +$assert(($view['amount_display'] ?? null) === '$12.51', + 'Invoice presentation recomputed the authoritative total from line items.'); + +echo "Cloud invoice SSR presentation checks passed.\n";