mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-10-07 15:38:22 +08:00
fix(admin-ui): wire require_force into the refund dialog
AdminRefundDialog already implements a `requireForce` prop that renders the force checkbox and blocks submit until it is checked, but AdminOrdersView never consumed `require_force` from the refund response nor bound the prop, so the checkbox could never render. Admins hitting a require-force case (for example a user who spent their balance after requesting the refund) only saw an error toast and had no way to complete the refund from the UI. Keep the dialog open when the backend answers `require_force`, surface the checkbox and the backend warning, and reset the flag whenever the dialog is opened or closed. Verified with `npm run typecheck` (vue-tsc --noEmit, clean).
This commit is contained in:
@@ -111,7 +111,7 @@
|
||||
</div>
|
||||
</BaseDialog>
|
||||
|
||||
<AdminRefundDialog :show="showRefundDialog" :order="selectedOrder" :submitting="refundSubmitting" @confirm="handleRefund" @cancel="showRefundDialog = false" />
|
||||
<AdminRefundDialog :show="showRefundDialog" :order="selectedOrder" :submitting="refundSubmitting" :require-force="refundRequireForce" :warning="refundWarning" @confirm="handleRefund" @cancel="closeRefundDialog" />
|
||||
</AppLayout>
|
||||
</template>
|
||||
|
||||
@@ -153,6 +153,8 @@ const selectedOrder = ref<PaymentOrder | null>(null)
|
||||
const showDetailDialog = ref(false)
|
||||
const showRefundDialog = ref(false)
|
||||
const refundSubmitting = ref(false)
|
||||
const refundRequireForce = ref(false)
|
||||
const refundWarning = ref('')
|
||||
const refundQueryingIds = ref(new Set<number>())
|
||||
const orderAuditLogs = ref<AuditLog[]>([])
|
||||
const creditedAmountSymbol = currencySymbol('USD')
|
||||
@@ -235,7 +237,18 @@ async function handleRetryOrder(order: PaymentOrder) {
|
||||
catch (err: unknown) { appStore.showError(extractI18nErrorMessage(err, t, 'payment.errors', t('common.error'))) }
|
||||
}
|
||||
|
||||
function openRefundDialog(order: PaymentOrder) { selectedOrder.value = order; showRefundDialog.value = true }
|
||||
function openRefundDialog(order: PaymentOrder) {
|
||||
selectedOrder.value = order
|
||||
refundRequireForce.value = false
|
||||
refundWarning.value = ''
|
||||
showRefundDialog.value = true
|
||||
}
|
||||
|
||||
function closeRefundDialog() {
|
||||
showRefundDialog.value = false
|
||||
refundRequireForce.value = false
|
||||
refundWarning.value = ''
|
||||
}
|
||||
|
||||
function isRefundPendingWarning(warning: string | undefined): boolean {
|
||||
return /pending|处理中|待/.test(String(warning || '').toLowerCase())
|
||||
@@ -248,16 +261,24 @@ async function handleRefund(data: { amount: number; reason: string; deduct_balan
|
||||
const res = await adminPaymentAPI.refundOrder(selectedOrder.value.id, { amount: data.amount, reason: data.reason, deduct_balance: data.deduct_balance, force: data.force })
|
||||
if (res.data.success) {
|
||||
appStore.showSuccess(t('payment.admin.refundSuccess'))
|
||||
showRefundDialog.value = false
|
||||
closeRefundDialog()
|
||||
loadOrders()
|
||||
return
|
||||
}
|
||||
if (isRefundPendingWarning(res.data.warning)) {
|
||||
appStore.showSuccess(t('payment.admin.refundPending'))
|
||||
showRefundDialog.value = false
|
||||
closeRefundDialog()
|
||||
loadOrders()
|
||||
return
|
||||
}
|
||||
if (res.data.require_force) {
|
||||
// Backend needs an explicit force confirmation (e.g. the user spent their
|
||||
// balance after requesting the refund). Keep the dialog open and surface
|
||||
// the force checkbox instead of dropping the admin back to the list.
|
||||
refundRequireForce.value = true
|
||||
refundWarning.value = res.data.warning || ''
|
||||
return
|
||||
}
|
||||
appStore.showError(res.data.warning || t('common.error'))
|
||||
} catch (err: unknown) { appStore.showError(extractI18nErrorMessage(err, t, 'payment.errors', t('common.error'))) }
|
||||
finally { refundSubmitting.value = false }
|
||||
|
||||
Reference in New Issue
Block a user