Skip to content

J
joshine
Commit 8c0a8e3c by liumengfei
Options

Merge branch 'developer' into production

parents 5ab2ee72 e4b28075
Showing with 8 additions and 3 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml
...@@ -116,8 +116,13 @@ $_helper = $block->getData('outputHelper'); ...@@ -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
<img class="hoverImg" width="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" src="<?= $hoverImg ?>"> $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 ?>">
<?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); ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment