Merge pull request #1110 from plentymarkets/fix/notexisting_configvalue

FIX: remove config value
plentymarkets · Jun 29, 2022 · 73859be · 73859be
2 parents 575b0de + c701a65
commit 73859be
Showing 1 changed file with 13 additions and 21 deletions.
diff --git a/src/Services/OrderService.php b/src/Services/OrderService.php
@@ -281,31 +281,23 @@ public function findOrderById(int $orderId, $wrap = true)
      */
     public function findOrderByAccessKey($orderId, $orderAccessKey)
     {
-        /**
-         * @var TemplateConfigService $templateConfigService
-         */
-        $templateConfigService = pluginApp(TemplateConfigService::class);
-        $redirectToLogin = $templateConfigService->getBoolean('my_account.confirmation_link_login_redirect');
-
         $order = $this->orderRepository->findOrderByAccessKey($orderId, $orderAccessKey);
 
-        if ($redirectToLogin) {
-            $orderContactId = 0;
-            foreach ($order->relations as $relation) {
-                if ($relation['referenceType'] == 'contact' && (int)$relation['referenceId'] > 0) {
-                    $orderContactId = $relation['referenceId'];
-                }
+        $orderContactId = 0;
+        foreach ($order->relations as $relation) {
+            if ($relation['referenceType'] == 'contact' && (int)$relation['referenceId'] > 0) {
+                $orderContactId = $relation['referenceId'];
             }
+        }
 
-            if ((int)$orderContactId > 0) {
-                if ((int)$this->contactRepository->getContactId() <= 0) {
-                    /** @var ShopUrls $shopUrls */
-                    $shopUrls = pluginApp(ShopUrls::class);
-                    $backlink = $this->getConfirmationUrl($shopUrls->confirmation, $orderId, $orderAccessKey);
-                    AuthGuard::redirect($shopUrls->login . '?backlink=' . $backlink);
-                } elseif ((int)$orderContactId !== (int)$this->contactRepository->getContactId()) {
-                    return null;
-                }
+        if ((int)$orderContactId > 0) {
+            if ((int)$this->contactRepository->getContactId() <= 0) {
+                /** @var ShopUrls $shopUrls */
+                $shopUrls = pluginApp(ShopUrls::class);
+                $backlink = $this->getConfirmationUrl($shopUrls->confirmation, $orderId, $orderAccessKey);
+                AuthGuard::redirect($shopUrls->login . '?backlink=' . $backlink);
+            } elseif ((int)$orderContactId !== (int)$this->contactRepository->getContactId()) {
+                return null;
             }
         }
         return LocalizedOrder::wrap($order, Utils::getLang());