Skip to content

feat: integrate upstream merge with commission/ticket/status-page/cus… - #6723

Closed
jinpanda11 wants to merge 1 commit into
QuantumNous:mainfrom
jinpanda11:merge/upstream-2026-08-08
Closed

feat: integrate upstream merge with commission/ticket/status-page/cus…#6723
jinpanda11 wants to merge 1 commit into
QuantumNous:mainfrom
jinpanda11:merge/upstream-2026-08-08

Conversation

@jinpanda11

@jinpanda11 jinpanda11 commented Aug 8, 2026

Copy link
Copy Markdown

…tom-page + payment settings fixes

Merge integration of features from upstream and local additions:

  • commission system (backend + frontend)
  • ticket system (backend + frontend, admin + user views)
  • channel status probe / status page
  • custom page section

Payment settings fixes (AI-assisted):

  • payment-settings-section: import missing Textarea (page 500 crash fix)
  • remove compliance-confirmation gating (backend already returns true; strip banner, dialog, form-lock styling; hardcode complianceConfirmed=true in section-registry and subscriptions-provider)
  • onSubmit diff-check: include MaxTopUp, EpayFee, EpayGateway2, PaymentTip (they were missing from initial snapshot and update push, so saves silently no-op'd)

Chores:

  • .gitignore: add *.log and vendor/
  • deploy workflow + deploy.sh

⚠️ 提交说明 / PR Notice

Important

  • 请提供人工撰写的简洁摘要,避免直接粘贴未经整理的 AI 输出。

📝 变更描述 / Description

(简述:做了什么?为什么这样改能生效?请基于你对代码逻辑的理解来写,避免粘贴未经整理的内容)

🚀 变更类型 / Type of change

  • 🐛 Bug 修复 (Bug fix) - 请关联对应 Issue,避免将设计取舍、理解偏差或预期不一致直接归类为 bug
  • ✨ 新功能 (New feature) - 重大特性建议先通过 Issue 沟通
  • ⚡ 性能优化 / 重构 (Refactor)
  • 📝 文档更新 (Documentation)

🔗 关联任务 / Related Issue

  • Closes # (如有)

✅ 提交前检查项 / Checklist

  • 人工确认: 我已亲自整理并撰写此描述,没有直接粘贴未经处理的 AI 输出。
  • 非重复提交: 我已搜索现有的 IssuesPRs,确认不是重复提交。
  • Bug fix 说明: 若此 PR 标记为 Bug fix,我已提交或关联对应 Issue,且不会将设计取舍、预期不一致或理解偏差直接归类为 bug。
  • 变更理解: 我已理解这些更改的工作原理及可能影响。
  • 范围聚焦: 本 PR 未包含任何与当前任务无关的代码改动。
  • 本地验证: 已在本地运行并通过测试或手动验证,维护者可以据此复核结果。
  • 安全合规: 代码中无敏感凭据,且符合项目代码规范。

📸 运行证明 / Proof of Work

(请在此粘贴截图、关键日志或测试报告,以证明变更生效)

Summary by CodeRabbit

  • New Features
    • Added referral commissions, tier tracking, balance transfers, withdrawals, and administrative commission management.
    • Added user and administrator support ticket creation, replies, assignment, status updates, and reopening.
    • Added authenticated service status pages with availability, latency, uptime, and configurable monitoring.
    • Added customizable pages with configurable navigation, titles, content, and Markdown/HTML/URL rendering.
    • Added dual Epay gateway support, bonuses, fees, payment tips, and top-up limits.
  • Bug Fixes
    • Prevented prohibited accounts from recharging across supported payment methods.
    • Improved payment webhook validation and handling.

…tom-page + payment settings fixes

Merge integration of features from upstream and local additions:
- commission system (backend + frontend)
- ticket system (backend + frontend, admin + user views)
- channel status probe / status page
- custom page section

Payment settings fixes (AI-assisted):
- payment-settings-section: import missing Textarea (page 500 crash fix)
- remove compliance-confirmation gating (backend already returns true;
  strip banner, dialog, form-lock styling; hardcode complianceConfirmed=true
  in section-registry and subscriptions-provider)
- onSubmit diff-check: include MaxTopUp, EpayFee, EpayGateway2, PaymentTip
  (they were missing from initial snapshot and update push, so saves silently
  no-op'd)

Chores:
- .gitignore: add *.log and vendor/
- deploy workflow + deploy.sh
@coderabbitai

coderabbitai Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: e4048b43-4f26-451e-b4ec-133faebf2b84

📥 Commits

Reviewing files that changed from the base of the PR and between 823e263 and c1c0b41.

📒 Files selected for processing (98)
  • .github/workflows/deploy.yml
  • .gitignore
  • controller/channel-test.go
  • controller/channel_status_probe.go
  • controller/commission.go
  • controller/misc.go
  • controller/payment_webhook_availability.go
  • controller/status_page.go
  • controller/subscription.go
  • controller/ticket.go
  • controller/topup.go
  • controller/topup_creem.go
  • controller/topup_stripe.go
  • controller/topup_waffo.go
  • controller/topup_waffo_pancake.go
  • controller/user.go
  • deploy.sh
  • dto/ticket.go
  • go.mod
  • i18n/locales/en.yaml
  • i18n/locales/zh-CN.yaml
  • model/channel_status_probe_log.go
  • model/commission.go
  • model/main.go
  • model/option.go
  • model/redemption.go
  • model/ticket.go
  • model/topup.go
  • model/user.go
  • router/api-router.go
  • service/waffo_pancake.go
  • setting/operation_setting/payment_setting.go
  • setting/operation_setting/payment_setting_old.go
  • setting/operation_setting/status_page_setting.go
  • web/src/components/layout/config/system-settings.config.ts
  • web/src/features/commission/api.ts
  • web/src/features/commission/index.tsx
  • web/src/features/commission/manage/index.tsx
  • web/src/features/commission/types.ts
  • web/src/features/custom-page/api.ts
  • web/src/features/custom-page/index.tsx
  • web/src/features/custom-page/types.ts
  • web/src/features/status/admin-settings.tsx
  • web/src/features/status/api.ts
  • web/src/features/status/components/group-status-card.tsx
  • web/src/features/status/components/recent-bar.tsx
  • web/src/features/status/index.tsx
  • web/src/features/status/types.ts
  • web/src/features/subscriptions/components/subscriptions-provider.tsx
  • web/src/features/system-settings/billing/index.tsx
  • web/src/features/system-settings/billing/section-registry.tsx
  • web/src/features/system-settings/content/custom-page-section.tsx
  • web/src/features/system-settings/general/pricing-section.tsx
  • web/src/features/system-settings/hooks/use-update-option.ts
  • web/src/features/system-settings/integrations/payment-settings-section.tsx
  • web/src/features/system-settings/maintenance/config.ts
  • web/src/features/system-settings/maintenance/header-navigation-section.tsx
  • web/src/features/system-settings/site/index.tsx
  • web/src/features/system-settings/site/section-registry.tsx
  • web/src/features/system-settings/types.ts
  • web/src/features/ticket/api.ts
  • web/src/features/ticket/components/admin-ticket-detail.tsx
  • web/src/features/ticket/components/admin-ticket-list.tsx
  • web/src/features/ticket/components/ticket-create-form.tsx
  • web/src/features/ticket/components/ticket-detail.tsx
  • web/src/features/ticket/components/ticket-list.tsx
  • web/src/features/ticket/components/ticket-status-badge.tsx
  • web/src/features/ticket/types.ts
  • web/src/features/users/components/data-table-row-actions.tsx
  • web/src/features/users/lib/user-actions.ts
  • web/src/features/users/types.ts
  • web/src/features/wallet/components/affiliate-rewards-card.tsx
  • web/src/features/wallet/components/dialogs/payment-confirm-dialog.tsx
  • web/src/features/wallet/components/recharge-form-card.tsx
  • web/src/features/wallet/index.tsx
  • web/src/features/wallet/lib/payment.ts
  • web/src/features/wallet/types.ts
  • web/src/hooks/use-sidebar-data.ts
  • web/src/hooks/use-top-nav-links.ts
  • web/src/i18n/locales/en.json
  • web/src/i18n/locales/fr.json
  • web/src/i18n/locales/ja.json
  • web/src/i18n/locales/ru.json
  • web/src/i18n/locales/vi.json
  • web/src/i18n/locales/zh.json
  • web/src/lib/nav-modules.ts
  • web/src/routeTree.gen.ts
  • web/src/routes/_authenticated/commission/index.tsx
  • web/src/routes/_authenticated/commission/manage/index.tsx
  • web/src/routes/_authenticated/system-settings/status-page/index.tsx
  • web/src/routes/_authenticated/tickets/$id.tsx
  • web/src/routes/_authenticated/tickets/index.tsx
  • web/src/routes/_authenticated/tickets/manage/$id.tsx
  • web/src/routes/_authenticated/tickets/manage/index.tsx
  • web/src/routes/_authenticated/tickets/new.tsx
  • web/src/routes/custom/index.tsx
  • web/src/routes/status/index.tsx
  • web/src/stores/auth-store.ts

Walkthrough

This change adds deployment automation, channel status monitoring, custom pages, support tickets, affiliate commissions, dual Epay payments, recharge restrictions, wallet updates, routes, settings, and localized frontend and backend workflows.

Changes

Deployment and platform

Layer / File(s) Summary
Deployment automation
.github/workflows/deploy.yml, deploy.sh, .gitignore, go.mod
Adds Docker publishing, VPS deployment, local deployment support, ignored log/vendor paths, and an updated dependency classification.

Status and custom pages

Layer / File(s) Summary
Status monitoring
controller/status_page.go, controller/channel_status_probe.go, model/channel_status_probe_log.go, setting/operation_setting/status_page_setting.go
Adds channel probes, probe retention, availability calculations, status cards, and status-page settings APIs.
Status frontend
web/src/features/status/*, web/src/routes/status/index.tsx, web/src/routes/_authenticated/system-settings/status-page/index.tsx
Adds the public status view, periodic refresh, status cards, recent history, and administration controls.
Custom pages
controller/misc.go, model/option.go, web/src/features/custom-page/*, web/src/features/system-settings/content/custom-page-section.tsx
Adds custom-page content and title settings, content retrieval, URL/HTML/Markdown rendering, and navigation configuration.

Support tickets

Layer / File(s) Summary
Ticket domain and API
model/ticket.go, dto/ticket.go, controller/ticket.go, router/api-router.go
Adds ticket persistence, lifecycle operations, user/admin endpoints, validation, pagination, ownership checks, internal messages, assignment, and localized errors.
Ticket frontend
web/src/features/ticket/*, web/src/routes/_authenticated/tickets/*
Adds user ticket creation and discussion screens, administrator filtering and review screens, typed APIs, status badges, and routes.

Affiliate commissions

Layer / File(s) Summary
Commission accounting
model/commission.go, controller/commission.go, model/main.go
Adds commission configuration, wallets, records, recharge processing, transfers, withdrawals, adjustments, promoter reports, dashboards, downline queries, and migrations.
Commission frontend
web/src/features/commission/*, web/src/features/wallet/*, web/src/routes/_authenticated/commission/*
Adds user commission balances and withdrawals, referral data, administration tabs, reporting, configuration, and withdrawal review workflows.

Payments and recharge permissions

Layer / File(s) Summary
Payment configuration and processing
controller/topup.go, model/topup.go, setting/operation_setting/payment_setting_old.go, web/src/features/system-settings/integrations/payment-settings-section.tsx
Adds Epay Gateway 2, gateway-specific checkout and webhook handling, bonuses, fees, limits, tips, return URLs, and commission processing after successful recharge.
Recharge restriction
model/user.go, controller/user.go, controller/subscription.go, model/redemption.go, web/src/features/users/*, web/src/features/wallet/types.ts
Adds persisted recharge permission controls and blocks prohibited users across recharge, subscription balance payment, redemption, and payment flows.

Estimated code review effort

Estimated code review effort: 5 (Critical) | ~120 minutes

Possibly related PRs

Poem

A rabbit hops through status lights,
Counts commissions, tickets, rights.
Two gateways hum, pages grow,
Deploy scripts send the build below.
“Fresh routes bloom!” the rabbit sings,
While probes and payments sprout new wings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Warning

⚠️ This pull request shows signs of AI-generated slop (redundant_comments, ai_padded_prose). It has been flagged by CodeRabbit slop detection and should be reviewed carefully.

@jinpanda11 jinpanda11 closed this Aug 8, 2026
@jinpanda11
jinpanda11 deleted the merge/upstream-2026-08-08 branch August 10, 2026 10:49
@coderabbitai coderabbitai Bot mentioned this pull request Aug 16, 2026
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant