kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixes after upmerge

Browse source
This commit is contained in:
Adam Kasperczak 2021-05-07 11:40:03 +02:00
parent dd74127f2f
commit 3653caeea0
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
features/checkout/preventing_adding_to_cart_disabled_products.feature
View file

@ -16,7 +16,6 @@ Feature: Preventing adding to cart disabled products
Given the product "PHP T-Shirt" has been disabled
When I pick up my cart
And I try to add product "PHP T-Shirt" to the cart
Then I should be informed that product "PHP T-Shirt" is disabled
Then I should be informed that product "PHP T-Shirt" does not exist
@api

4
src/Sylius/Bundle/ApiBundle/Validator/Constraints/ProductOrVariantEnabled.php
View file

@ -19,11 +19,7 @@ use Symfony\Component\Validator\Constraint;
final class ProductOrVariantEnabled extends Constraint
{
/** @var string */
<<<<<<< HEAD
public $message = 'sylius.order.product_eligibility';
=======
public $message = 'sylius.order.product_does_not_exist';
>>>>>>> 1.9
public function validatedBy(): string
{