Merge branch '3.0' into 3.1

coreshop · May 22, 2023 · f5a7fb6 · f5a7fb6
2 parents 3a0e477 + c17a769
commit f5a7fb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -101,7 +101,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",
  "sebastian/diff": "^4.0 | ^5.0",
  "stof/doctrine-extensions-bundle": "^1.6",
@@ -160,7 +160,7 @@
  "symfony-tests-dir": "tests",
  "symfony-assets-install": "relative",
  "branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.0-dev"
  }
  },
  "config": {

diff --git 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) {