-
-
-
-
-
-
+
+
+
+
-
diff --git a/src/Admin/Schema/SchemaPayment.php b/src/Admin/Schema/SchemaPayment.php
index 41aa2750..5efc4c6a 100644
--- a/src/Admin/Schema/SchemaPayment.php
+++ b/src/Admin/Schema/SchemaPayment.php
@@ -154,10 +154,10 @@ class SchemaPayment {
['key' => 'pay_balance_product_custom_s', 'label' => '自定义充值金额', 'type' => 'switch', 'default' => true, 'help' => '允许用户手动输入充值金额'],
['key' => 'pay_balance_product_custom_limit', 'label' => '自定义充值金额上限', 'type' => 'number', 'default' => 9999, 'min' => 1, 'max' => 99999, 'dependsOn' => ['key' => 'pay_balance_product_custom_s', 'value' => true]],
]],
- ['key' => 'pass-charge', 'title' => '卡密充值', 'fields' => [
- ['key' => 'pay_balance_pass_charge_s', 'label' => '启用卡密充值余额功能', 'type' => 'switch', 'default' => false],
- ['key' => 'pay_balance_pass_charge_desc', 'label' => '卡密充值说明', 'type' => 'textarea', 'default' => '', 'rows' => 2, 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true], 'help' => '用户使用卡密充值时显示的内容，建议为提醒事项、充值协议等，支持HTML代码'],
- ['key' => 'pay_balance_pass_charge_only_password', 'label' => '单密码模式', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true], 'help' => '仅需输入密码，不需要卡号'],
+ ['key' => 'pass-charge', 'title' => '卡密兑换', 'fields' => [
+ ['key' => 'pay_balance_pass_charge_s', 'label' => '启用卡密兑换功能', 'type' => 'switch', 'default' => false, 'help' => '开启后用户中心余额卡片展示通用「卡密兑换」入口，支持余额 / 会员 / 积分卡密，类型按卡密自动识别'],
+ ['key' => 'pay_balance_pass_charge_desc', 'label' => '卡密兑换说明', 'type' => 'textarea', 'default' => '', 'rows' => 2, 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true], 'help' => '用户使用卡密兑换时显示的内容，建议为提醒事项、兑换协议等，支持HTML代码'],
+ ['key' => 'pay_balance_pass_charge_only_password', 'label' => '单密码模式', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true], 'help' => '余额卡密仅需输入密码，不需要卡号'],
]],
['key' => 'points-exchange', 'title' => '余额兑换积分', 'fields' => [
['key' => 'pay_balance_points_exchange_s', 'label' => '启用余额兑换积分', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_s', 'value' => true]],
diff --git a/src/Admin/Schema/SchemaUsers.php b/src/Admin/Schema/SchemaUsers.php
index 017e0be1..ecce1f2e 100644
--- a/src/Admin/Schema/SchemaUsers.php
+++ b/src/Admin/Schema/SchemaUsers.php
@@ -487,9 +487,7 @@ class SchemaUsers {
['key' => 'points_deduction_max', 'label' => '最大抵扣比例(%)', 'type' => 'number', 'default' => 50, 'min' => 1, 'max' => 100, 'help' => '预留：最多可抵订单金额百分比。当前未参与下单。'],
]],
['key' => 'card_pass', 'title' => '积分卡密兑换', 'fields' => [
- ['key' => 'asset_points_card_enabled', 'label' => '启用积分卡密兑换', 'type' => 'switch', 'default' => false],
- ['key' => 'asset_points_card_description', 'label' => '兑换说明', 'type' => 'textarea', 'default' => '', 'dependsOn' => ['key' => 'asset_points_card_enabled', 'value' => true]],
- ['key' => 'asset_points_card_password_only', 'label' => '仅密码兑换', 'type' => 'switch', 'default' => true, 'dependsOn' => ['key' => 'asset_points_card_enabled', 'value' => true]],
+ ['key' => 'asset_points_card_enabled', 'label' => '启用积分卡密兑换', 'type' => 'switch', 'default' => false, 'help' => '开启后积分卡密可在用户中心「卡密兑换」弹窗兑换入账'],
]],
['key' => 'display', 'title' => '展示设置', 'fields' => [
['key' => 'points_show_balance', 'label' => '导航栏显示余额', 'type' => 'switch', 'default' => true],
diff --git a/src/Payment/ChargeCard.php b/src/Payment/ChargeCard.php
index 1515ed91..5de3f20c 100644
--- a/src/Payment/ChargeCard.php
+++ b/src/Payment/ChargeCard.php
@@ -42,11 +42,6 @@ class ChargeCard {
}
public function register_public_routes(): void {
- register_rest_route('aksrt/v1', '/pay/card-pass/options', [
- 'methods' => 'GET',
- 'callback' => [$this, 'rest_options'],
- 'permission_callback' => [$this, 'check_rest_nonce'],
- ]);
register_rest_route('aksrt/v1', '/pay/card-pass/redeem', [
'methods' => 'POST',
'callback' => [$this, 'rest_redeem'],
@@ -89,13 +84,6 @@ class ChargeCard {
return true;
}
- public function rest_options(\WP_REST_Request $request) {
- return new \WP_REST_Response([
- 'success' => true,
- 'data' => $this->get_public_options(),
- ], 200);
- }
-
public function rest_redeem(\WP_REST_Request $request) {
$params = $request->get_json_params();
if (!is_array($params)) {
@@ -124,20 +112,14 @@ class ChargeCard {
}
/**
+ * 前台卡密兑换开关视图（按类型拆分）。
+ *
+ * balance.enabled 语义为「启用卡密兑换功能」总开关（后台 余额充值 → 卡密兑换），
+ * 与收款接口 card_pass 主开关共同决定前台兑换入口是否展示。
+ *
* @return array
*/
public function get_public_options(): array {
- $labels = [
- 'title' => __('卡密兑换', 'aksrt'),
- 'password' => __('卡密', 'aksrt'),
- 'card' => __('卡号', 'aksrt'),
- 'submit_balance' => __('兑换余额', 'aksrt'),
- 'submit_vip' => __('兑换会员', 'aksrt'),
- 'submit_credits' => __('兑换积分', 'aksrt'),
- 'placeholder_pw' => __('请输入卡密', 'aksrt'),
- 'placeholder_card' => __('请输入卡号', 'aksrt'),
- ];
-
// Master kill-switch on 收款接口 → 卡密充值.
$channel_on = !class_exists('\AKSRT\Settings\PaymentRuntime')
|| \AKSRT\Settings\PaymentRuntime::is_gateway_enabled('card_pass');
@@ -146,8 +128,7 @@ class ChargeCard {
return [
'balance' => $off,
'vip' => $off,
- 'credits' => $off,
- 'labels' => $labels,
+ 'credits' => ['enabled' => false],
];
}
@@ -175,17 +156,15 @@ class ChargeCard {
}
}
- $credits = ['enabled' => false, 'desc' => '', 'only_password' => true];
+ $credits = ['enabled' => false];
$all = class_exists('\AKSRT\Settings\Settings') && method_exists('\AKSRT\Settings\Settings', 'get_all')
? \AKSRT\Settings\Settings::get_all()
: (array) get_option('aksrt_settings', []);
if (!empty($all['asset_points_card_enabled'])) {
- // Require credits system on when available.
- $credits_on = !class_exists('\AKSRT\Settings\Settings') || !method_exists('\AKSRT\Settings\Settings', 'credits_enabled') || \AKSRT\Settings\Settings::credits_enabled();
+ // 积分卡仅作为后端类型闸门（assert_type_enabled）；前台兑换统一走
+ // 通用「卡密兑换」弹窗，无独立入口与说明/单密码配置。
$credits = [
- 'enabled' => $credits_on,
- 'desc' => sanitize_textarea_field((string) ($all['asset_points_card_description'] ?? '')),
- 'only_password' => !isset($all['asset_points_card_password_only']) || !empty($all['asset_points_card_password_only']),
+ 'enabled' => !class_exists('\AKSRT\Settings\Settings') || !method_exists('\AKSRT\Settings\Settings', 'credits_enabled') || \AKSRT\Settings\Settings::credits_enabled(),
];
}
@@ -193,7 +172,6 @@ class ChargeCard {
'balance' => $balance,
'vip' => $vip,
'credits' => $credits,
- 'labels' => $labels,
];
}
@@ -808,6 +786,8 @@ class ChargeCard {
return '';
}
+ // 卡密核销不发生真实支付（现金在售卡时已确认），订单金额恒为 0；
+ // 卡密面额/时长记录在 note.meta，订单名称由 UserOrders 按 note 生成。
$product_type = \AKSRT\Core\DomainModel::ORDER_PRODUCT_RECHARGE;
$product_id = $card_id;
$amount = '0.00';
@@ -815,14 +795,9 @@ class ChargeCard {
if ($type === self::TYPE_VIP) {
$product_type = \AKSRT\Core\DomainModel::ORDER_PRODUCT_VIP;
- $amount = '0.00';
- } elseif ($type === self::TYPE_BALANCE) {
- $parsed_amount = \AKSRT\Ledger\AssetAmount::balance(is_string($meta['amount'] ?? null) ? $meta['amount'] : '');
- $amount = $parsed_amount->decimal();
- $currency = 'CNY';
} elseif ($type === self::TYPE_CREDITS) {
$product_type = \AKSRT\Core\DomainModel::ORDER_PRODUCT_POINTS;
- $amount = (int) ($meta['points'] ?? 0);
+ $amount = '0';
$currency = 'points';
}
diff --git a/src/Payment/UserOrders.php b/src/Payment/UserOrders.php
index 2a62688b..7a750bf0 100644
--- a/src/Payment/UserOrders.php
+++ b/src/Payment/UserOrders.php
@@ -186,6 +186,12 @@ class UserOrders {
$image = $this->resolve_image($meta, $product_id);
$group = $this->status_group($status);
$payment_method = sanitize_key((string) ($order['payment_method'] ?? ''));
+ // 卡密核销不发生任何真实支付（现金在售卡时已确认），实付恒为 0，
+ // 视图层统一归零以覆盖历史行（历史数据不做迁移）。
+ $amount = (string) ($order['amount'] ?? '0.00');
+ if ($payment_method === 'card_pass') {
+ $amount = $is_points ? '0' : '0.00';
+ }
$can_pay = $group === OrderCenterQuery::STATUS_PENDING;
$can_cancel = $group === OrderCenterQuery::STATUS_PENDING;
$order_number = (string) ($order['order_number'] ?? '');
@@ -194,7 +200,7 @@ class UserOrders {
$view = [
'id' => (int) ($order['id'] ?? 0),
'order_number' => $order_number,
- 'amount' => (string) ($order['amount'] ?? '0.00'),
+ 'amount' => $amount,
'currency' => $currency,
'currency_symbol' => $is_points
? (class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_currency_name() : __('积分', 'aksrt'))
@@ -288,6 +294,13 @@ class UserOrders {
/** @param array $meta */
private function resolve_title(array $meta, string $type, int $product_id, string $fallback): string {
+ // 卡密核销订单：按 note.meta 生成可读名称（余额/积分卡记面额，会员卡记档位与时长）。
+ if (!empty($meta['card_pass'])) {
+ $title = $this->resolve_card_pass_title($meta);
+ if ($title !== '') {
+ return $title;
+ }
+ }
foreach (['product_title', 'title', 'package_title'] as $key) {
if (!empty($meta[$key]) && is_string($meta[$key])) {
return (string) $meta[$key];
@@ -315,6 +328,43 @@ class UserOrders {
return $fallback;
}
+ /**
+ * 卡密核销订单名称：
+ * - 余额卡：卡密兑换-余额充值{面额}
+ * - 积分卡：卡密兑换-积分充值{点数}
+ * - 会员卡：购入[{会员档位名}]{N}天（永久卡为「永久」）
+ *
+ * @param array $meta
+ */
+ private function resolve_card_pass_title(array $meta): string {
+ $card_meta = is_array($meta['meta'] ?? null) ? $meta['meta'] : [];
+ $card_type = sanitize_key((string) ($meta['card_type'] ?? ''));
+ if ($card_type === ChargeCard::TYPE_BALANCE) {
+ $amount = (string) ($card_meta['amount'] ?? '');
+ if (str_contains($amount, '.')) {
+ $amount = rtrim(rtrim($amount, '0'), '.');
+ }
+ return __('卡密兑换-余额充值', 'aksrt') . $amount;
+ }
+ if ($card_type === ChargeCard::TYPE_CREDITS) {
+ return __('卡密兑换-积分充值', 'aksrt') . (string) max(0, (int) ($card_meta['points'] ?? 0));
+ }
+ if ($card_type === ChargeCard::TYPE_VIP) {
+ $level = max(1, min(2, (int) ($card_meta['level'] ?? 1)));
+ $days = max(0, (int) ($card_meta['days'] ?? 0));
+ $levels = class_exists('\AKSRT\Settings\Settings')
+ ? (\AKSRT\Settings\Settings::get_payment_vip_settings()['levels'] ?? [])
+ : [];
+ $level_name = is_array($levels) ? (string) ($levels[$level]['name'] ?? '') : '';
+ if ($level_name === '') {
+ $level_name = 'VIP' . $level;
+ }
+ $suffix = $days > 0 ? sprintf(__('%d天', 'aksrt'), $days) : __('永久', 'aksrt');
+ return sprintf(__('购入[%1$s]%2$s', 'aksrt'), $level_name, $suffix);
+ }
+ return '';
+ }
+
/** @param array $meta */
private function resolve_image(array $meta, int $product_id): string {
if (!empty($meta['thumb']) && is_string($meta['thumb'])) {
diff --git a/tests/widget-system/card-pass-universal-redeem.test.cjs b/tests/widget-system/card-pass-universal-redeem.test.cjs
new file mode 100644
index 00000000..e7f37544
--- /dev/null
+++ b/tests/widget-system/card-pass-universal-redeem.test.cjs
@@ -0,0 +1,111 @@
+/**
+ * 通用卡密兑换契约（/user/balance/ 余额卡片弹窗）。
+ *
+ * 背景：余额卡片右下角入口原为「卡密兑换余额」专用弹窗（强制 data-type="balance"）。
+ * 现改为通用「卡密兑换」弹窗：标题、文案与提交不再绑定余额类型，
+ * 请求不带类型，由后端 ChargeCard::redeem_for_user() 按卡密自动识别
+ * （balance / vip / credits），各类型仍受自身开关与收款接口 card_pass 主开关约束。
+ * 前台只保留这一个兑换入口：页内联兑换块（积分/会员）与死文件 credits-vip.php
+ * 已删除，会员/积分卡密统一经通用弹窗兑换。
+ *
+ * 后台语义：余额充值 → 卡密兑换 → 「启用卡密兑换功能」
+ * （原「启用卡密充值余额功能」，设置键不变，仅语义/文案更新）。
+ *
+ * 卡密核销订单契约：核销不发生真实支付（现金在售卡时已确认），
+ * 订单金额恒为 0（create_redeem_order 源头 + UserOrders 视图层归零覆盖历史行，
+ * 不做数据迁移）；订单名称按 note.meta 生成：
+ * 卡密兑换-余额充值X / 卡密兑换-积分充值X / 购入[会员档位名]X天(永久)。
+ */
+const test = require('node:test');
+const assert = require('node:assert');
+const fs = require('node:fs');
+const path = require('node:path');
+
+const root = path.join(__dirname, '..', '..');
+const read = (...seg) => fs.readFileSync(path.join(root, ...seg), 'utf8');
+
+const wallet = read('inc', 'helpers', 'user-center-renderers', 'credits-wallet.php');
+const creditsJs = read('assets', 'js', 'credits.js');
+const chargeCard = read('src', 'Payment', 'ChargeCard.php');
+const userOrders = read('src', 'Payment', 'UserOrders.php');
+const schemaPhp = read('src', 'Admin', 'Schema', 'SchemaPayment.php');
+const schemaJs = read('assets', 'admin', 'src', 'schema', 'sections', 'payment', 'recharge.js');
+const usersSchemaPhp = read('src', 'Admin', 'Schema', 'SchemaUsers.php');
+const usersSchemaJs = read('assets', 'admin', 'src', 'schema', 'sections', 'users', 'credits.js');
+const creditsRenderer = read('inc', 'helpers', 'user-center-renderers', 'credits-balance.php');
+const creditsCss = read('assets', 'css', 'routes', 'user-center', 'credits.css');
+
+test('余额卡片弹窗为通用卡密兑换：标题与提交不再绑定余额类型', () => {
+ assert.match(wallet, /esc_html_e\('卡密兑换', 'aksrt'\)/);
+ assert.doesNotMatch(wallet, /卡密兑换余额/);
+ assert.doesNotMatch(wallet, /data-type="balance"/);
+ assert.doesNotMatch(wallet, /esc_html__\('兑换余额', 'aksrt'\)/);
+ // 弹窗根节点不带类型值 → 前端 type='' → 后端按卡密自动识别。
+ assert.match(wallet, /data-aksrt-card-pass-modal data-aksrt-card-pass=""/);
+ assert.match(wallet, /data-aksrt-card-redeem(?![^>]*data-type)/);
+ // 卡号输入恒展示且为选填（是否必填由后端按卡密类型判定）。
+ assert.match(wallet, /data-aksrt-card-no(?![^>]*required)/);
+ assert.match(wallet, /请输入卡号（选填）/);
+});
+
+test('入口展示受「启用卡密兑换功能」总开关控制', () => {
+ assert.match(wallet, /\$card_pass_redeem\['enabled'\]/);
+ assert.doesNotMatch(wallet, /\$card_pass_balance/);
+ // ChargeCard 缺失时不做 pass_charge 兜底（兑换 REST 依赖该类，兜底无意义）。
+ assert.doesNotMatch(wallet, /\$recharge\['pass_charge'\]/);
+});
+
+test('前台唯一兑换入口：页内联块与死文件已删除，JS 不再有 required 卡号校验', () => {
+ assert.equal(
+ fs.existsSync(path.join(root, 'inc', 'helpers', 'user-center-renderers', 'credits-vip.php')),
+ false,
+ 'credits-vip.php 死文件应已删除'
+ );
+ assert.doesNotMatch(creditsRenderer, /data-aksrt-card-pass|data-aksrt-card-redeem|card_pass_credits/);
+ assert.doesNotMatch(creditsJs, /hasAttribute\('required'\)/);
+ // 积分卡的说明/单密码配置只服务于已删内联块，后台 schema 不应再有。
+ assert.doesNotMatch(usersSchemaPhp, /asset_points_card_description|asset_points_card_password_only/);
+ assert.doesNotMatch(usersSchemaJs, /asset_points_card_description|asset_points_card_password_only/);
+ assert.doesNotMatch(chargeCard, /asset_points_card_description|asset_points_card_password_only/);
+ // 失去宿主的内联块样式不回潮（弹窗仍在用 __input/__btn/__tip 子元素样式）。
+ assert.doesNotMatch(creditsCss, /^\.uc-card-pass\s*\{/m);
+ assert.doesNotMatch(creditsCss, /uc-card-pass__title|uc-card-pass__desc|\.uc-assets-col > \.uc-card-pass/);
+});
+
+test('前端：VIP 缓存失效按后端识别类型', () => {
+ assert.match(creditsJs, /var redeemedType = \(data && data\.type\) \|\| type;/);
+ assert.match(creditsJs, /redeemedType === 'vip'/);
+});
+
+test('后端：核销订单金额恒为 0，options 路由与 labels 死代码不回潮', () => {
+ assert.match(chargeCard, /\/pay\/card-pass\/redeem/);
+ assert.doesNotMatch(chargeCard, /card-pass\/options/);
+ assert.doesNotMatch(chargeCard, /rest_options/);
+ assert.doesNotMatch(chargeCard, /'labels'\s+=>\s+\$labels/);
+ // 通用兑换能力后端契约保持：三类可兑换 + 空类型自动识别。
+ assert.match(chargeCard, /REDEEMABLE_TYPES = \[self::TYPE_BALANCE, self::TYPE_VIP, self::TYPE_CREDITS\]/);
+ assert.match(chargeCard, /'enum' => \['', self::TYPE_BALANCE, self::TYPE_VIP, self::TYPE_CREDITS\]/);
+ // create_redeem_order：余额卡不再把面额写进订单金额。
+ assert.doesNotMatch(chargeCard, /TYPE_BALANCE\)\s*\{[^}]*parsed_amount/s);
+ assert.match(chargeCard, /订单金额恒为 0/);
+ // 积分卡开关仅作为后端类型闸门。
+ assert.match(chargeCard, /'credits' => \['enabled' => /);
+});
+
+test('订单中心：卡密核销订单实付归零并按 note 生成订单名称', () => {
+ assert.match(userOrders, /if \(\$payment_method === 'card_pass'\)\s*\{\s*\$amount = \$is_points \? '0' : '0\.00';/);
+ assert.match(userOrders, /if \(!empty\(\$meta\['card_pass'\]\)\)\s*\{[\s\S]*?resolve_card_pass_title\(\$meta\)/);
+ assert.match(userOrders, /卡密兑换-余额充值/);
+ assert.match(userOrders, /卡密兑换-积分充值/);
+ assert.match(userOrders, /购入\[%1\$s\]%2\$s/);
+ assert.match(userOrders, /永久/);
+});
+
+test('后台 schema 语义更新为「启用卡密兑换功能」', () => {
+ for (const [name, src] of [['SchemaPayment.php', schemaPhp], ['recharge.js', schemaJs]]) {
+ assert.match(src, /启用卡密兑换功能/, name);
+ assert.match(src, /title['"]?\s*(?::|=>)\s*'卡密兑换'/, name);
+ assert.doesNotMatch(src, /启用卡密充值余额功能/, name);
+ assert.doesNotMatch(src, /卡密充值说明/, name);
+ }
+});
diff --git a/tests/widget-system/user-assets-layout-contract.test.cjs b/tests/widget-system/user-assets-layout-contract.test.cjs
index 2fcba46d..115b121e 100644
--- a/tests/widget-system/user-assets-layout-contract.test.cjs
+++ b/tests/widget-system/user-assets-layout-contract.test.cjs
@@ -20,7 +20,8 @@ test('dual asset cards use an independent equal-height grid row', () => {
assert.match(css, /\.uc-assets-row--dual\s*>\s*\.uc-assets-col:first-child\s*>\s*\.uc-asset-card[\s\S]*?grid-column:\s*1;/)
assert.match(css, /\.uc-assets-row--dual\s*>\s*\.uc-assets-col:last-child\s*>\s*\.uc-asset-card[\s\S]*?grid-column:\s*2;/)
assert.match(css, /\.uc-assets-row--dual\s*>\s*\.uc-assets-col\s*>\s*\.uc-asset-card\s*\{[\s\S]*?grid-row:\s*1;/)
- assert.match(css, /\.uc-assets-row--dual\s*>\s*\.uc-assets-col\s*>\s*\.uc-card-pass\s*\{[\s\S]*?grid-row:\s*2;/)
+ // 内联 uc-card-pass 块已删除：双卡网格不再为它预留第二行（弹窗子元素样式除外）。
+ assert.doesNotMatch(css, /\.uc-card-pass(?:[\s:{])/)
assert.match(css, /\.uc-asset-card\s*\{[\s\S]*?display:\s*flex;[\s\S]*?flex-direction:\s*column;/)
assert.match(css, /\.uc-asset-card__link\s*\{[\s\S]*?margin-top:\s*auto;/)
assert.match(css, /\.uc-asset-card__foot\s*\{[\s\S]*?margin-top:\s*auto;/)
@@ -74,4 +75,5 @@ test('removed asset card selectors do not return in loaded user-center styles',
assert.doesNotMatch(source, /\.uc-assets-row\.uc-asset-card\.aksrt-panel/)
assert.doesNotMatch(source, /\.uc-asset-tabs\.aksrt-panel/)
assert.doesNotMatch(source, /\.uc-asset-card__foot\s+button/)
+ assert.doesNotMatch(source, /\.uc-card-pass(?:[\s:{])/)
})