Merge remote-tracking branch 'origin/1.0' into 1.x

pimcore · Nov 23, 2023 · fcae91b · fcae91b
2 parents aa8971f + 368cddc
commit fcae91b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Controller/AdminOrderController.php b/src/Controller/AdminOrderController.php
@@ -329,7 +329,7 @@ public function detailAction(
             $quantity = null;
 
             // get avatar
-            $user = User::getById($note->getUser());
+            $user = $note->getUser() ? User::getById($note->getUser()) : null;
             $avatar = $user ? sprintf('/admin/user/get-image?id=%d', $user->getId()) : null;
 
             // group events

diff --git a/src/PricingManager/Condition/VoucherToken.php b/src/PricingManager/Condition/VoucherToken.php
@@ -59,11 +59,7 @@ public function check(EnvironmentInterface $environment): bool
 
     public function checkVoucherCode(string $code): bool
     {
-        if (in_array(VoucherServiceToken::getByCode($code)->getVoucherSeriesId(), $this->allowListIds)) {
-            return true;
-        }
-
-        return false;
+        return in_array(VoucherServiceToken::getByCode($code)?->getVoucherSeriesId(), $this->allowListIds);
     }
 
     public function toJSON(): string