Commit Graph
757 Commits
Author SHA1 Message Date
kate522 ad40d9a7ca fix(orders): wire detail progress timeline and two-step cancel
Order progress was stuck on "订单创建" because timeline only read sparse
timestamp columns and status transitions didn't always stamp them.
Drive timeline from current status + related records, backfill lifecycle
timestamps on update_status, and replace window.confirm cancel with a
关闭订单 → 确认取消 button step in the detail modal.
2026-07-27 15:15:35 +08:00
kate522 64d0dc66da Merge pull request 'fix(orders): drop secondary "我的余额/会员/积分" link from detail modal' (#311) from worktree-order-center-list into main
Reviewed-on: CYL/wordpress-theme-aksrt#311
2026-07-27 14:00:58 +08:00
kate522 eac58f07bf feat(orders): polish detail modal layout and visuals
Restructure the order detail modal into status-tinted hero, product
card, info list with copyable order number, multi-item lines, and a
newest-first timeline. Refresh spacing, dark mode, and footer buttons.
2026-07-27 13:54:34 +08:00
kate522 e6eee91eb3 fix(orders): drop secondary "我的余额/会员/积分" link from detail modal
The user center already has a dedicated tab for these; showing the
secondary shortcut inside the order detail modal is redundant noise.
The view-model field is kept for other consumers.
2026-07-27 13:40:23 +08:00
kate522 0c3e33bed4 Merge pull request 'feat(orders): redesign detail modal — hero pill, no duplicate close' (#310) from worktree-order-center-list into main
Reviewed-on: CYL/wordpress-theme-aksrt#310
2026-07-27 13:37:15 +08:00
kate522 e47a3958fb feat(orders): redesign detail modal — hero pill, no duplicate close
- Remove bottom "关闭" button so the top-right ✕ is the single dismiss.
- Drop redundant 订单类型 row from modal body (already shown as card chip).
- Add hero strip with status pill + amount; unify dt/dd rows into a
  bordered card; tighten items list and add timeline rail.
- Refresh modal styling: rounded dialog, gradient header, hover-lift
  buttons, mobile-friendly rows.
2026-07-27 13:34:30 +08:00
kate522 1648df8457 Merge pull request 'feat(orders): order detail modal, list actions, use configured prefix' (#309) from worktree-order-center-list into main
Reviewed-on: CYL/wordpress-theme-aksrt#309
2026-07-27 13:13:15 +08:00
kate522 a1e35a4499 feat(orders): order detail modal, list actions, use configured prefix
Wire admin payment_order_prefix into order number generation (with 32-char
cap for gateways), make 查看 open a full order-detail modal with
status-aware footer actions, keep type badge top-left only, and right-align
unpaid list actions with countdown on the left.
2026-07-27 12:39:21 +08:00
kate522 5e1e2e2634 Merge pull request 'Worktree tighten payment gateways' (#308) from worktree-tighten-payment-gateways into main
Reviewed-on: CYL/wordpress-theme-aksrt#308
2026-07-27 11:44:55 +08:00
kate522andClaude Fable 5 abc3f1565f fix(payment): reject duplicate provider transactions
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-27 11:31:39 +08:00
kate522andClaude Fable 5 089421cd3e fix(payment): unify and harden payment attempts
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-27 11:29:57 +08:00
kate522 158b0d0e61 Merge pull request 'Worktree tighten payment gateways' (#307) from worktree-tighten-payment-gateways into main
Reviewed-on: CYL/wordpress-theme-aksrt#307
2026-07-26 13:43:38 +08:00
kate522andClaude Fable 5 53933988bf fix(payment): resolve provider out_trade_no on Alipay refund query
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-26 13:29:47 +08:00
kate522andClaude Fable 5 ed55d302e9 fix(payment): re-pay with fresh provider out_trade_no
WeChat/Alipay/Epay reject reusing the same merchant order number when
params change. Allocate attempt-suffixed out_trade_no on resume pay,
map callbacks back to the local order, and best-effort close prior trades.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-26 13:28:45 +08:00
kate522 12147d9cac Merge pull request 'feat(payment): tighten gateways and implement Epay' (#306) from worktree-tighten-payment-gateways into main
Reviewed-on: CYL/wordpress-theme-aksrt#306
2026-07-26 13:13:25 +08:00
kate522andClaude Fable 5 723dd180e4 feat(payment): tighten gateways and implement Epay
Keep only balance, Alipay, WeChat, PayPal, Stripe, Epay, and card-pass
channels; remove placeholder aggregators. Add dual-channel Epay gateway
with MD5 notify/return, register cashier methods, and gate card-pass
redeem behind the payment channel switch.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-26 12:59:28 +08:00
kate522 aa4bdfb5c4 Merge pull request 'fix(payment): harden payment and refund chains' (#305) from fix/payment-chain-hardening into main
Reviewed-on: CYL/wordpress-theme-aksrt#305
2026-07-26 02:40:55 +08:00
kate522 53ff99f343 fix(payment): harden payment and refund chains 2026-07-26 02:29:46 +08:00
kate522 c70fbe9835 Merge pull request 'refactor(payment): migrate SDK to yansongda pay' (#304) from worktree-pay-sdk-yansongda into main
Reviewed-on: CYL/wordpress-theme-aksrt#304
2026-07-26 00:14:52 +08:00
kate522 a8d99b200b refactor(payment): migrate SDK to yansongda pay 2026-07-26 00:09:38 +08:00
kate522 8fbde0785e Merge pull request 'fix(uc): drop 我的订单 from 我的服务; keep under 权益与消费' (#303) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#303
2026-07-25 16:33:19 +08:00
kate522 a93aab991e fix(uc): drop 我的订单 from 我的服务; keep under 权益与消费 2026-07-25 16:31:43 +08:00
kate522 6f56294159 Merge pull request 'fix(user): enable pretty /user and /profile when permalinks empty' (#302) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#302
2026-07-25 16:24:35 +08:00
kate522 6abcdf65e0 fix(user): enable pretty /user and /profile when permalinks empty 2026-07-25 15:56:11 +08:00
kate522 6c2682b835 Merge pull request 'fix(ip-geo): fallback free lookup when Amap key platform mismatches' (#301) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#301
2026-07-25 15:47:43 +08:00
kate522 06d4844c8e fix(ip-geo): fallback free lookup when Amap key platform mismatches 2026-07-25 15:46:36 +08:00
kate522 0183c60bf3 Merge pull request 'fix(ip-geo): real pconline + amap sig/errors; clearer admin test failures' (#300) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#300
2026-07-25 15:38:18 +08:00
kate522 62478a02fd fix(ip-geo): real pconline + amap sig/errors; clearer admin test failures 2026-07-25 15:31:38 +08:00
kate522 3ea1be02ed Merge pull request 'refactor(ip-geo): drop dual-read gates; keep single meta and four surfaces' (#299) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#299
2026-07-25 15:21:01 +08:00
kate522 3bb7fb0ba6 refactor(ip-geo): drop dual-read gates; keep single meta and four surfaces
Canonical keys only (ip_geo_display defaults to all four, aksrt_user_addr /
aksrt_comment_addr only). Self-view still resolves current IP on read.
2026-07-25 15:14:29 +08:00
kate522 09035278d5 Merge pull request 'fix(auth): logout without /logout rewrite (avoid Apache 404)' (#298) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#298
2026-07-25 15:10:35 +08:00
kate522 6e71008d00 fix(auth): logout without /logout rewrite (avoid Apache 404) 2026-07-25 15:09:58 +08:00
kate522 8c2901fcbb Merge pull request 'fix(user): show IP city on home/center and force /user + profile templates' (#297) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#297
2026-07-25 15:04:24 +08:00
kate522 820fafd8a7 fix(user): show IP city on home/center and force /user + profile templates 2026-07-25 15:02:57 +08:00
kate522 61a17ff527 Merge pull request 'feat(ip-geo): full-chain IP 归属地 on comments, user home, center, post' (#296) from worktree-ip-location-display into main
Reviewed-on: CYL/wordpress-theme-aksrt#296
2026-07-25 14:43:23 +08:00
kate522 ac7ff8d4f2 feat(ip-geo): full-chain IP 归属地 on comments, user home, center, post 2026-07-25 14:39:47 +08:00
kate522 1f2ca3ac8f Merge pull request 'fix(orders): restore frontend pay REST and harden order-center client' (#295) from worktree-feat-orders-in-uc into main
Reviewed-on: CYL/wordpress-theme-aksrt#295
2026-07-25 14:16:55 +08:00
kate522 9277674da0 fix(orders): restore frontend pay REST and harden order-center client
Add AKSRT\Payment\OrderCenterRest so /shop/frontend/orders/{n}/pay|cancel
always register on rest_api_init; widen order_number route charset; make
order-center.js use credentials, encodeURIComponent, and clearer 404 errors.
2026-07-25 14:12:40 +08:00
kate522 7896c43acc Merge pull request 'style(orders): polish UC order center cards, tabs, and empty state' (#294) from worktree-feat-orders-in-uc into main
Reviewed-on: CYL/wordpress-theme-aksrt#294
2026-07-25 14:00:20 +08:00
kate522 3117081a58 style(orders): polish UC order center cards, tabs, and empty state
Refresh orders.css for embedded user-center layout: segmented status
tabs, stat tiles, card hierarchy, action pills, after-sale list, and
dark mode; light HTML polish for title and empty state.
2026-07-25 13:58:44 +08:00
kate522 ed5a1f592d Merge pull request 'feat(orders): embed My Orders inside user center (zibll-style)' (#293) from worktree-feat-orders-in-uc into main
Reviewed-on: CYL/wordpress-theme-aksrt#293
2026-07-25 13:55:06 +08:00
kate522 354a1072ef feat(orders): embed My Orders inside user center (zibll-style)
Register UC panel tab=orders with full order list/actions UI; route
aksrt_get_orders_page_url and /orders template to profile?tab=orders;
enqueue order assets when the UC orders tab is active.
2026-07-25 13:54:08 +08:00
kate522 dae85f0198 Merge pull request 'Worktree feat my orders' (#292) from worktree-feat-my-orders into main
Reviewed-on: CYL/wordpress-theme-aksrt#292
2026-07-25 13:42:06 +08:00
kate522 a8760b976a fix(orders): enqueue cart/revenue assets on virtual routes 2026-07-25 13:41:21 +08:00
kate522 59901bdc26 fix(orders): route /orders without WP page (404)
Register commerce rewrite aliases and special-template bootstrap so
/orders loads page-orders even when no page is assigned; flush rules.
2026-07-25 13:40:56 +08:00
kate522 7b0668bcf3 Merge pull request 'feat(orders): full-chain My Orders for all product types' (#291) from worktree-feat-my-orders into main
Reviewed-on: CYL/wordpress-theme-aksrt#291
2026-07-25 13:34:31 +08:00
kate522 3baa8573c9 feat(orders): full-chain My Orders for all product types
Unify front-end order center across shop, content, VIP, recharge,
points, and plate-follow with type filters, stats, and type-aware
cards; keep shop-only fulfillment actions; ensure 权益与消费 entry URL.
2026-07-25 13:33:43 +08:00
kate522 85ade059a2 Merge pull request 'fix(payment): align plate-follow cash preview with wallet balance' (#290) from worktree-fix-balance-chain into main
Reviewed-on: CYL/wordpress-theme-aksrt#290
2026-07-25 13:15:07 +08:00
kate522 daba099755 fix(payment): align plate-follow cash preview with wallet balance
Use cash wallet for plate follow cashiers and stop stubbing methods when Gateway is missing.
2026-07-25 13:13:56 +08:00
kate522 8bc2a934c2 Merge pull request 'fix(rest): build signin URLs from restUrl under plain permalinks' (#289) from worktree-fix-user-card-vip-btn into main
Reviewed-on: CYL/wordpress-theme-aksrt#289
2026-07-25 13:11:38 +08:00