Skip to content

Issues #10559 - Extend swatch using mixins (M2.2) #12929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 16, 2018
Merged

Issues #10559 - Extend swatch using mixins (M2.2) #12929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1350c77
Issues #10559 -Extend swatch using mixins
srenon Dec 29, 2017
33261e0
Add new element attribute
srenon Dec 29, 2017
4fca69d
Add new JSON method
srenon Dec 29, 2017
97779a6
Refactor code for JSON config
srenon Dec 29, 2017
494c9c0
Update renderer.phtml
srenon Dec 29, 2017
20b9575
Update FinalPriceBox.php
srenon Dec 30, 2017
089b468
Update FinalPriceBoxTest.php
srenon Dec 30, 2017
ca471e4
Update Configurable.php
srenon Dec 30, 2017
c84087e
Update Configurable.php
srenon Dec 30, 2017
ec51bd2
Fix error in PHP code sniffer
srenon Dec 30, 2017
d4fa8a5
Update renderer.phtml
srenon Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ protected function wrapResult($html)
{
return '<div class="price-box ' . $this->getData('css_classes') . '" ' .
'data-role="priceBox" ' .
'data-product-id="' . $this->getSaleableItem()->getId() . '"' .
'data-product-id="' . $this->getSaleableItem()->getId() . '" ' .
'data-price-box="product-id-' . $this->getSaleableItem()->getId() . '"' .
'>' . $html . '</div>';
}

Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ public function testRenderMsrpEnabled()

//assert price wrapper
$this->assertEquals(
'<div class="price-box price-final_price" data-role="priceBox" data-product-id="">test</div>',
'<div class="price-box price-final_price" data-role="priceBox" data-product-id="" ' .
'data-price-box="product-id-">test</div>',
$result
);
}
Expand Down
43 changes: 28 additions & 15 deletions app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
/**
* @var Format
*/
private $localeFormat;
protected $localeFormat;

/**
* @var Session
Expand Down Expand Up @@ -211,9 +211,6 @@ public function getJsonConfig()
$store = $this->getCurrentStore();
$currentProduct = $this->getProduct();

$regularPrice = $currentProduct->getPriceInfo()->getPrice('regular_price');
$finalPrice = $currentProduct->getPriceInfo()->getPrice('final_price');

$options = $this->helper->getOptions($currentProduct, $this->getAllowProducts());
$attributesData = $this->configurableAttributeData->getAttributesData($currentProduct, $options);

Expand All @@ -223,17 +220,7 @@ public function getJsonConfig()
'currencyFormat' => $store->getCurrentCurrency()->getOutputFormat(),
'optionPrices' => $this->getOptionPrices(),
'priceFormat' => $this->localeFormat->getPriceFormat(),
'prices' => [
'oldPrice' => [
'amount' => $this->localeFormat->getNumber($regularPrice->getAmount()->getValue()),
],
'basePrice' => [
'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getBaseAmount()),
],
'finalPrice' => [
'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getValue()),
],
],
'prices' => $this->getPrices(),
'productId' => $currentProduct->getId(),
'chooseText' => __('Choose an Option...'),
'images' => $this->getOptionImages(),
Expand All @@ -248,6 +235,32 @@ public function getJsonConfig()

return $this->jsonEncoder->encode($config);
}

/**
* Get product prices for configurable variations
*
* @return array
* @since 100.2.0
*/
protected function getPrices()
{
$currentProduct = $this->getProduct();

$regularPrice = $currentProduct->getPriceInfo()->getPrice('regular_price');
$finalPrice = $currentProduct->getPriceInfo()->getPrice('final_price');

return [
'oldPrice' => [
'amount' => $this->localeFormat->getNumber($regularPrice->getAmount()->getValue()),
],
'basePrice' => [
'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getBaseAmount()),
],
'finalPrice' => [
'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getValue()),
],
];
}

/**
* Get product images for configurable variations
Expand Down
20 changes: 20 additions & 0 deletions app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,26 @@ public function getJsonConfig()
$this->unsetData('allow_products');
return parent::getJsonConfig();
}

/**
* Composes configuration for js price format
*
* @return string
*/
public function getPriceFormatJson()
{
return $this->jsonEncoder->encode($this->localeFormat->getPriceFormat());
}

/**
* Composes configuration for js price
*
* @return string
*/
public function getPricesJson()
{
return $this->jsonEncoder->encode($this->getPrices());
}

/**
* Do not load images for Configurable product with swatches due to its loaded by request
Expand Down
61 changes: 31 additions & 30 deletions app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,38 @@
* See COPYING.txt for license details.
*/
?>
<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */ ?>
<div class="swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>"></div>
<script>
require([
'jquery',
'jquery/ui',
'Magento_Swatches/js/swatch-renderer',
'Magento_Swatches/js/catalog-add-to-cart',
'priceBox'
], function ($) {
var jsonConfig = <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>;

$('.swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>').SwatchRenderer({
selectorProduct: '.product-item-details',
onlySwatches: true,
enableControlLabel: false,
numberToShow: <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct() ?>,
jsonConfig: jsonConfig,
jsonSwatchConfig: <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig() ?>,
mediaCallback: '<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>'
});
<?php
/** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
$productId = $block->getProduct()->getId();
?>
<div class="swatch-opt-<?= /* @escapeNotVerified */ $productId ?>"
data-role="swatch-option-<?= /* @escapeNotVerified */ $productId ?>"></div>

var dataPriceBoxSelector = '[data-role=priceBox]',
dataProductIdSelector = '[data-product-id=<?= $block->escapeHtml($block->getProduct()->getId()) ?>]',
priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
<script type="text/x-magento-init">
{
"[data-role=swatch-option-<?= /* @escapeNotVerified */ $productId ?>]": {
"Magento_Swatches/js/swatch-renderer": {
"selectorProduct": ".product-item-details",
"onlySwatches": true,
"enableControlLabel": false,
"numberToShow": <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct(); ?>,
"jsonConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig(); ?>,
"jsonSwatchConfig": <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig(); ?>,
"mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>"
}
}
}
</script>

priceBoxes.priceBox({
'priceConfig': {
priceFormat: jsonConfig.priceFormat,
prices: jsonConfig.prices
<script type="text/x-magento-init">
{
"[data-role=priceBox][data-price-box=product-id-<?= /* @escapeNotVerified */ $productId ?>]": {
"priceBox": {
"priceConfig": {
"priceFormat": <?= /* @escapeNotVerified */ $block->getPriceFormatJson(); ?>,
"prices": <?= /* @escapeNotVerified */ $block->getPricesJson(); ?>
}
}
});
});
}
}
</script>