P0-R6-E1-R4-1D-B

i18n.py

@@ -427,7 +427,7 @@ TEXTS: dict[str, dict[str, str]] = {
         "payment_channel_label": "本次付款方式",
         "payment_channel_alipay": "Alipay",
         "payment_channel_wechat": "WeChat",
-        "payment_scan_dual": "请使用与本次付款方式一致的二维码（当前选择：{channel}）。付款后将订单号发送给管理员，核实到账后会增加对应版本额度。",
+        "payment_scan_dual": "支付宝和微信二维码对应同一订单。请直接使用任一方式完成付款；无需预先选择支付方式。付款后将订单号发送给管理员，核实真实到账后会增加对应版本额度。",
         "payment_notice_product": "购买{tier}：支付 {amount} {currency} 可增加{credits}篇该版本论文额度。",
         "payment_paid_product": "付款已确认，已增加{credits}篇{tier}论文额度。现在可以继续生成论文。",
         "quota_exhausted": "当前所选版本额度不足，请购买相应版本额度。",
@@ -675,7 +675,7 @@ TEXTS: dict[str, dict[str, str]] = {
         "payment_channel_label": "Payment method for this order",
         "payment_channel_alipay": "Alipay",
         "payment_channel_wechat": "WeChat",
-        "payment_scan_dual": "Use the QR code that matches the selected payment method (current: {channel}). After payment, send the order number to the administrator; the matching plan credits will be added after receipt is verified.",
+        "payment_scan_dual": "The Alipay and WeChat QR codes belong to the same order. Pay with either method; no payment-method selection is required in advance. After payment, send the order number to the administrator. The matching plan credits will be added after the actual receipt is verified.",
         "payment_notice_product": "Purchase {tier}: pay {currency} {amount} to add {credits} paper credits for this plan.",
         "payment_paid_product": "Payment was confirmed. {credits} {tier} paper credits were added. You can generate again now.",
         "quota_exhausted": "The selected plan has no remaining credits. Purchase credits for that plan to continue.",
@@ -923,7 +923,7 @@ TEXTS: dict[str, dict[str, str]] = {
         "payment_channel_label": "Способ оплаты для этого заказа",
         "payment_channel_alipay": "Alipay",
         "payment_channel_wechat": "WeChat",
-        "payment_scan_dual": "Используйте QR-код, соответствующий выбранному способу оплаты (сейчас: {channel}). После оплаты отправьте номер заказа администратору; лимит нужной версии будет добавлен после проверки поступления средств.",
+        "payment_scan_dual": "QR-коды Alipay и WeChat относятся к одному и тому же заказу. Оплатите любым способом — заранее выбирать способ оплаты не нужно. После оплаты отправьте номер заказа администратору; квота нужной версии будет добавлена после подтверждения фактического поступления средств.",
         "payment_notice_product": "Покупка {tier}: оплата {amount} {currency} добавит {credits} квоты на статьи этой версии.",
         "payment_paid_product": "Платёж подтверждён. Добавлено {credits} квоты {tier}. Теперь можно продолжить создание статьи.",
         "quota_exhausted": "Лимит выбранной версии исчерпан. Приобретите лимит для этой версии, чтобы продолжить.",
@@ -1171,7 +1171,7 @@ TEXTS: dict[str, dict[str, str]] = {
         "payment_channel_label": "Осы тапсырыстың төлем тәсілі",
         "payment_channel_alipay": "Alipay",
         "payment_channel_wechat": "WeChat",
-        "payment_scan_dual": "Таңдалған төлем тәсіліне сәйкес QR-кодты пайдаланыңыз (қазір: {channel}). Төлемнен кейін тапсырыс нөмірін әкімшіге жіберіңіз; түсім расталғаннан кейін тиісті нұсқа лимиті қосылады.",
+        "payment_scan_dual": "Alipay және WeChat QR-кодтары бір тапсырысқа тиесілі. Алдын ала төлем тәсілін таңдаудың қажеті жоқ; кез келген тәсілмен төлеңіз. Төлемнен кейін тапсырыс нөмірін әкімшіге жіберіңіз; нақты түсім расталғаннан кейін тиісті нұсқа лимиті қосылады.",
         "payment_notice_product": "{tier} нұсқасын сатып алу: {amount} {currency} төлемі осы нұсқаға {credits} мақала лимитін қосады.",
         "payment_paid_product": "Төлем расталды. {tier} нұсқасына {credits} мақала лимиті қосылды. Енді мақала жасауды жалғастыруға болады.",
         "quota_exhausted": "Таңдалған нұсқаның лимиті таусылды. Жалғастыру үшін осы нұсқаға лимит сатып алыңыз.",

managed_auth.py

@@ -618,32 +618,19 @@ def _render_payment_purchase_body(language: str) -> None:
         if (existing_sku and existing_sku != package_sku) or (existing_order and order_sku != package_sku):
             st.session_state["sp_payment_order"] = None
             st.session_state["sp_payment_request_id"] = ""
+            existing_order = None
     else:
         st.warning(tr(language, "payment_notice"))
 
-    frozen_order_channel = (
-        str((existing_order or {}).get("payment_channel") or "").strip().upper()
-        if isinstance(existing_order, dict)
-        else ""
-    )
-    if frozen_order_channel in {"ALIPAY", "WECHAT"}:
-        st.session_state["sp_payment_channel"] = frozen_order_channel
-    payment_channel = st.radio(
-        tr(language, "payment_channel_label"),
-        ("ALIPAY", "WECHAT"),
-        index=0 if str(st.session_state.get("sp_payment_channel") or "ALIPAY").upper() != "WECHAT" else 1,
-        format_func=lambda value: tr(language, f"payment_channel_{value.lower()}"),
-        horizontal=True,
-        disabled=bool(existing_order),
-        key="sp_payment_channel",
-    )
-
-    if st.button(tr(language, "payment_create"), key="sp_create_payment_order"):
+    # R4-1D: opening the purchase dialog is the explicit purchase action.
+    # Create one trusted order for the selected server-authoritative SKU;
+    # users no longer preselect a payment channel or click a second create button.
+    if not existing_order and not str(st.session_state.get("sp_payment_request_id") or "").strip():
         st.session_state["sp_payment_request_id"] = (
             f"pay_{int(time.time() * 1000)}_{secrets.token_urlsafe(12)}"
         )
         st.session_state["sp_payment_package_sku"] = package_sku
-        st.session_state["sp_payment_order_channel"] = str(payment_channel).upper()
+        st.session_state["sp_payment_order_channel"] = ""
 
     request_id = str(st.session_state.get("sp_payment_request_id") or "").strip()
     order = st.session_state.get("sp_payment_order")
@@ -652,7 +639,6 @@ def _render_payment_purchase_body(language: str) -> None:
         order_result = create_payment_order(
             request_id,
             package_sku or None,
-            str(st.session_state.get("sp_payment_order_channel") or payment_channel),
         )
         order = dict(order_result.get("order") or {})
         if not order.get("merchant_order_no") or not order.get("qr_code"):
@@ -668,7 +654,6 @@ def _render_payment_purchase_body(language: str) -> None:
     qr_code = str(order.get("qr_code") or "").strip()
     if qr_code:
         payment_provider = str(order.get("payment_provider") or "").strip().upper()
-        payment_channel = str(order.get("payment_channel") or st.session_state.get("sp_payment_order_channel") or "ALIPAY").strip().upper()
         if payment_provider == "MANUAL_ALIPAY":
             alipay_bytes = _qr_png_bytes(qr_code)
             wechat_path = Path(__file__).resolve().parent / "static" / "payment_wechat_qr.png"
@@ -722,7 +707,7 @@ def _render_payment_purchase_body(language: str) -> None:
                 """,
                 unsafe_allow_html=True,
             )
-            st.caption(tr(language, "payment_scan_dual", channel=tr(language, f"payment_channel_{payment_channel.lower()}")))
+            st.caption(tr(language, "payment_scan_dual"))
         else:
             st.image(_qr_png_bytes(qr_code), width=280)
         order_no = str(order.get("merchant_order_no") or "").strip()