'
. '
'
diff --git a/src/Content/VipServicePurchase.php b/src/Content/VipServicePurchase.php
index d44ee8ad..e6d932ae 100644
--- a/src/Content/VipServicePurchase.php
+++ b/src/Content/VipServicePurchase.php
@@ -737,12 +737,20 @@ trait VipServicePurchase {
return new \WP_Error('aksrt_need_login', __('请先登录后再兑换。', 'aksrt'), ['status' => 401]);
}
$catalog = $this->get_catalog($user_id);
+ // 兑换相关文案（错误提示 / 订单备注 / 流水说明）统一跟随自定义货币名称
+ // （后台「积分配置 → 自定义货币名称」），catalog 已带出 currency_name。
+ $currency_name = (string) ($catalog['currency_name'] ?? '');
+ if ($currency_name === '') {
+ $currency_name = class_exists('\AKSRT\Settings\Settings')
+ ? \AKSRT\Settings\Settings::get_currency_name()
+ : __('积分', 'aksrt');
+ }
if (array_key_exists('credits_enabled', $catalog) && empty($catalog['credits_enabled'])) {
return new \WP_Error('aksrt_points_disabled', __('积分功能未启用', 'aksrt'), ['status' => 400]);
}
$points_ex = is_array($catalog['points_exchange'] ?? null) ? $catalog['points_exchange'] : [];
if (empty($points_ex['enabled'])) {
- return new \WP_Error('aksrt_points_exchange_disabled', __('积分兑换会员未启用', 'aksrt'), ['status' => 400]);
+ return new \WP_Error('aksrt_points_exchange_disabled', sprintf(__('%s兑换会员未启用', 'aksrt'), $currency_name), ['status' => 400]);
}
$match = null;
@@ -775,12 +783,12 @@ trait VipServicePurchase {
$pkg_unit = 'day';
}
if ($cost <= 0) {
- return new \WP_Error('aksrt_invalid_price', __('兑换积分无效', 'aksrt'), ['status' => 400]);
+ return new \WP_Error('aksrt_invalid_price', sprintf(__('兑换%s无效', 'aksrt'), $currency_name), ['status' => 400]);
}
$balance = (int) ($catalog['user_points'] ?? 0);
if ($balance < $cost) {
- return new \WP_Error('aksrt_points_insufficient', __('积分不足，暂时无法兑换', 'aksrt'), [
+ return new \WP_Error('aksrt_points_insufficient', sprintf(__('%s不足，暂时无法兑换', 'aksrt'), $currency_name), [
'status' => 402,
'balance' => $balance,
'cost' => $cost,
@@ -855,7 +863,7 @@ trait VipServicePurchase {
$operation_key,
'vip_points_exchange',
['type' => 'order', 'key' => $order_number],
- sprintf(__('积分兑换会员 · %s', 'aksrt'), (string) ($match['title'] ?? '')),
+ sprintf(__('%s兑换会员 · %s', 'aksrt'), $currency_name, (string) ($match['title'] ?? '')),
$user_id,
['level' => $level, 'days' => $days, 'package_id' => $package_id],
static function () use ($is_new_order, $repo, $order_number, $operation_key, $user_id, $package_id, $cost, $note) {
@@ -879,7 +887,8 @@ trait VipServicePurchase {
}
$paid = \AKSRT\Payment\Order::get_instance()->update_status($order_number, \AKSRT\Payment\Order::STATUS_PAID, [
'payment_method' => 'points',
- 'note' => sprintf(__('积分兑换会员 %d 积分。', 'aksrt'), $cost),
+ // 订单备注同样跟随自定义货币名称（后台「积分配置 → 自定义货币名称」）。
+ 'note' => sprintf(__('%1$s兑换会员 %2$d %1$s。', 'aksrt'), $currency_name, $cost),
'require_transition' => true,
]);
return $paid ? true : new \WP_Error('aksrt_order_confirm_failed', __('兑换确认失败', 'aksrt'), ['status' => 500]);
diff --git a/src/Ledger/LedgerPresentation.php b/src/Ledger/LedgerPresentation.php
index bcabd526..4f081284 100644
--- a/src/Ledger/LedgerPresentation.php
+++ b/src/Ledger/LedgerPresentation.php
@@ -8,6 +8,16 @@ namespace AKSRT\Ledger;
defined('ABSPATH') || exit;
final class LedgerPresentation {
+ /**
+ * 自定义货币名称，为空时回退"积分"（后台「积分配置 → 自定义货币名称」）。
+ * 兑换类流水的说明文案跟随它，与收银台/用户中心保持同一命名。
+ */
+ private static function points_name(): string {
+ return class_exists('\AKSRT\Settings\Settings')
+ ? \AKSRT\Settings\Settings::get_currency_name()
+ : __('积分', 'aksrt');
+ }
+
public static function reason_label(string $reason): string {
$labels = [
'admin_adjustment' => __('管理员调整', 'aksrt'),
@@ -34,7 +44,7 @@ final class LedgerPresentation {
'transfer' => __('用户转账', 'aksrt'),
'tip' => __('用户赞赏', 'aksrt'),
'verify_application' => __('认证申请费用', 'aksrt'),
- 'vip_points_exchange' => __('积分兑换会员', 'aksrt'),
+ 'vip_points_exchange' => sprintf(__('%s兑换会员', 'aksrt'), self::points_name()),
'withdraw_hold' => __('提现冻结', 'aksrt'),
'withdraw_refund' => __('提现退回', 'aksrt'),
];
diff --git a/tests/widget-system/vip-points-entry-harness.php b/tests/widget-system/vip-points-entry-harness.php
new file mode 100644
index 00000000..15c47f05
--- /dev/null
+++ b/tests/widget-system/vip-points-entry-harness.php
@@ -0,0 +1,57 @@
+ */
+ public function get_catalog(int $user_id = 0): array {
+ return [
+ 'currency_name' => $GLOBALS['aksrt_probe_currency'] ?? '积分',
+ 'points_exchange' => [
+ 'enabled' => true,
+ 'packages' => [['package_id' => 6001, 'level' => 1, 'points' => 500]],
+ ],
+ ];
+ }
+ }
+}
+
+namespace AKSRT\Settings {
+ final class Settings {
+ // 仅在 catalog 未带 currency_name 时回退，用于验证兜底路径。
+ public static function get_currency_name(): string { return $GLOBALS['aksrt_probe_fallback'] ?? '积分'; }
+ }
+}
+
+namespace {
+ require dirname(__DIR__, 2) . '/inc/helpers/aksrt-vip.php';
+
+ $GLOBALS['aksrt_probe_currency'] = isset($argv[1]) ? (string) $argv[1] : '书币';
+ $GLOBALS['aksrt_probe_fallback'] = isset($argv[2]) ? (string) $argv[2] : '回退币';
+
+ // 场景 1：后台改名后，横条标题跟随自定义货币名。
+ echo aksrt_get_vip_points_exchange_entry_html(1, 0), "\n";
+ // 场景 2：已是会员 → 不输出。
+ echo (aksrt_get_vip_points_exchange_entry_html(1, 2) === '' ? 'VIP_HIDDEN' : 'VIP_SHOWN'), "\n";
+ // 场景 3：catalog 未带 currency_name → 回退到设置里的名称。
+ $GLOBALS['aksrt_probe_currency'] = '';
+ echo aksrt_get_vip_points_exchange_entry_html(1, 0), "\n";
+}
diff --git a/tests/widget-system/vip-points-exchange-description-harness.php b/tests/widget-system/vip-points-exchange-description-harness.php
index bea527a7..84a260eb 100644
--- a/tests/widget-system/vip-points-exchange-description-harness.php
+++ b/tests/widget-system/vip-points-exchange-description-harness.php
@@ -51,11 +51,15 @@ namespace {
'unit' => 'day',
]],
],
- 'user_points' => 1000,
- 'currency_name' => '积分',
+ // 可用 argv 覆盖余额，用于覆盖「不足」分支（套餐价 500）。
+ 'user_points' => isset($GLOBALS['aksrt_probe_points']) ? (int) $GLOBALS['aksrt_probe_points'] : 1000,
+ // 自定义货币名（后台「积分配置 → 自定义货币名称」）：标题/我的X/
+ // 不足提示都跟随它，不硬编码「积分」。
+ 'currency_name' => '书币',
];
}
}
+ $GLOBALS['aksrt_probe_points'] = isset($argv[1]) ? (int) $argv[1] : 1000;
echo (new VipPointsDescriptionProbe())->get_points_exchange_modal_html(1);
}
diff --git a/tests/widget-system/vip-points-exchange-modal.test.cjs b/tests/widget-system/vip-points-exchange-modal.test.cjs
index 3e67e550..ba77acf8 100644
--- a/tests/widget-system/vip-points-exchange-modal.test.cjs
+++ b/tests/widget-system/vip-points-exchange-modal.test.cjs
@@ -35,6 +35,7 @@ const creditsJs = read('assets', 'js', 'credits.js');
const vipCss = read('assets', 'css', 'frontend', 'vip-modal.css');
const vipTab = read('inc', 'helpers', 'user-center-renderers', 'vip-tab.php');
const creditsCss = read('assets', 'css', 'routes', 'user-center', 'credits.css');
+const ledger = read('src', 'Ledger', 'LedgerPresentation.php');
test('弹窗为参考主题 refresh_modal 同构静态壳并带 data 钩子', () => {
assert.match(modal, /public function get_points_exchange_modal_html/);
@@ -105,6 +106,48 @@ test('兑换说明从后台设置实际输出，保留 HTML 并显示在卡片
assert.ok(rendered.indexOf('aksrt-vip-points-desc') < rendered.indexOf('data-aksrt-vip-points-submit'));
});
+test('运行时：自定义货币名改写弹窗标题/我的X/卡片单位，不足提示同源', () => {
+ // harness 的 catalog.currency_name = 书币（模拟后台改名后的设置值）。
+ const rendered = execFileSync(process.env.PHP_BINARY || 'php', [
+ path.join(__dirname, 'vip-points-exchange-description-harness.php'),
+ ], { encoding: 'utf8' });
+ // 标题与「我的书币」盒。
+ assert.match(rendered, /书币兑换会员/);
+ assert.match(rendered, /我的书币/);
+ // 卡片时长行右侧的单位。
+ assert.match(rendered, /500
书币<\/span>/);
+ assert.doesNotMatch(rendered, /积分兑换会员/);
+ assert.doesNotMatch(rendered, /我的积分/);
+ // 余额充足 → 输出兑换 CTA 而非不足提示。
+ assert.match(rendered, /data-aksrt-vip-points-submit/);
+});
+
+test('运行时：余额不足时提示文案同样跟随自定义货币名', () => {
+ // user_points(100) < 套餐价(500) → 走 badg c-red 分支，替换货币名后应显示「书币不足」。
+ const rendered = execFileSync(process.env.PHP_BINARY || 'php', [
+ path.join(__dirname, 'vip-points-exchange-description-harness.php'),
+ '100',
+ ], { encoding: 'utf8' });
+ assert.match(rendered, /书币不足，暂时无法兑换/);
+ assert.doesNotMatch(rendered, /积分不足/);
+ assert.doesNotMatch(rendered, /data-aksrt-vip-points-submit/);
+});
+
+test('运行时：/user/vip/ 入口横条实际渲染出自定义货币名', () => {
+ const out = execFileSync(process.env.PHP_BINARY || 'php', [
+ path.join(__dirname, 'vip-points-entry-harness.php'),
+ ], { encoding: 'utf8' }).split('\n');
+
+ // 场景 1：后台改名后，横条标题 = 「{货币名}兑换会员」，不再硬编码「积分」。
+ assert.match(out[0], /]*data-aksrt-vip-points-open>/);
+ assert.match(out[0], /书币兑换会员/);
+ assert.doesNotMatch(out[0], /积分兑换会员/);
+ // 场景 2：已是会员 → 入口不输出（参考主题门控）。
+ assert.strictEqual(out[1], 'VIP_HIDDEN');
+ // 场景 3：catalog 未带 currency_name → 回退到设置里的名称，不显示空名。
+ assert.match(out[2], /回退币兑换会员/);
+});
+
test('弹窗壳静止态必须被 vip-modal.css 显式隐藏（.flex 覆盖回归护栏）', () => {
assert.match(vipCss, /\.modal\[data-aksrt-vip-points-modal\]\s*\{\s*display:\s*none;/);
assert.match(vipCss, /\.modal\[data-aksrt-vip-points-modal\]\.in\s*\{\s*display:\s*flex;/);
@@ -162,6 +205,35 @@ test('/user/vip/ 入口门控与弹窗壳同源：非会员 + 兑换开启 + 有
assert.match(footer, /int \$vip_level = -1/);
});
+test('/user/vip/ 入口文案跟随自定义货币名称，不硬编码「积分」', () => {
+ // 横条标题取 catalog.currency_name（后台「积分配置 → 自定义货币名称」），
+ // 与它打开的兑换弹窗标题（VipServiceModal）和会员弹窗内入口（pay-vip.js）同源。
+ assert.match(footer, /\$currency = \(string\) \(\$catalog\['currency_name'\] \?\? ''\);/);
+ assert.match(footer, /esc_html\(sprintf\(__\('%s兑换会员', 'aksrt'\), \$currency\)\)/);
+ // 缺失时回退设置里的名称，再回退「积分」。
+ assert.match(footer, /Settings::get_currency_name\(\)/);
+ assert.doesNotMatch(footer, /esc_html__\('积分兑换会员', 'aksrt'\)/);
+ // 弹窗内同一命名路径：标题 / 我的{货币名} / 不足提示都走 $currency。
+ assert.match(modal, /\$currency = \(string\) \(\$catalog\['currency_name'\] \?\? __\('积分', 'aksrt'\)\);/);
+ assert.doesNotMatch(modal, /esc_html__\('积分兑换会员', 'aksrt'\)/);
+});
+
+test('兑换链路文案（弹窗/错误/订单备注/流水）统一跟随货币名', () => {
+ // 不足提示与后端 WP_Error 同文案，均以货币名为前缀。
+ assert.match(modal, /esc_html\(sprintf\(__\('%s不足，暂时无法兑换', 'aksrt'\), \$currency\)\)/);
+ assert.match(catalogSource, /aksrt_points_insufficient', sprintf\(__\('%s不足，暂时无法兑换', 'aksrt'\), \$currency_name\)/);
+ assert.match(catalogSource, /aksrt_points_exchange_disabled', sprintf\(__\('%s兑换会员未启用', 'aksrt'\), \$currency_name\)/);
+ assert.match(catalogSource, /aksrt_invalid_price', sprintf\(__\('兑换%s无效', 'aksrt'\), \$currency_name\)/);
+ // exchange_with_points 自行解析 currency_name（get_catalog 内的局部变量不在该作用域）。
+ assert.match(catalogSource, /\$currency_name = \(string\) \(\$catalog\['currency_name'\] \?\? ''\);/);
+ // 订单备注与流水说明。
+ assert.match(catalogSource, /sprintf\(__\('%1\$s兑换会员 %2\$d %1\$s。', 'aksrt'\), \$currency_name, \$cost\)/);
+ assert.match(catalogSource, /sprintf\(__\('%s兑换会员 · %s', 'aksrt'\), \$currency_name, \(string\) \(\$match\['title'\] \?\? ''\)\)/);
+ // 流水原因标签（用户中心明细里 desc 为空时的回退）。
+ assert.match(ledger, /'vip_points_exchange' => sprintf\(__\('%s兑换会员', 'aksrt'\), self::points_name\(\)\)/);
+ assert.doesNotMatch(ledger, /'vip_points_exchange' => __\('积分兑换会员', 'aksrt'\)/);
+});
+
test('页面入口样式落在 credits.css 且与档位卡同一表面体系', () => {
assert.match(creditsCss, /\.uc-vip-points-entry \{/);
assert.match(creditsCss, /\.uc-vip-points-entry\s*\{[^}]*var\(--main-bg-color, var\(--surface-1, #fff\)\)/s);