fix: streamline instance checkout flow

dev
admin 1 month ago
parent 7b70b8f285
commit 9bb5d30b0a

@ -929,8 +929,7 @@ async function payInvoiceBalance(invoice, container) {
: '账单已失效,不能支付。', 'error');
return;
}
if (state.mutationBusy
|| !confirm(`确认使用账户余额支付账单 #${invoice.id},金额 ${formatUsd(invoice.amount)}?`)) return;
if (state.mutationBusy) return;
state.mutationBusy = true;
container.querySelectorAll('button').forEach(button => { button.disabled = true; });
try {
@ -979,8 +978,7 @@ async function createInvoicePayment(invoice, method, container, paymentResult) {
: '账单已失效,不能再生成支付订单。', 'error');
return;
}
if (state.mutationBusy
|| !confirm(`确认通过“${method.name}”支付账单 #${invoice.id},金额 ${formatUsd(invoice.amount)}?`)) return;
if (state.mutationBusy) return;
state.mutationBusy = true;
container.querySelectorAll('button').forEach(button => { button.disabled = true; });
const idempotencyKey = pendingInvoicePaymentKey(invoice.id, method.id);

@ -558,16 +558,6 @@ function formatTrafficTiB(trafficTiB) {
if (amount === 0) return '不限';
return `${amount.toFixed(10).replace(/\.?0+$/, '')} TB`;
}
function offerValidityDays(offer) { return firstNumber(offer?.validity_days, offer?.service_days, offer?.period_days); }
function offerTrafficBytes(offer) {
const gib = firstNumber(offer?.traffic_gib);
return firstNumber(offer?.traffic_quota_bytes, gib === null ? null : gib * 1024 ** 3);
}
function offerBillingLabel(offer) {
const days = offerValidityDays(offer);
const traffic = offerTrafficBytes(offer);
return `${days === null ? '账期未提供' : `${Math.floor(days)} 天/期`} · ${traffic === null ? '每期流量未提供' : `每期流量 ${formatTrafficQuota(traffic)}`}`;
}
function resetInstallChoices() {
state.resourceController?.abort();
state.resourceController = null;
@ -821,8 +811,6 @@ async function buy(event) {
const selectedOffer = saleOffers().find(offer => String(offer.id) === byId('vm-offer').value);
if (!selectedOffer) return showError('create-error', '地区、线路与实例规格不匹配,请重新选择。');
if (!isOfferSellable(selectedOffer)) return showError('create-error', '该实例规格暂时售罄,请选择其他规格。');
const purchaseSummary = `${formatUsd(selectedOffer.price)},${offerBillingLabel(selectedOffer)}`;
if (!confirm(`确认创建此实例?将先生成 ${purchaseSummary} 的开通账单,支付完成后才会开始创建。`)) return;
state.mutationBusy = true;
const formBody = byId('create-form')?.querySelector('.workspace-form-body');
if (formBody) { formBody.inert = true; formBody.setAttribute('aria-busy', 'true'); }
@ -839,7 +827,6 @@ async function buy(event) {
const invoiceId = result?.invoice?.id;
if (!invoiceId) throw new Error('开通账单已生成,但账单编号缺失,请刷新账单页面查看。');
clearPendingProvisionInvoiceKey(); byId('vm-root-password').value = '';
toast(recovered ? '已找回实例开通账单,请选择支付方式。' : '实例开通账单已生成,请选择支付方式。', 'success');
navigate(`${CLOUD_PATHS.invoices}/${encodeURIComponent(String(invoiceId))}`);
}
catch (error) {
@ -852,7 +839,8 @@ async function buy(event) {
clearPendingProvisionInvoiceKey(); byId('vm-root-password').value = '';
const invoiceId = recovered?.invoice?.id;
if (!invoiceId) throw new Error('已找到开通账单,但账单编号缺失,请刷新账单页面查看。');
toast('已核对到开通账单,请选择支付方式。', 'success'); navigate(`${CLOUD_PATHS.invoices}/${encodeURIComponent(String(invoiceId))}`); return;
navigate(`${CLOUD_PATHS.invoices}/${encodeURIComponent(String(invoiceId))}`);
return;
}
} catch {}
showError('create-error', `${error.message} 可再次点击提交安全核对同一张账单。`);

@ -46,7 +46,7 @@
</article>
<article id="invoice-payment-panel" class="inventory-panel invoice-detail-section"{if !$cloud_invoice_detail_view.show_payment|default:false} hidden{/if}>
<div class="invoice-detail-section-heading"><div><h2>选择支付方式</h2><p>选择一种支付方式后,再确认支付本账单。</p></div></div>
<div class="invoice-detail-section-heading"><div><h2>选择支付方式</h2><p>选择支付方式后,点击“立即支付”将直接发起支付,请勿重复点击。</p></div></div>
<div id="invoice-payment-methods" class="invoice-payment-method-grid" role="radiogroup" aria-label="账单支付方式">
{foreach $cloud_invoice_detail_view.payment_methods as $method}
<button class="invoice-payment-method-card" type="button" data-method-id="{$method.id|escape:"html"}" role="radio" aria-pressed="{if $method.selected}true{else}false{/if}" aria-checked="{if $method.selected}true{else}false{/if}">
@ -57,7 +57,7 @@
{/foreach}
</div>
<p id="invoice-payment-error" class="form-error" role="alert" hidden></p>
<div class="invoice-payment-actions"><button id="invoice-payment-submit" class="button button-primary" type="button" disabled>确认支付</button></div>
<div class="invoice-payment-actions"><button id="invoice-payment-submit" class="button button-primary" type="button" disabled>立即支付</button></div>
<div id="invoice-payment-result" class="invoice-payment-result" aria-live="polite"></div>
</article>

@ -1,2 +1,2 @@
{* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *}
{assign var=venix_asset_version value='2026100402' scope='global'}
{assign var=venix_asset_version value='2026100403' scope='global'}

@ -204,6 +204,16 @@ $assert($selectRegion !== '' && $selectLine !== '' && $selectOffer !== ''
&& str_contains($buy, 'provisionInvoiceFingerprint(body)')
&& str_contains($buy, 'pendingProvisionInvoiceKey(fingerprint)'),
'Changing a region, line or offer must preserve the global image and purchasing must keep offer-scoped idempotency.');
$assert(!str_contains($buy, 'confirm(')
&& !str_contains($buy, 'toast(')
&& !str_contains($buy, 'purchaseSummary')
&& !str_contains($runtime, 'function offerBillingLabel(')
&& str_contains($buy, 'if (state.mutationBusy) return;')
&& str_contains($buy, "byId('create-submit').disabled = true")
&& str_contains($buy, 'existingProvisionInvoice(invoiceIdempotency)')
&& substr_count($buy,
'navigate(`${CLOUD_PATHS.invoices}/${encodeURIComponent(String(invoiceId))}`)') === 2,
'Instance creation must skip confirmation and success cards while retaining guarded invoice reconciliation and direct navigation.');
$assert(str_contains($runtime,
'function isOfferSellable(offer) { return offer?.sellable === true; }')
&& str_contains($renderOfferPicker,

@ -270,6 +270,12 @@ $assert(str_contains($schedulePoll, 'state.refreshPromise')
'A full detail refresh must pause sparse status polling and resume it afterwards.');
$balancePayment = $section($invoiceDetailRuntime, 'async function payInvoiceBalance(',
'async function createInvoicePayment(');
$balanceBusyGuard = strpos($balancePayment, 'if (state.mutationBusy) return;');
$balanceBusySet = strpos($balancePayment, 'state.mutationBusy = true;');
$balanceButtonsDisabled = strpos($balancePayment,
"container.querySelectorAll('button').forEach(button => { button.disabled = true; });");
$balanceRequest = strpos($balancePayment,
'api(`/api/v1/invoices/${encodeURIComponent(invoice.id)}/pay-balance`');
$assert(str_contains($balancePayment,
'state.appliedReadSequence = ++state.readSequence;')
&& strpos($balancePayment,
@ -287,14 +293,44 @@ $assert(str_contains($balancePayment,
'if ([403, 409].includes(Number(error.status || 0)))')
&& str_contains($balancePayment, 'await refreshInvoiceDetail(invoice.id);'),
'A deterministic balance-payment rejection must refresh server payable state.');
$assert(!str_contains($balancePayment, 'confirm(')
&& $balanceBusyGuard !== false
&& $balanceBusySet !== false
&& $balanceButtonsDisabled !== false
&& $balanceRequest !== false
&& $balanceBusyGuard < $balanceBusySet
&& $balanceBusySet < $balanceButtonsDisabled
&& $balanceButtonsDisabled < $balanceRequest
&& str_contains($balancePayment, 'state.mutationBusy = false;'),
'Balance payment must execute immediately while retaining duplicate-submit protection and recovery.');
$providerPayment = $section($invoiceDetailRuntime,
'async function createInvoicePayment(', 'function renderInvoicePaymentMethods(');
$providerBusyGuard = strpos($providerPayment, 'if (state.mutationBusy) return;');
$providerBusySet = strpos($providerPayment, 'state.mutationBusy = true;');
$providerButtonsDisabled = strpos($providerPayment,
"container.querySelectorAll('button').forEach(button => { button.disabled = true; });");
$providerIdempotency = strpos($providerPayment,
'pendingInvoicePaymentKey(invoice.id, method.id)');
$providerRequest = strpos($providerPayment,
'api(`/api/v1/invoices/${encodeURIComponent(invoice.id)}/payments`');
$assert(str_contains($providerPayment,
"const creationStillInProgress = String(error.message).includes('正在创建');")
&& str_contains($providerPayment,
'if ([403, 409].includes(status) && !creationStillInProgress)')
&& str_contains($providerPayment, 'await refreshInvoiceDetail(invoice.id);'),
'A deterministic provider-payment rejection must refresh server payable state.');
$assert(!str_contains($providerPayment, 'confirm(')
&& $providerBusyGuard !== false
&& $providerBusySet !== false
&& $providerButtonsDisabled !== false
&& $providerIdempotency !== false
&& $providerRequest !== false
&& $providerBusyGuard < $providerBusySet
&& $providerBusySet < $providerButtonsDisabled
&& $providerButtonsDisabled < $providerIdempotency
&& $providerIdempotency < $providerRequest
&& str_contains($providerPayment, 'state.mutationBusy = false;'),
'Provider payment must execute immediately while retaining idempotency and duplicate-submit protection.');
$paymentChoices = $section($invoiceDetailRuntime,
'function renderInvoicePaymentMethods(', 'function invoiceProgressText(');
$assert(str_contains($invoiceDetailRuntime, 'balancePaymentAllowed: false')
@ -329,11 +365,16 @@ $assert(!str_contains($cloudShell, '/theme/venix/js/qrcode.min.js')
'The QR library must be loaded only after an online payment order is created.');
$cleanup = $section($invoiceDetailRuntime, 'function bindInvoiceDetailCleanup(',
'export {');
$assert(str_contains($cleanup, 'clearTimeout(toastTimer);')
&& str_contains($cleanup, 'toastTimer = null;')
$assert(!str_contains($cleanup, 'toastTimer')
&& str_contains($cleanup, "const element = byId('toast');")
&& str_contains($cleanup, 'if (element) element.hidden = true;'),
'BFCache cleanup must not restore a visible toast after cancelling its timer.');
'BFCache cleanup must hide the shared toast region without retaining obsolete local timer state.');
$assert(str_contains($invoiceDetailTemplate,
'选择支付方式后,点击“立即支付”将直接发起支付,请勿重复点击。')
&& str_contains($invoiceDetailTemplate, '>立即支付</button>')
&& !str_contains($invoiceDetailTemplate, '再确认支付本账单')
&& !str_contains($invoiceDetailTemplate, '>确认支付</button>'),
'Invoice payment copy must describe immediate execution without stale confirmation text.');
$createPayment = $section($invoiceDetailRuntime, 'async function createInvoicePayment(',
'function renderInvoicePaymentMethods(');
$paymentRequest = strpos($createPayment,
@ -383,7 +424,8 @@ foreach (['created_at', 'amount', 'status', 'plan_name', 'cpu_cores', 'memory_mi
}
$assert(str_contains($jobService, "'updated_at' =>")
&& str_contains($jobService, "'attempts' =>")
&& str_contains($jobService, 'CloudInput::safeResult($result)'),
&& str_contains($jobService, '$safeResult = self::displayResult(')
&& str_contains($jobService, 'return CloudOperationErrorCatalog::result('),
'Provisioning progress lacks safe timestamps or attempt metadata.');
$assert(str_contains($invoiceEmail, '#{$invoice_id|escape:"html"}')
&& str_contains($invoiceEmail, '&#36;{$amount|escape:"html"}')

@ -803,7 +803,7 @@ $assert(!str_contains($sharedSidebar, 'data-view="orders"')
&& !str_contains($clientScript, 'function loadOrders()')
&& !str_contains($clientScript, "target === 'orders' || target === 'invoices'"),
'The retired user provisioning-order page and hash redirect must be absent');
$assert(str_contains($cloudTemplate, '>生成开通账单</button>')
$assert(str_contains($cloudTemplate, '>创建实例</button>')
&& str_contains($clientScript, "api('/api/v1/invoices', { method: 'POST', body })")
&& str_contains($clientScript, '/api/v1/invoices/by-request/')
&& str_contains($invoiceDetailRuntime, "invoice?.purpose")

Loading…
Cancel
Save