From 1ca6914cd0a4d40e9fe7dde9a380affc58cd2af3 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Mon, 22 May 2023 16:09:56 +0100 Subject: [PATCH 1/3] [Order] fix voucher modifier calling findByCode with null --- src/CoreShop/Component/Order/Modifier/VoucherModifier.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CoreShop/Component/Order/Modifier/VoucherModifier.php b/src/CoreShop/Component/Order/Modifier/VoucherModifier.php index bd40ddb3a7..32cae385e5 100644 --- a/src/CoreShop/Component/Order/Modifier/VoucherModifier.php +++ b/src/CoreShop/Component/Order/Modifier/VoucherModifier.php @@ -77,6 +77,10 @@ public function decrement(OrderInterface $order): void continue; } + if (!$item->getVoucherCode()) { + continue; + } + $voucherCode = $this->voucherCodeRepository->findByCode($item->getVoucherCode()); if ($voucherCode instanceof CartPriceRuleVoucherCodeInterface) { if ($voucherCode->getUses() !== 0) { From 6f67402a6ad5b3239bde91d23647d76a70cefb2e Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Mon, 22 May 2023 17:01:15 +0100 Subject: [PATCH 2/3] [3.0] fix branch alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 970ee35317..826c4f3bb8 100644 --- a/composer.json +++ b/composer.json @@ -158,7 +158,7 @@ "symfony-tests-dir": "tests", "symfony-assets-install": "relative", "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.0-dev" } }, "config": { From c17a769d563ed01113118c22ee5f396cf9f9034a Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Mon, 22 May 2023 17:03:43 +0100 Subject: [PATCH 3/3] [3.0] min requirement is Pimcore 10.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 826c4f3bb8..20732d9d58 100644 --- a/composer.json +++ b/composer.json @@ -100,7 +100,7 @@ "payum/payum-bundle": "^2.5", "php-http/guzzle7-adapter": "^1.0", "php-http/message-factory": "^1.0", - "pimcore/pimcore": "~10.6.1", + "pimcore/pimcore": "^10.5", "rinvex/countries": "^7.3", "stof/doctrine-extensions-bundle": "^1.6", "sylius/theme-bundle": "^2.2",