fix: проверка связи delivery/payment при оформлении заказа - #459
Merged
Conversation
Ibochkarev
force-pushed
the
fix/issue-374-has-payment-validation
branch
3 times, most recently
from
August 2, 2026 02:31
80faefa to
0afd5bc
Compare
Ibochkarev
force-pushed
the
fix/issue-374-has-payment-validation
branch
2 times, most recently
from
August 7, 2026 18:40
5928cd3 to
d761020
Compare
Centralize msDeliveryMember checks in DeliveryService and enforce them on web submit, checkout field updates, manager create/update, and finalize. Closes #374
Ibochkarev
force-pushed
the
fix/issue-374-has-payment-validation
branch
from
August 7, 2026 18:45
d761020 to
142a18f
Compare
biz87
pushed a commit
that referenced
this pull request
Aug 10, 2026
* test(integration): deepen finalize validation and cart SQLite draft store Cover delivery required_fields without skip_validation, and persist cart add/change/remove through an in-memory SQLite order-product store. * test(finalize): stub msDelivery and delivery service in integration harness OrderFinalizeServiceTest doubles used xPDOSimpleObject for delivery and omitted ms3_delivery_service, which broke after #448/#459 type checks and pair validation on finalize.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Описание
Order::hasPayment()проверял связь черезmsDeliveryMember, но нигде не вызывался.OrderSubmitHandlerпринимал любой активныйpayment_id, даже если он не привязан к выбранной доставке.Добавлены
DeliveryService::isPaymentAvailableForDelivery()иgetDeliveryPaymentPairError(). Проверка подключена на финальных gate’ах: web submit,order/add, manager create/update и finalize.Order::hasPayment()делегирует вDeliveryService.Тип изменений
Связанные Issues
Closes #374
Как это было протестировано?
composer ci:php)Конфигурация тестирования:
Чеклист
ms3_order_err_payment_deliveryДополнительные заметки
Order::hasPayment()сохранён как публичный API и делегирует в сервис (совместимость с miniShop2).