Merge pull request #363 from magento-extensibility/MAGETWO-43351-cart-price-rule-form

[Extensibility] Magetwo 43351 cart price rule form

Author: Melnikov, Igor(imelnikov)

app/code/Magento/Config/Model/Config/Backend/Encrypted.php

@@ -93,6 +93,8 @@ public function beforeSave()
             $this->_dataSaveAllowed = true;
             $encrypted = $this->_encryptor->encrypt($value);
             $this->setValue($encrypted);
+        } elseif (empty($value)) {
+            $this->_dataSaveAllowed = true;
         }
     }
 

app/code/Magento/Config/Test/Unit/Model/Config/Backend/EncryptedTest.php

@@ -92,8 +92,6 @@ public function testProcessValue()
      */
     public function testBeforeSave($value, $expectedValue, $encryptMethodCall)
     {
-        $this->_resourceMock->expects($this->any())->method('addCommitCallback')->will($this->returnSelf());
-        $this->_resourceMock->expects($this->any())->method('commit')->will($this->returnSelf());
         $this->_encryptorMock->expects($this->exactly($encryptMethodCall))
             ->method('encrypt')
             ->with($value)
@@ -113,4 +111,15 @@ public function beforeSaveDataProvider()
     {
         return [['someValue', 'encrypted', 1], ['****', '****', 0]];
     }
+
+    /**
+     * @covers \Magento\Config\Model\Config\Backend\Encrypted::beforeSave
+     */
+    public function testAllowEmptySave()
+    {
+        $this->_model->setValue('');
+        $this->_model->setPath('some/path');
+        $this->_model->beforeSave();
+        $this->assertTrue($this->_model->isSaveAllowed());
+    }
 }

app/code/Magento/OfflineShipping/Model/Source/SalesRule/FreeShippingOptions.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Source\SalesRule;
+
+use Magento\Framework\Data\OptionSourceInterface;
+use Magento\OfflineShipping\Model\SalesRule\Rule;
+
+class FreeShippingOptions implements OptionSourceInterface
+{
+    /**
+     * {@inheritdoc}
+     * @codeCoverageIgnore
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 0,
+                'label' => __('No')
+            ],
+            [
+                'value' => Rule::FREE_SHIPPING_ITEM,
+                'label' => __('For matching items only')
+            ],
+            [
+                'value' => Rule::FREE_SHIPPING_ADDRESS,
+                'label' => __('For shipment with matching items')
+            ]
+        ];
+    }
+}

app/code/Magento/OfflineShipping/Observer/SalesRule/ActionsTabPrepareFormObserver.php

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <fieldset name="actions">
+        <field name="simple_free_shipping">
+            <argument name="data" xsi:type="array">
+                <item name="options" xsi:type="object">Magento\OfflineShipping\Model\Source\SalesRule\FreeShippingOptions</item>
+                <item name="config" xsi:type="array">
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Free Shipping</item>
+                    <item name="formElement" xsi:type="string">select</item>
+                    <item name="dataScope" xsi:type="string">simple_free_shipping</item>
+                    <item name="caption" xsi:type="string" translate="true">-- Please Select --</item>
+                </item>
+            </argument>
+        </field>
+    </fieldset>
+</form>

app/code/Magento/OfflineShipping/Test/Unit/Observer/ActionsTabPrepareFormObserverTest.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Class DeleteButton
+ */
+class DeleteButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * @return array
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        $ruleId = $this->getRuleId();
+        if ($ruleId && $this->canRender('delete')) {
+            $data = [
+                'label' => __('Delete'),
+                'class' => 'delete',
+                'on_click' => 'deleteConfirm(\'' . __(
+                    'Are you sure you want to delete this?'
+                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')',
+                'sort_order' => 20,
+            ];
+        }
+        return $data;
+    }
+}