-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MAGETWO-57000: [Backport] Simple child product without a special pric…
- Loading branch information
Sergey Semenov
committed
Sep 8, 2016
1 parent
5f8e97e
commit ff52db4
Showing
5 changed files
with
299 additions
and
2 deletions.
There are no files selected for viewing
60 changes: 60 additions & 0 deletions
60
app/code/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
<?php | ||
/** | ||
* Copyright © 2016 Magento. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
namespace Magento\ConfigurableProduct\Pricing\Render; | ||
|
||
use Magento\Catalog\Pricing\Price\FinalPrice; | ||
use Magento\Catalog\Pricing\Price\RegularPrice; | ||
use Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsProviderInterface; | ||
use Magento\Framework\Pricing\Price\PriceInterface; | ||
use Magento\Framework\Pricing\Render\RendererPool; | ||
use Magento\Framework\Pricing\SaleableInterface; | ||
use Magento\Framework\View\Element\Template\Context; | ||
|
||
class FinalPriceBox extends \Magento\Catalog\Pricing\Render\FinalPriceBox | ||
{ | ||
/** | ||
* @var ConfigurableOptionsProviderInterface | ||
*/ | ||
private $configurableOptionsProvider; | ||
|
||
/** | ||
* @param Context $context | ||
* @param SaleableInterface $saleableItem | ||
* @param PriceInterface $price | ||
* @param RendererPool $rendererPool | ||
* @param ConfigurableOptionsProviderInterface $configurableOptionsProvider | ||
* @param array $data | ||
*/ | ||
public function __construct( | ||
Context $context, | ||
SaleableInterface $saleableItem, | ||
PriceInterface $price, | ||
RendererPool $rendererPool, | ||
ConfigurableOptionsProviderInterface $configurableOptionsProvider, | ||
array $data = [] | ||
) { | ||
$this->configurableOptionsProvider = $configurableOptionsProvider; | ||
parent::__construct($context, $saleableItem, $price, $rendererPool, $data); | ||
} | ||
|
||
/** | ||
* Define if the special price should be shown | ||
* | ||
* @return bool | ||
*/ | ||
public function hasSpecialPrice() | ||
{ | ||
$product = $this->getSaleableItem(); | ||
foreach ($this->configurableOptionsProvider->getProducts($product) as $subProduct) { | ||
$regularPrice = $subProduct->getPriceInfo()->getPrice(RegularPrice::PRICE_CODE)->getValue(); | ||
$finalPrice = $subProduct->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue(); | ||
if ($finalPrice < $regularPrice) { | ||
return true; | ||
} | ||
} | ||
return false; | ||
} | ||
} |
137 changes: 137 additions & 0 deletions
137
app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
<?php | ||
/** | ||
* Copyright © 2016 Magento. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
namespace Magento\ConfigurableProduct\Test\Unit\Pricing\Render; | ||
|
||
use Magento\Catalog\Pricing\Price\FinalPrice; | ||
use Magento\Catalog\Pricing\Price\RegularPrice; | ||
use Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsProviderInterface; | ||
use Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox; | ||
|
||
class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase | ||
{ | ||
/** | ||
* @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $context; | ||
|
||
/** | ||
* @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $saleableItem; | ||
|
||
/** | ||
* @var \Magento\Framework\Pricing\Price\PriceInterface|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $price; | ||
|
||
/** | ||
* @var \Magento\Framework\Pricing\Render\RendererPool|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $rendererPool; | ||
|
||
/** | ||
* @var ConfigurableOptionsProviderInterface|\PHPUnit_Framework_MockObject_MockObject | ||
*/ | ||
private $configurableOptionsProvider; | ||
|
||
/** | ||
* @var FinalPriceBox | ||
*/ | ||
private $model; | ||
|
||
protected function setUp() | ||
{ | ||
$this->context = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
|
||
$this->saleableItem = $this->getMockBuilder(\Magento\Catalog\Model\Product::class) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
|
||
$this->price = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class) | ||
->getMockForAbstractClass(); | ||
|
||
$this->rendererPool = $this->getMockBuilder(\Magento\Framework\Pricing\Render\RendererPool::class) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
|
||
$this->configurableOptionsProvider = $this->getMockBuilder(ConfigurableOptionsProviderInterface::class) | ||
->getMockForAbstractClass(); | ||
|
||
$this->model = new FinalPriceBox( | ||
$this->context, | ||
$this->saleableItem, | ||
$this->price, | ||
$this->rendererPool, | ||
$this->configurableOptionsProvider | ||
); | ||
} | ||
|
||
/** | ||
* @param float $regularPrice | ||
* @param float $finalPrice | ||
* @param bool $expected | ||
* @dataProvider hasSpecialPriceDataProvider | ||
*/ | ||
public function testHasSpecialPrice( | ||
$regularPrice, | ||
$finalPrice, | ||
$expected | ||
) { | ||
$priceMockOne = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class) | ||
->getMockForAbstractClass(); | ||
|
||
$priceMockOne->expects($this->once()) | ||
->method('getValue') | ||
->willReturn($regularPrice); | ||
|
||
$priceMockTwo = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class) | ||
->getMockForAbstractClass(); | ||
|
||
$priceMockTwo->expects($this->once()) | ||
->method('getValue') | ||
->willReturn($finalPrice); | ||
|
||
$priceInfoMock = $this->getMockBuilder(\Magento\Framework\Pricing\PriceInfo\Base::class) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
|
||
$priceInfoMock->expects($this->exactly(2)) | ||
->method('getPrice') | ||
->willReturnMap([ | ||
[RegularPrice::PRICE_CODE, $priceMockOne], | ||
[FinalPrice::PRICE_CODE, $priceMockTwo], | ||
]); | ||
|
||
$productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class) | ||
->setMethods(['getPriceInfo']) | ||
->getMockForAbstractClass(); | ||
|
||
$productMock->expects($this->exactly(2)) | ||
->method('getPriceInfo') | ||
->willReturn($priceInfoMock); | ||
|
||
$this->configurableOptionsProvider->expects($this->once()) | ||
->method('getProducts') | ||
->with($this->saleableItem) | ||
->willReturn([$productMock]); | ||
|
||
$this->assertEquals($expected, $this->model->hasSpecialPrice()); | ||
} | ||
|
||
/** | ||
* @return array | ||
*/ | ||
public function hasSpecialPriceDataProvider() | ||
{ | ||
return [ | ||
[10., 20., false], | ||
[10., 10., false], | ||
[20., 10., true], | ||
]; | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
app/code/Magento/ConfigurableProduct/view/base/layout/catalog_product_prices.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<?xml version="1.0"?> | ||
<!-- | ||
/** | ||
* Copyright © 2016 Magento. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
--> | ||
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd"> | ||
<referenceBlock name="render.product.prices"> | ||
<arguments> | ||
<argument name="configurable" xsi:type="array"> | ||
<item name="prices" xsi:type="array"> | ||
<item name="final_price" xsi:type="array"> | ||
<item name="render_class" xsi:type="string">Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox</item> | ||
<item name="render_template" xsi:type="string">Magento_ConfigurableProduct::product/price/final_price.phtml</item> | ||
</item> | ||
</item> | ||
</argument> | ||
</arguments> | ||
</referenceBlock> | ||
</layout> |
60 changes: 60 additions & 0 deletions
60
app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
<?php | ||
/** | ||
* Copyright © 2016 Magento. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
|
||
// @codingStandardsIgnoreFile | ||
|
||
?> | ||
|
||
<?php | ||
/** @var \Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox$block */ | ||
|
||
/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */ | ||
$priceModel = $block->getPriceType('regular_price'); | ||
|
||
/** @var \Magento\Framework\Pricing\Price\PriceInterface $finalPriceModel */ | ||
$finalPriceModel = $block->getPriceType('final_price'); | ||
$idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : ''; | ||
$schema = ($block->getZone() == 'item_view') ? true : false; | ||
?> | ||
<?php if ($block->hasSpecialPrice()): ?> | ||
<span class="special-price"> | ||
<?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [ | ||
'display_label' => __('Special Price'), | ||
'price_id' => $block->getPriceId('product-price-' . $idSuffix), | ||
'price_type' => 'finalPrice', | ||
'include_container' => true, | ||
'schema' => $schema | ||
]); ?> | ||
</span> | ||
<span class="old-price sly-old-price no-display"> | ||
<?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [ | ||
'display_label' => __('Regular Price'), | ||
'price_id' => $block->getPriceId('old-price-' . $idSuffix), | ||
'price_type' => 'oldPrice', | ||
'include_container' => true, | ||
'skip_adjustments' => true | ||
]); ?> | ||
</span> | ||
<?php else: ?> | ||
<?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [ | ||
'price_id' => $block->getPriceId('product-price-' . $idSuffix), | ||
'price_type' => 'finalPrice', | ||
'include_container' => true, | ||
'schema' => $schema | ||
]); ?> | ||
<?php endif; ?> | ||
|
||
<?php if ($block->showMinimalPrice()): ?> | ||
<?php if ($block->getUseLinkForAsLowAs()):?> | ||
<a href="<?php /* @escapeNotVerified */ echo $block->getSaleableItem()->getProductUrl(); ?>" class="minimal-price-link"> | ||
<?php /* @escapeNotVerified */ echo $block->renderAmountMinimal(); ?> | ||
</a> | ||
<?php else:?> | ||
<span class="minimal-price-link"> | ||
<?php /* @escapeNotVerified */ echo $block->renderAmountMinimal(); ?> | ||
</span> | ||
<?php endif?> | ||
<?php endif; ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters