Commit Graph

6 Commits

Author SHA1 Message Date
Kirill b0b2872cf8 refactor: remove duplicate order status labels, use ORDER_STATUS_DATA as single source 2026-05-27 21:54:53 +05:00
Kirill a176955521 test commit 2026-05-21 12:18:36 +05:00
Kirill faac332138 feat: implement yookassa redirect payment flow on client 2026-05-20 19:28:46 +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 c6b542bd95 fix: TypeScript errors — NominatimItem import, unknown ReactNode, unused deliveryType, effect generics, export name 2026-05-13 22:16:00 +05:00
@kirill.komarov a06f9cf2c4 Merge branch 'refactor' 2026-05-13 22:07:46 +05:00