kate522/wordpress-theme-aksrt
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(payment): 通用卡密兑换弹窗并修正核销订单实付与订单名称

Browse Source 
- /user/balance/ 余额卡片入口改为通用「卡密兑换」弹窗：请求不带类型，
  后端按卡密自动识别余额/会员/积分；卡号输入恒展示且选填
- 后台「余额充值 → 卡密充值」语义更新为「卡密兑换」，开关更名
  「启用卡密兑换功能」（设置键不变），双源 schema 同步并重建 SPA
- 删除死代码：credits-vip.php 死文件、credits-balance.php 内联积分
  兑换块、/pay/card-pass/options 路由与 rest_options、labels 数组、
  asset_points_card_description/password_only 死字段及内联块专属 CSS
- 卡密核销订单实付恒 0：create_redeem_order 源头写 0，UserOrders
  对 card_pass 订单视图层归零覆盖历史行（不迁移数据）
- 订单名称按 note.meta 生成：卡密兑换-余额充值X / 卡密兑换-积分充值X /
  购入[会员档位名]X天(永久)
- 新增契约 card-pass-universal-redeem.test.cjs，收紧 user-assets-layout
  契约（禁 .uc-card-pass 根类回潮）
This commit is contained in:
kate522 committed 2026-09-17 19:04:47 +08:00
1 parent ba8d4b1b90
commit 3481620ed0
14 files changed
+213 -415
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

inc/helpers/user-center-renderers/credits-wallet.php
+14 -16
View File
@@ -45,12 +45,12 @@ if ($withdraw_on && class_exists('\AKSRT\Payment\Withdrawal')) {
$withdraw_pending_hold = $wd_svc->sum_pending_hold((int) ($user_id ?? 0));
$withdraw_usage = $wd_svc->daily_usage((int) ($user_id ?? 0), $withdraw_settings);
}
$card_pass_balance = ['enabled' => false, 'desc' => '', 'only_password' => true];
// 卡密兑换总开关（后台 余额充值 → 卡密兑换 → 启用卡密兑换功能），
// 通用弹窗支持余额 / 会员 / 积分三类卡密，类型由后端按卡密自动识别。
$card_pass_redeem = ['enabled' => false, 'desc' => ''];
if (class_exists('\AKSRT\Payment\ChargeCard')) {
$opts = \AKSRT\Payment\ChargeCard::get_instance()->get_public_options();
$card_pass_balance = is_array($opts['balance'] ?? null) ? $opts['balance'] : $card_pass_balance;
} elseif (!empty($recharge['pass_charge'])) {
$card_pass_balance = is_array($recharge['pass_charge']) ? $recharge['pass_charge'] : $card_pass_balance;
$card_pass_redeem = is_array($opts['balance'] ?? null) ? $opts['balance'] : $card_pass_redeem;
}
$charge_view = [];
@@ -92,14 +92,14 @@ $mark = (string) ($charge_view['currency_mark'] ?? '元');
<button type="button" class="but b-blue-2" data-aksrt-charge-open><?php esc_html_e('充值', 'aksrt'); ?></button>
</div>
</div>
<?php if ($withdraw_on || !empty($card_pass_balance['enabled'])) : ?>
<?php if ($withdraw_on || !empty($card_pass_redeem['enabled'])) : ?>
<div class="uc-asset-card__foot muted-2-color em09 mt6 flex jsb ac">
<?php if ($withdraw_on) : ?>
<span><?php printf(esc_html__('冻结中 %s', 'aksrt'), esc_html($normalize_balance($withdraw_pending_hold)->formatted())); ?></span>
<?php else : ?>
<span></span>
<?php endif; ?>
<?php if (!empty($card_pass_balance['enabled'])) : ?>
<?php if (!empty($card_pass_redeem['enabled'])) : ?>
<button type="button" class="uc-asset-card__head-action muted-color px12" data-aksrt-card-pass-open>
<?php esc_html_e('卡密兑换', 'aksrt'); ?>
<i class="fa fas fa-angle-right em12 ml3" aria-hidden="true"></i>
@@ -109,22 +109,20 @@ $mark = (string) ($charge_view['currency_mark'] ?? '元');
<?php endif; ?>
</div>
<?php if (!empty($card_pass_balance['enabled'])) : ?>
<div class="uc-modal" id="aksrt-card-pass-modal" hidden data-aksrt-card-pass-modal data-aksrt-card-pass="balance">
<?php if (!empty($card_pass_redeem['enabled'])) : ?>
<div class="uc-modal" id="aksrt-card-pass-modal" hidden data-aksrt-card-pass-modal data-aksrt-card-pass="">
<div class="uc-modal__overlay" data-aksrt-card-pass-close></div>
<div class="uc-modal__dialog" role="dialog" aria-modal="true" aria-labelledby="aksrt-card-pass-title">
<button type="button" class="uc-modal__close" data-aksrt-card-pass-close aria-label="<?php esc_attr_e('关闭', 'aksrt'); ?>"><i class="fa fas fa-times" aria-hidden="true"></i></button>
<h3 id="aksrt-card-pass-title" class="uc-modal__title"><i class="fa fas fa-ticket-alt mr6" aria-hidden="true"></i><?php esc_html_e('卡密兑换余额', 'aksrt'); ?></h3>
<?php if (!empty($card_pass_balance['desc'])) : ?>
<div class="uc-modal__desc muted-box em09"><?php echo esc_html((string) $card_pass_balance['desc']); ?></div>
<?php endif; ?>
<?php if (empty($card_pass_balance['only_password'])) : ?>
<input type="text" class="uc-card-pass__input" name="aksrt_card_no" data-aksrt-card-no autocomplete="off" placeholder="<?php esc_attr_e('请输入卡号', 'aksrt'); ?>">
<h3 id="aksrt-card-pass-title" class="uc-modal__title"><i class="fa fas fa-ticket-alt mr6" aria-hidden="true"></i><?php esc_html_e('卡密兑换', 'aksrt'); ?></h3>
<?php if (!empty($card_pass_redeem['desc'])) : ?>
<div class="uc-modal__desc muted-box em09"><?php echo esc_html((string) $card_pass_redeem['desc']); ?></div>
<?php endif; ?>
<input type="text" class="uc-card-pass__input" name="aksrt_card_no" data-aksrt-card-no autocomplete="off" placeholder="<?php esc_attr_e('请输入卡号（选填）', 'aksrt'); ?>">
<input type="text" class="uc-card-pass__input" name="aksrt_card_password" data-aksrt-card-password autocomplete="off" placeholder="<?php esc_attr_e('请输入卡密', 'aksrt'); ?>">
<div class="uc-card-pass-actions">
<button type="button" class="uc-card-pass__btn" data-aksrt-card-redeem data-type="balance">
<?php esc_html_e('兑换余额', 'aksrt'); ?>
<button type="button" class="uc-card-pass__btn" data-aksrt-card-redeem>
<?php esc_html_e('立即兑换', 'aksrt'); ?>
</button>
</div>
<p class="uc-card-pass__tip" data-aksrt-card-tip></p>