MAGETWO-61554: UX improvements

Author: nikshostko

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -14,6 +14,8 @@
 use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
 
 /**
  * Create Ship Bundle Items and Affect Bundle Product Selections fields
@@ -73,6 +75,7 @@ public function __construct(
      */
     public function modifyMeta(array $meta)
     {
+        $meta = $this->removeFixedTierPrice($meta);
         $path = $this->arrayManager->findPath(static::CODE_BUNDLE_DATA, $meta, null, 'children');
 
         $meta = $this->arrayManager->merge(
@@ -178,6 +181,43 @@ public function modifyMeta(array $meta)
         return $meta;
     }
 
+    /**
+     * Remove option with fixed tier price from config.
+     *
+     * @param array $meta
+     * @return array
+     */
+    private function removeFixedTierPrice(array $meta)
+    {
+        $tierPricePath = $this->arrayManager->findPath(
+            ProductAttributeInterface::CODE_TIER_PRICE,
+            $meta,
+            null,
+            'children'
+        );
+        $pricePath =  $this->arrayManager->findPath(
+            ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE,
+            $meta,
+            $tierPricePath
+        );
+        $pricePath = $this->arrayManager->slicePath($pricePath, 0, -1) . '/value_type/arguments/data/options';
+
+        $price = $this->arrayManager->get($pricePath, $meta);
+        $meta = $this->arrayManager->remove($pricePath, $meta);
+        foreach ($price as $key => $item) {
+            if ($item['value'] == ProductPriceOptionsInterface::VALUE_FIXED) {
+                unset($price[$key]);
+            }
+        }
+        $meta = $this->arrayManager->merge(
+            $this->arrayManager->slicePath($pricePath, 0, -1),
+            $meta,
+            ['options' => $price]
+        );
+
+        return $meta;
+    }
+
     /**
      * {@inheritdoc}
      */

app/code/Magento/Bundle/etc/adminhtml/di.xml

@@ -27,11 +27,11 @@
             <argument name="modifiers" xsi:type="array">
                 <item name="bundle" xsi:type="array">
                     <item name="class" xsi:type="string">Magento\Bundle\Ui\DataProvider\Product\Form\Modifier\Composite</item>
-                    <item name="sortOrder" xsi:type="number">125</item>
+                    <item name="sortOrder" xsi:type="number">180</item>
                 </item>
                 <item name="bundle_stock_data" xsi:type="array">
                     <item name="class" xsi:type="string">Magento\Bundle\Ui\DataProvider\Product\Form\Modifier\StockData</item>
-                    <item name="sortOrder" xsi:type="number">126</item>
+                    <item name="sortOrder" xsi:type="number">190</item>
                 </item>
             </argument>
         </arguments>

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

@@ -130,4 +130,5 @@
             </argument>
         </arguments>
     </type>
+
 </config>

app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml

@@ -22,7 +22,7 @@ $tierPrices = $tierPriceModel->getTierPriceList();
                 <?php /* @escapeNotVerified */ echo __(
                     'Buy %1 with %2 discount each',
                     $price['price_qty'],
-                    '<strong class="benefit">' . $tierPriceModel->getSavePercent($price['price']) . '%</strong>'
+                    '<strong class="benefit">' . round($price['percentage_value']) . '%</strong>'
                 ); ?>
             </li>
         <?php endforeach; ?>

app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php

@@ -23,7 +23,7 @@ public function toOptionArray()
     {
         return [
             ['value' => self::VALUE_FIXED, 'label' => __('Fixed')],
-            ['value' => self::VALUE_PERCENT, 'label' => __('Percent')],
+            ['value' => self::VALUE_PERCENT, 'label' => __('Discount')],
         ];
     }
 }

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php

@@ -157,6 +157,7 @@ protected function modifyPriceData($object, $data)
         $data = parent::modifyPriceData($object, $data);
         foreach ($data as $key => $tierPrice) {
             if ($this->getPercentage($tierPrice)) {
+                $data[$key]['price'] = $object->getPrice() * (1 - $this->getPercentage($tierPrice) / 100);
                 $data[$key]['website_price'] = $object->getPrice() * (1 - $this->getPercentage($tierPrice) / 100);
             }
         }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php

@@ -109,6 +109,7 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
                             'label' => __('Price'),
                             'enableLabel' => true,
                             'dataScope' => '',
+                            'additionalClasses' => 'control-grouped',
                             'sortOrder' => isset($priceMeta['arguments']['data']['config']['sortOrder'])
                                 ? $priceMeta['arguments']['data']['config']['sortOrder'] : 40,
                         ],

app/code/Magento/Persistent/Model/Observer.php

@@ -121,6 +121,13 @@ protected function _applyAccountLinksPersistentData()
     public function emulateTopLinks($block)
     {
         $this->_applyAccountLinksPersistentData();
-        $block->removeLinkByUrl($this->_url->getUrl('customer/account/login'));
+        /** @var \Magento\Framework\View\Element\Html\Link[] $links */
+        $links = $block->getLinks();
+        $removeLink = $this->_url->getUrl('customer/account/login');
+        foreach ($links as $link) {
+            if ($link->getHref() == $removeLink) {
+                $this->_layout->unsetChild($block->getNameInLayout(), $link->getNameInLayout());
+            }
+        }
     }
 }

app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less

@@ -78,3 +78,19 @@
         margin-top: -@indent__base;
     }
 }
+
+//
+//  Advanced Price panel
+//  ---------------------------------------------
+
+.admin__control-fields {
+    .control-grouped {
+        .lib-vendor-prefix-display(inline-flex);
+        .lib-vendor-prefix-flex-direction(row);
+
+        .admin__field + .admin__field {
+            margin-left: @indent__s;
+            margin-top: 0;
+        }
+    }
+}

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php

@@ -110,7 +110,7 @@ private function countCheckoutCartItemPrice(FixtureInterface $product)
     {
         $tierPrice = $product->getDataFieldConfig('tier_price')['source']->getData()[0];
 
-        if ($tierPrice['value_type'] === "Percent") {
+        if ($tierPrice['value_type'] === "Discount") {
             $this->fixtureActualPrice = $this->fixturePrice * (1 - $tierPrice['percentage_value'] / 100);
         } else {
             $this->fixtureActualPrice = $tierPrice['price'];