Merge branch 'MAGETWO-44774' into BugFestW5

Author: Maksym Aposov

app/code/Magento/ConfigurableProduct/Model/Plugin/PriceBackend.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Model\Plugin;
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Class PriceBackend
+ *
+ *  Make price validation optional for configurable product
+ */
+class PriceBackend
+{
+    /**
+     * @param \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject
+     * @param \Closure $proceed
+     * @param \Magento\Catalog\Model\Product|\Magento\Framework\DataObject $object
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundValidate(
+        \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject,
+        \Closure $proceed,
+        $object
+    ) {
+        if ($object instanceof \Magento\Catalog\Model\Product
+            && $object->getTypeId() == Configurable::TYPE_CODE
+        ) {
+            return true;
+        } else {
+            return $proceed($object);
+        }
+    }
+}

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/PriceBackendTest.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Plugin;
+
+use Magento\ConfigurableProduct\Model\Plugin\PriceBackend;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class PriceBackendTest extends \PHPUnit_Framework_TestCase
+{
+    const CLOSURE_VALUE = 'CLOSURE';
+    /** @var  PriceBackend */
+    private $priceBackendPlugin;
+    /** @var  \PHPUnit_Framework_MockObject_MockObject */
+    private $priceAttributeMock;
+    /** @var  \Closure */
+    private $closure;
+    /** @var  \PHPUnit_Framework_MockObject_MockObject */
+    private $productMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->priceBackendPlugin = $objectManager->getObject('Magento\ConfigurableProduct\Model\Plugin\PriceBackend');
+
+        $this->closure = function () {
+            return static::CLOSURE_VALUE;
+        };
+        $this->priceAttributeMock = $this->getMockBuilder('Magento\Catalog\Model\Product\Attribute\Backend\Price')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->setMethods(['getTypeId', 'getPriceType', '__wakeUp'])
+            ->getMock();
+    }
+
+    /**
+     * @dataProvider aroundValidateDataProvider
+     *
+     * @param $typeId
+     * @param $expectedResult
+     */
+    public function testAroundValidate($typeId, $expectedResult)
+    {
+        $this->productMock->expects($this->any())->method('getTypeId')->will($this->returnValue($typeId));
+        $result = $this->priceBackendPlugin->aroundValidate(
+            $this->priceAttributeMock,
+            $this->closure,
+            $this->productMock
+        );
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * Data provider for testAroundValidate
+     *
+     * @return array
+     */
+    public function aroundValidateDataProvider()
+    {
+        return [
+            ['type' => Configurable::TYPE_CODE, 'result' => true],
+            ['type' => Type::TYPE_VIRTUAL, 'result' => static::CLOSURE_VALUE],
+        ];
+    }
+}

app/code/Magento/ConfigurableProduct/etc/di.xml

@@ -123,4 +123,7 @@
             <argument name="priceResolver" xsi:type="object">ConfigurableRegularPriceResolver</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\Backend\Price">
+        <plugin name="configurable" type="Magento\ConfigurableProduct\Model\Plugin\PriceBackend" sortOrder="100" />
+    </type>
 </config>

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js

@@ -375,8 +375,10 @@ define([
             var priceContainer = $('[id="attribute-price-container"]');
             if (this.productMatrix().length !== 0) {
                 priceContainer.hide();
+                priceContainer.find('input').prop('disabled', true);
             } else {
                 priceContainer.show();
+                priceContainer.find('input').prop('disabled', false);
             }
         },