Merge pull request #11 from bold-commerce/fix-template-fallback

Fix template fallback
bold-commerce · Jan 25, 2024 · e78a56b · e78a56b
2 parents 477965b + 1340d29
commit e78a56b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Block/Checkout.php b/Block/Checkout.php
@@ -28,6 +28,7 @@ class Checkout extends Template
     private const CONFIG_PATH_TEMPLATE_TYPE = 'checkout/bold_checkout_base/template_type';
     private const CONFIG_PATH_TEMPLATE_FILE = 'checkout/bold_checkout_base/template_file';
     private const UPLOAD_DIR = 'bold/checkout/template';
+    private const HOSTED_TEMPLATE_URL = 'https://cashier.boldcommerce.com/assets/experience/';
 
     /**
      * @var Session
@@ -206,7 +207,7 @@ public function getCheckoutTemplateScriptUrl(): string
             return $mediaUrl . self::UPLOAD_DIR . DIRECTORY_SEPARATOR . $templateFile;
         }
 
-        return $this->getViewFileUrl('Bold_CheckoutSelfHosted::js' . DIRECTORY_SEPARATOR . $templateType . '.js');
+        return self::HOSTED_TEMPLATE_URL . $templateType . '.js';
     }
 
     /**

diff --git a/view/frontend/templates/checkout.phtml b/view/frontend/templates/checkout.phtml
@@ -9,7 +9,7 @@ try {
     $orderData = $this->getOrderData();
     $orderId = $this->getPublicOrderId();
 } catch (Exception $e) {
-    echo '<script>window.location.href = "' . $escaper->escapeJs($this->getReturnUrl()) . '"</script>';
+    echo '<script>window.location.href = "' . $escaper->escapeUrl($this->getReturnUrl()) . '"</script>';
     return;
 }
 ?>
@@ -32,6 +32,6 @@ try {
     window.initializedOrder = <?php echo $orderData ?>;
 </script>
 <div id='main'>
-    <script src="<?php echo $escaper->escapeJs($this->getCheckoutTemplateScriptUrl()) ?>"></script>
+    <script src="<?php echo $escaper->escapeUrl($this->getCheckoutTemplateScriptUrl()) ?>"></script>
 </div>
 <footer></footer>