admin/shop-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130 Commits 1 Branch 0 Tags
5adbe9baa7901ca05e1ba4f068eebed7a8f4f88e
Commit Graph

14 Commits

Author SHA1 Message Date
Kirill 5adbe9baa7 test commit 2026-05-19 11:25:23 +05:00
Kirill f855568687 refactor: simplify order status model — remove DELIVERY_FEE_ADJUSTMENT and PAYMENT_VERIFICATION 
- Add deliveryFeeLocked field to Order model
- Remove DELIVERY_FEE_ADJUSTMENT and PAYMENT_VERIFICATION statuses (11→8)
- 3 order paths: delivery+online (locked→unlocked→paid), pickup+online (unlocked→paid), pickup+on_pickup (direct to in_progress)
- Update checkout to use PENDING_PAYMENT + deliveryFeeLocked
- Update payment flow to stay in PENDING_PAYMENT until admin confirms
- Update admin UI to use deliveryFeeLocked instead of status check
- Update client payment UI with new deliveryFeeLocked logic
 2026-05-15 21:55:14 +05:00
@kirill.komarov a06f9cf2c4 Merge branch 'refactor' 2026-05-13 22:07:46 +05:00
@kirill.komarov 7a92991cff deploy 2026-05-11 20:15:01 +05:00
@kirill.komarov 4eda6d0f81 deploy 2026-05-11 15:14:35 +05:00
@kirill.komarov 5ddde15fd3 base commit 2026-05-10 14:28:35 +05:00
@kirill.komarov 97537a8717 base commit 2026-05-10 13:50:44 +05:00
@kirill.komarov ebe1ede25c base commit 2026-05-04 12:34:01 +05:00
@kirill.komarov 6885e39017 base commit 2026-05-03 20:30:21 +05:00
@kirill.komarov fe10f25b8c base commit 2026-05-03 19:57:12 +05:00
@kirill.komarov 9139a24093 base commit 2026-04-30 22:34:55 +05:00
@kirill.komarov 123d86091d base commit 2026-04-29 20:23:30 +05:00
@kirill.komarov f26223091a base commit 2026-04-29 19:29:24 +05:00
@kirill.komarov bfc9661d22 base commit 2026-04-29 19:14:34 +05:00