✨ feat: add subscription billing system (#2808)
* ci: create docker automation * ✨ feat: add subscription billing system with admin management and user purchase flow Implement a new subscription-based billing model alongside existing metered/per-request billing: Backend: - Add subscription plan models (SubscriptionPlan, SubscriptionPlanItem, UserSubscription, etc.) - Implement CRUD APIs for subscription plan management (admin only) - Add user subscription queries with support for multiple active/expired subscriptions - Integrate payment gateways (Stripe, Creem, Epay) for subscription purchases - Implement pre-consume and post-consume billing logic for subscription quota tracking - Add billing preference settings (subscription_first, wallet_first, etc.) - Enhance usage logs with subscription deduction details Frontend - Admin: - Add subscription management page with table view and drawer-based edit form - Match UI/UX style with existing admin pages (redemption codes, users) - Support enabling/disabling plans, configuring payment IDs, and model quotas - Add user subscription binding modal in user management Frontend - Wallet: - Add subscription plans card with current subscription status display - Show all subscriptions (active and expired) with remaining days/usage percentage - Display purchasable plans with pricing cards following SaaS best practices - Extract purchase modal to separate component matching payment confirm modal style - Add skeleton loading states with active animation - Implement billing preference selector in card header - Handle payment gateway availability based on admin configuration Frontend - Usage Logs: - Display subscription deduction details in log entries - Show step-by-step breakdown of subscription usage (pre-consumed, delta, final, remaining) - Add subscription deduction tag for subscription-covered requests * ✨ feat(admin): add user subscription management and refine UI/pagination Add admin APIs to list/create/invalidate/delete user subscriptions Add model helpers to fetch all user subscriptions (incl. expired) and support cancel/hard-delete Wire new admin routes for user subscription operations Replace “Bind subscription plan” entry with a dedicated User Subscriptions SideSheet in Users table Use CardTable with responsive layout and working client-side pagination inside the SideSheet Improve subscription purchase modal empty-gateway state with a Banner notice * ✨ feat(admin): streamline subscription plan benefits editor with bulk actions Restore the avatar/icon header for the “Model Benefits” section Replace scattered controls with a compact toolbar-style workflow Support multi-select add with a default quota for new items Add row selection with bulk apply-to-selected / apply-to-all quota updates Enable delete-selected to manage benefits faster and reduce mistakes * ✨ fix(subscription): finalize payments, log billing, and clean up dead code Complete subscription orders by creating a matching top-up record and writing billing logs Add Epay return handler to verify and finalize browser callbacks Require Stripe/Creem webhook configuration before starting subscription payments Show subscription purchases in topup history with clearer labels/methods Remove unused subscription helper, legacy Creem webhook struct, and unused topup fields Simplify subscription self API payload to active/all lists only * 🎨 style: format all code with gofmt and lint:fix Apply consistent code formatting across the entire codebase using gofmt and lint:fix tools. This ensures adherence to Go community standards and improves code readability and maintainability. Changes include: - Run gofmt on all .go files to standardize formatting - Apply lint:fix to automatically resolve linting issues - Fix code style inconsistencies and formatting violations No functional changes were made in this commit. * ✨ feat(subscription): add quota reset periods and admin configuration - Add reset period fields on subscription plans and user items - Apply automatic quota resets during pre-consume based on plan schedule - Expose reset-period configuration in the admin plan editor - Display reset cadence in subscription cards and purchase modal - Validate custom reset seconds on plan create/update * ✨ feat(subscription): harden subscription billing with resets, idempotency, and production-grade stability Add plan-level quota reset periods and display/reset cadence in admin/UI Enforce natural reset alignment with background reset task and cleanup job Make subscription pre-consume/refund idempotent with request-scoped records and retries Use database time for consistent resets across multi-instance deployments Harden payment callbacks with locking and idempotent order completion Record subscription purchases in topup history and billing logs Optimize subscription queries and add critical composite indexes * ✨ feat(subscription): cache plan lookups and stabilize pre-consume Introduce hybrid caches for subscription plans, items, and plan info with explicit invalidation on admin updates. Streamline pre-consume transactions to reduce redundant queries while preserving idempotency and reset logic. * 🐛 fix(subscription): avoid pre-consume lookup noise Use a RowsAffected check for the idempotency lookup so missing records no longer surface as "record not found" errors while preserving behavior. * 🔧 ci: Change workflow trigger to sub branch Update the Docker image workflow to run on pushes to the sub branch instead of main. * 💸 chore: Align subscription pricing display with global currency settings Unify subscription price rendering to use the site-wide currency symbol/rate on the wallet and admin views. Make subscription plan currency read-only in the editor and force USD on create/update to avoid drift. Use global currency display type when creating Creem checkout payloads. * 🔧 chore: Unify subscription plan status toggle with PATCH endpoint Replace separate enable/disable flows with a single PATCH API that updates the enabled flag. Update frontend hooks and table actions to call the unified endpoint and keep UI behavior consistent. Introduce a minimal admin controller handler and route for the status update. * ✨ feat: Add subscription limits and UI tags consistency Add per-plan purchase limits with backend enforcement and UI disable states. Expose limit configuration in admin plan editor and show limits in plan tables/cards. Refine subscription UI tags with unified badge style and streamlined “My Subscriptions” layout. * 🎨 style: tag color to white * 🚀 refactor: Simplify subscription quota to total amount model Remove per-model subscription items and switch to a single total quota per plan and user subscription. Update billing, reset, and logging flows to operate on total quota, and refactor admin/user UI to configure and display total quota consistently. * 🚀 chore: Remove duplicate subscription usage percentage display Keep the usage percentage shown only in the total quota line to avoid redundant “已用 0%” text while preserving remaining days in the summary. * ✨ feat: Add subscription upgrade group with auto downgrade * ✨ feat: Update subscription purchase modal display Show total quota as currency with tooltip for raw quota, hide reset cycle when never, and display upgrade group when configured to match card display rules. * ✨ feat: Extract quota conversion helpers to shared utils Move quota display/conversion helpers into web/src/helpers/quota.js and update the subscription plan editor to import and use the shared utilities instead of inline functions. * ✨ chore: Add upgrade group guidance in subscription editor Add explanatory helper text under the upgrade group field to clarify automatic group upgrades, rollback conditions, and the expected delay before downgrading takes effect. * 🔧 chore: remove unused Creem settings state Drop the unused originInputs state and redundant updates to keep the Creem settings form state minimal and easier to maintain. * 🚀 chore: Remove useless action * ✨ Add full i18n coverage for subscription-related UI across locales * ✨ feat: harden subscription billing and improve UI consistency Improve subscription payment safety and data integrity by handling user/URL lookup failures, fixing Stripe subscription mode, persisting quota reset fields, and correcting subscription delta accounting and DB timestamp casting. Refine the UI with stricter custom duration validation, accurate currency rounding, conditional Epay labeling, rollback on preference update failure, and shared subscription formatting helpers plus clearer component naming. * 🔧 fix: make epay webhook and return flow subscription-aware Ensure Epay webhook acknowledges success only after order completion, returning fail on processing errors to allow retries. Redirect subscription payment returns to the subscription page instead of top-up for correct user flow. * 🚦 fix: guard epay return success on order completion Redirect subscription return flow to failure when order completion fails, preventing false success states after payment verification. * 🔧 fix: normalize epay error handling and webhook retries Standardize SubscriptionRequestEpay error responses via ApiErrorMsg for a consistent schema. Return "fail" on non-success trade statuses in the epay webhook to preserve retry behavior. * 🧾 fix: persist epay orders before purchase Create the subscription order before initiating epay payment and expire it if the provider call fails, preventing orphaned transactions and improving reconciliation. * 🔧 fix: harden epay callbacks and billing fallbacks Use POST and form parsing for epay notify/return routes, persist epay orders before provider calls with expiry on failure, and ensure notify handlers retry correctly. Restrict subscription-first fallback to insufficient-subscription errors and log refund failures after retries to avoid silent quota drift. * 🔧 fix: harden billing flow and sidebar settings Add missing strings import for subscription fallback checks, log failed subscription refunds after retries, and extend sidebar module settings with a subscription management toggle plus translations. * 🛡️ fix: fail fast on epay form parse errors Handle ParseForm errors in epay notify/return handlers by returning fail or redirecting to failure, avoiding unsafe fallback to query parameters. * ✨ fix: refine Japanese subscription status labels Adjust Japanese UI wording for active-count labels to read more naturally and consistently. * ✅ fix: standardize epay success response schema Return subscription epay pay success responses via ApiSuccess to include the consistent success field and align with error schema.
This commit is contained in:
@@ -2461,7 +2461,6 @@
|
||||
"重新生成备用码失败": "Failed to regenerate backup codes",
|
||||
"重新生成备用码将使现有的备用码失效,请确保您已保存了当前的备用码。": "Regenerating backup codes will invalidate existing backup codes. Please ensure you have saved the current backup codes.",
|
||||
"重绘": "Vary",
|
||||
"重置": "Reset",
|
||||
"重置 2FA": "Reset Two-Factor Authentication",
|
||||
"重置 Passkey": "Reset Passkey",
|
||||
"重置为默认": "Reset to Default",
|
||||
@@ -2602,6 +2601,92 @@
|
||||
"关闭后将不再显示此提示(仅对当前浏览器生效)。确定要关闭吗?": "After closing, this notice will no longer be shown (only for this browser). Are you sure you want to close it?",
|
||||
"关闭提示": "Close notice",
|
||||
"说明:本页测试为非流式请求;若渠道仅支持流式返回,可能出现测试失败,请以实际使用为准。": "Note: Tests on this page use non-streaming requests. If a channel only supports streaming responses, tests may fail. Please rely on actual usage.",
|
||||
"提示:端点映射仅用于模型广场展示,不会影响模型真实调用。如需配置真实调用,请前往「渠道管理」。": "Notice: Endpoint mapping is for Model Marketplace display only and does not affect real model invocation. To configure real invocation, please go to Channel Management."
|
||||
"提示:端点映射仅用于模型广场展示,不会影响模型真实调用。如需配置真实调用,请前往「渠道管理」。": "Notice: Endpoint mapping is for Model Marketplace display only and does not affect real model invocation. To configure real invocation, please go to Channel Management.",
|
||||
"Stripe/Creem 需在第三方平台创建商品并填入 ID": "Stripe/Creem products must be created on the third-party platform and the ID filled in",
|
||||
"暂无订阅套餐": "No subscription plans",
|
||||
"订阅管理": "Subscription Management",
|
||||
"订阅套餐管理": "Subscription Plan Management",
|
||||
"新建套餐": "Create Plan",
|
||||
"套餐": "Plan",
|
||||
"支付渠道": "Payment Channels",
|
||||
"购买上限": "Purchase Limit",
|
||||
"有效期": "Validity",
|
||||
"重置": "Reset",
|
||||
"禁用后用户端不再展示,但历史订单不受影响。是否继续?": "After disabling, it will no longer be shown to users, but historical orders are not affected. Continue?",
|
||||
"启用后套餐将在用户端展示。是否继续?": "After enabling, the plan will be shown to users. Continue?",
|
||||
"更新套餐信息": "Update Plan Info",
|
||||
"创建新的订阅套餐": "Create a New Subscription Plan",
|
||||
"套餐的基本信息和定价": "Basic plan info and pricing",
|
||||
"套餐标题": "Plan Title",
|
||||
"请输入套餐标题": "Please enter plan title",
|
||||
"套餐副标题": "Plan Subtitle",
|
||||
"例如:适合轻度使用": "e.g.: Suitable for light usage",
|
||||
"请输入金额": "Please enter amount",
|
||||
"请输入总额度": "Please enter total quota",
|
||||
"0 表示不限": "0 means unlimited",
|
||||
"原生额度": "Raw quota",
|
||||
"升级分组": "Upgrade Group",
|
||||
"不升级": "No upgrade",
|
||||
"购买或手动新增订阅会升级到该分组;当套餐失效/过期或手动作废/删除后,将回退到升级前分组。回退不会立即生效,通常会有几分钟延迟。": "Purchasing or manually adding a subscription will upgrade to this group. When the plan expires or is invalidated/deleted, it will revert to the previous group. The rollback is not immediate and usually takes a few minutes.",
|
||||
"币种": "Currency",
|
||||
"由全站货币展示设置统一控制": "Controlled by the site-wide currency display settings",
|
||||
"排序": "Sort Order",
|
||||
"启用状态": "Enabled Status",
|
||||
"有效期设置": "Validity Settings",
|
||||
"配置套餐的有效时长": "Configure the plan validity duration",
|
||||
"有效期单位": "Validity Unit",
|
||||
"自定义秒数": "Custom seconds",
|
||||
"请输入秒数": "Please enter seconds",
|
||||
"有效期数值": "Validity Value",
|
||||
"额度重置": "Quota Reset",
|
||||
"支持周期性重置套餐权益额度": "Supports periodic reset of plan quota",
|
||||
"重置周期": "Reset Period",
|
||||
"第三方支付配置": "Third-party Payment Configuration",
|
||||
"Stripe/Creem 商品ID(可选)": "Stripe/Creem Product ID (optional)",
|
||||
"生效": "Active",
|
||||
"已作废": "Invalidated",
|
||||
"用户订阅管理": "User Subscription Management",
|
||||
"选择订阅套餐": "Select subscription plan",
|
||||
"新增订阅": "Add subscription",
|
||||
"暂无订阅记录": "No subscription records",
|
||||
"来源": "Source",
|
||||
"开始": "Start",
|
||||
"结束": "End",
|
||||
"作废": "Invalidate",
|
||||
"确认作废": "Confirm invalidation",
|
||||
"作废后该订阅将立即失效,历史记录不受影响。是否继续?": "After invalidation, the subscription becomes invalid immediately. History is not affected. Continue?",
|
||||
"删除会彻底移除该订阅记录(含权益明细)。是否继续?": "Deletion will permanently remove this subscription record (including benefit details). Continue?",
|
||||
"绑定订阅套餐": "Bind Subscription Plan",
|
||||
"绑定后会立即生成用户订阅(无需支付),有效期按套餐配置计算。": "After binding, a user subscription is created immediately (no payment required); validity follows the plan configuration.",
|
||||
"订阅套餐": "Subscription Plans",
|
||||
"购买订阅获得模型额度/次数": "Purchase a subscription to get model quota/usage",
|
||||
"优先订阅": "Subscription first",
|
||||
"优先钱包": "Wallet first",
|
||||
"仅用订阅": "Subscription only",
|
||||
"仅用钱包": "Wallet only",
|
||||
"我的订阅": "My Subscriptions",
|
||||
"个生效中": "active",
|
||||
"无生效": "No active",
|
||||
"个已过期": "expired",
|
||||
"订阅": "Subscription",
|
||||
"至": "until",
|
||||
"过期于": "Expires at",
|
||||
"购买套餐后即可享受模型权益": "Enjoy model benefits after purchasing a plan",
|
||||
"限购": "Limit",
|
||||
"推荐": "Recommended",
|
||||
"已达到购买上限": "Purchase limit reached",
|
||||
"已达上限": "Limit reached",
|
||||
"立即订阅": "Subscribe now",
|
||||
"暂无可购买套餐": "No plans available for purchase",
|
||||
"该套餐未配置 Stripe": "This plan is not configured for Stripe",
|
||||
"已打开支付页面": "Payment page opened",
|
||||
"支付失败": "Payment failed",
|
||||
"该套餐未配置 Creem": "This plan is not configured for Creem",
|
||||
"已发起支付": "Payment initiated",
|
||||
"购买订阅套餐": "Purchase Subscription Plan",
|
||||
"套餐名称": "Plan Name",
|
||||
"应付金额": "Amount Due",
|
||||
"支付": "Pay",
|
||||
"管理员未开启在线支付功能,请联系管理员配置。": "Online payment is not enabled by the admin. Please contact the administrator."
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user