Fix tokens

Author: lukeholder

src/controllers/CartController.php

@@ -392,7 +392,7 @@ public function actionLoadCart(): ?Response
     {
         $carts = Plugin::getInstance()->getCarts();
         $number = $this->request->getParam('number');
-        $token = $this->request->getParam('token');
+        $token = $this->request->getParam('tokenNumber');
         $loadCartRedirectUrl = Plugin::getInstance()->getSettings()->loadCartRedirectUrl ?? '';
         $redirect = UrlHelper::siteUrl($loadCartRedirectUrl);
 

src/controllers/DownloadsController.php

@@ -82,7 +82,7 @@ public function actionPdf(): Response
         $pdfHandle = $this->request->getQueryParam('pdfHandle');
         $option = $this->request->getQueryParam('option', '');
         $inline = (bool) $this->request->getQueryParam('inline', false);
-        $token = $this->request->getQueryParam('token');
+        $token = $this->request->getQueryParam('tokenNumber');
 
         if (!$number) {
             throw new BadRequestHttpException('Order number required');

src/services/Carts.php

@@ -327,10 +327,16 @@ public function getLoadCartUrl(Order $cart): string
             ['cartNumber' => $cart->number],
         ], expiryDate: $expiryDate);
 
-        return UrlHelper::actionUrl('commerce/cart/load-cart', [
+        $request = Craft::$app->getRequest();
+        $isCpRequest = $request->getIsCpRequest();
+        $request->setIsCpRequest(false);
+        $url = UrlHelper::actionUrl('commerce/cart/load-cart', [
             'number' => $cart->number,
-            'token' => $token,
+            'tokenNumber' => $token,
         ]);
+        $request->setIsCpRequest($isCpRequest);
+
+        return $url;
     }
 
     /**

src/services/Pdfs.php

@@ -462,7 +462,7 @@ public function getPdfUrl(Order $order, string $option = null, string $pdfHandle
         // Build the URL parameters
         $params = [
             'number' => $order->number,
-            'token' => $token,
+            'tokenNumber' => $token,
         ];
 
         if ($pdfHandle !== null) {
@@ -477,7 +477,13 @@ public function getPdfUrl(Order $order, string $option = null, string $pdfHandle
             $params['inline'] = true;
         }
 
-        return UrlHelper::siteUrl('actions/commerce/downloads/pdf', $params);
+        $request = Craft::$app->getRequest();
+        $isCpRequest = $request->getIsCpRequest();
+        $request->setIsCpRequest(false);
+        $url = UrlHelper::actionUrl('commerce/downloads/pdf', $params);
+        $request->setIsCpRequest($isCpRequest);
+
+        return $url;
     }
 
     /**