Merge branch 'developer' into production

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml

@@ -116,8 +116,13 @@ $_helper = $block->getData('outputHelper');
                         <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
                         <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
                            class="product photo product-item-photo"
                            class="product photo product-item-photo"
                            tabindex="-1">
                            tabindex="-1">
-                            <?= $productImage->toHtml() ?>
+                            <?php
+                                $productImageRaw = $imageHelper->init($_product, $imageDisplayArea)->setImageFile($productImage->getFile())->resize($productImage->getWidth(),$productImage->getHeight())->getUrl();
+                            ?>
+                            <img class="product-image-photo" src="<?=  $productImageRaw ?>" loading="lazy" width="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" alt="Image">
+                            <?php if ($hoverImg): ?>
                                 <img class="hoverImg"  width="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" src="<?= $hoverImg ?>">
                                 <img class="hoverImg"  width="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" src="<?= $hoverImg ?>">
+                            <?php endif; ?>
                         </a>
                         </a>
                         <div class="product details product-item-details">
                         <div class="product details product-item-details">
                             <?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>
                             <?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml

@@ -896,7 +896,7 @@ $full_free_ship = $_helper->currency($full_free, true, false);
     <?php $serializedCheckoutConfig = /* @noEscape */ $block->getSerializedCheckoutConfig();
     <?php $serializedCheckoutConfig = /* @noEscape */ $block->getSerializedCheckoutConfig();
     $scriptString = <<<script
     $scriptString = <<<script
         window.checkoutConfig = {$serializedCheckoutConfig};
         window.checkoutConfig = {$serializedCheckoutConfig};
-        window.checkoutConfig.flatrate_price = {$flatraPrice};
+        window.checkoutConfig.flatrate_price = '{$flatraPrice}';
         window.checkoutConfig.full_free_ship = '{$full_free_ship}';
         window.checkoutConfig.full_free_ship = '{$full_free_ship}';
         // Create aliases for customer.js model from customer module
         // Create aliases for customer.js model from customer module
         window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
         window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;