[Forwardport] Fixed Purchased Order Form button should visible properly

.github/ISSUE_TEMPLATE.md

@@ -1,24 +1,35 @@
-<!--- Provide a general summary of the issue in the Title above -->
-<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this issue we recommend that you add the following information:
+     - Summary of the issue,
+     - Information on your environment,
+     - Steps to reproduce,
+     - Expected and actual results,
+
+    Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
 
 ### Preconditions
-<!--- Provide a more detailed information of environment you use -->
-<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
+<!---
+    Please provide as detailed information about your environment as possible.
+    For example Magento version, tag, HEAD, PHP & MySQL version, etc..
+-->
 1. 
 2. 
 
 ### Steps to reproduce
-<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant  -->
+<!---
+    It is important to provide a set of clear steps to reproduce this bug.
+    If relevant please include code samples
+-->
 1. 
 2. 
 3. 
 
 ### Expected result
 <!--- Tell us what should happen -->
-1. 
+1. [Screenshot, logs]
 
 ### Actual result
 <!--- Tell us what happens instead -->
 1. [Screenshot, logs]
-
-<!--- (This may be platform independent comment) -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,32 @@
-<!--- Provide a general summary of the Pull Request in the Title above -->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this pull request we recommend that you add the following information:
+     - Summary of the pull request,
+     - Issue(s) related to the changes made,
+     - Manual testing scenarios,
+-->
+
+<!--- Please provide a general summary of the Pull Request in the Title above -->
 
 ### Description
-<!--- Provide a description of the changes proposed in the pull request -->
+<!---
+    Please provide a description of the changes proposed in the pull request.
+    Letting us know what has changed and why it needed changing will help us validate this pull request.
+-->
 
 ### Fixed Issues (if relevant)
-<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant  -->
+<!---
+    If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
+    There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
+-->
 1. magento/magento2#<issue_number>: Issue title
 2. ...
 
 ### Manual testing scenarios
-<!--- Provide a set of unambiguous steps to test the proposed code change -->
+<!---
+    Please provide a set of unambiguous steps to test the proposed code change.
+    Giving us manual testing scenarios will help with the processing and validation process.
+-->
 1. ...
 2. ...
 

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

@@ -447,7 +447,7 @@
     <!-- PayPal value handlers infrastructure -->
     <type name="Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler">
         <arguments>
-            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\AccountPaymentTokenFactory</argument>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Api\Data\PaymentTokenFactoryInterface</argument>
         </arguments>
     </type>
     <virtualType name="BraintreePayPalValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -139,9 +139,7 @@ public function execute()
                         ->setName($name)
                         ->getAttributeSet();
                 } catch (AlreadyExistsException $alreadyExists) {
-                    $this->messageManager->addErrorMessage(
-                        __('A "%1" attribute set name already exists. Create a new name and try again.', $name)
-                    );
+                    $this->messageManager->addErrorMessage(__('An attribute set named \'%1\' already exists.', $name));
                     $this->_session->setAttributeData($data);
                     return $this->returnResult('catalog/*/edit', ['_current' => true], ['error' => true]);
                 } catch (LocalizedException $e) {
@@ -202,6 +200,8 @@ public function execute()
                 }
             }
 
+            $data = $this->presentation->convertPresentationDataToInputType($data);
+
             if ($attributeId) {
                 if (!$model->getId()) {
                     $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
@@ -216,7 +216,7 @@ public function execute()
 
                 $data['attribute_code'] = $model->getAttributeCode();
                 $data['is_user_defined'] = $model->getIsUserDefined();
-                $data['frontend_input'] = $model->getFrontendInput();
+                $data['frontend_input'] = $data['frontend_input'] ?? $model->getFrontendInput();
             } else {
                 /**
                  * @todo add to helper and specify all relations for properties
@@ -229,8 +229,6 @@ public function execute()
                 );
             }
 
-            $data = $this->presentation->convertPresentationDataToInputType($data);
-
             $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
 
             if ($model->getIsUserDefined() === null || $model->getIsUserDefined() != 0) {

app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Inputtype/Presentation.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype;
 
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
@@ -19,9 +21,9 @@ class Presentation
      * Get input type for presentation layer from stored input type.
      *
      * @param Attribute $attribute
-     * @return string
+     * @return string|null
      */
-    public function getPresentationInputType(Attribute $attribute)
+    public function getPresentationInputType(Attribute $attribute) :?string
     {
         $inputType = $attribute->getFrontendInput();
         if ($inputType == 'textarea' && $attribute->getIsWysiwygEnabled()) {
@@ -37,12 +39,12 @@ public function getPresentationInputType(Attribute $attribute)
      *
      * @return array
      */
-    public function convertPresentationDataToInputType(array $data)
+    public function convertPresentationDataToInputType(array $data) : array
     {
-        if ($data['frontend_input'] === 'texteditor') {
+        if (isset($data['frontend_input']) && $data['frontend_input'] === 'texteditor') {
             $data['is_wysiwyg_enabled'] = 1;
             $data['frontend_input'] = 'textarea';
-        } elseif ($data['frontend_input'] === 'textarea') {
+        } elseif (isset($data['frontend_input']) && $data['frontend_input'] === 'textarea') {
             $data['is_wysiwyg_enabled'] = 0;
         }
         return $data;

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Frontend/InputType/PresentationTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Product\Attribute\Frontend\InputType;
+
+class PresentationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation
+     */
+    private $presentation;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMock;
+
+    protected function setUp()
+    {
+        $this->presentation = new \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation();
+        $this->attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @param string $inputType
+     * @param boolean $isWysiwygEnabled
+     * @param string $expectedResult
+     * @dataProvider getPresentationInputTypeDataProvider
+     */
+    public function testGetPresentationInputType(string $inputType, bool $isWysiwygEnabled, string $expectedResult)
+    {
+        $this->attributeMock->expects($this->once())->method('getFrontendInput')->willReturn($inputType);
+        $this->attributeMock->expects($this->any())->method('getIsWysiwygEnabled')->willReturn($isWysiwygEnabled);
+        $this->assertEquals($expectedResult, $this->presentation->getPresentationInputType($this->attributeMock));
+    }
+
+    public function getPresentationInputTypeDataProvider()
+    {
+        return [
+            'attribute_is_textarea_and_wysiwyg_enabled' => ['textarea', true, 'texteditor'],
+            'attribute_is_input_and_wysiwyg_enabled' => ['input', true, 'input'],
+            'attribute_is_textarea_and_wysiwyg_disabled' => ['textarea', false, 'textarea'],
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @param array $expectedResult
+     * @dataProvider convertPresentationDataToInputTypeDataProvider
+     */
+    public function testConvertPresentationDataToInputType(array $data, array $expectedResult)
+    {
+        $this->assertEquals($expectedResult, $this->presentation->convertPresentationDataToInputType($data));
+    }
+
+    public function convertPresentationDataToInputTypeDataProvider()
+    {
+        return [
+            [['key' => 'value'], ['key' => 'value']],
+            [
+                ['frontend_input' => 'texteditor'],
+                ['frontend_input' => 'textarea', 'is_wysiwyg_enabled' => 1]
+            ],
+            [
+                ['frontend_input' => 'textarea'],
+                ['frontend_input' => 'textarea', 'is_wysiwyg_enabled' => 0]
+            ],
+            [
+                ['frontend_input' => 'input'],
+                ['frontend_input' => 'input']
+            ]
+        ];
+    }
+}

app/code/Magento/Catalog/view/base/web/js/price-options.js

@@ -20,8 +20,10 @@ define([
         optionConfig: {},
         optionHandlers: {},
         optionTemplate: '<%= data.label %>' +
-        '<% if (data.finalPrice.value) { %>' +
+        '<% if (data.finalPrice.value > 0) { %>' +
         ' +<%- data.finalPrice.formatted %>' +
+        '<% } else if (data.finalPrice.value < 0) { %>' +
+        ' <%- data.finalPrice.formatted %>' +
         '<% } %>',
         controlContainer: 'dd'
     };

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/SortFields.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * Retrieves the sort fields data
+ */
+class SortFields implements ResolverInterface
+{
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\Config
+     */
+    private $catalogConfig;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Catalog\Model\Category\Attribute\Source\Sortby
+     */
+    private $sortbyAttributeSource;
+
+    /**
+     * @param ValueFactory $valueFactory
+     * @param \Magento\Catalog\Model\Config $catalogConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @oaram \Magento\Catalog\Model\Category\Attribute\Source\Sortby $sortbyAttributeSource
+     */
+    public function __construct(
+        ValueFactory $valueFactory,
+        \Magento\Catalog\Model\Config $catalogConfig,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Catalog\Model\Category\Attribute\Source\Sortby $sortbyAttributeSource
+    ) {
+        $this->valueFactory = $valueFactory;
+        $this->catalogConfig = $catalogConfig;
+        $this->storeManager = $storeManager;
+        $this->sortbyAttributeSource = $sortbyAttributeSource;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
+    {
+        $sortFieldsOptions = $this->sortbyAttributeSource->getAllOptions();
+        array_walk(
+            $sortFieldsOptions,
+            function (&$option) {
+                $option['label'] = (string)$option['label'];
+            }
+        );
+        $data = [
+            'default' => $this->catalogConfig->getProductListDefaultSortBy($this->storeManager->getStore()->getId()),
+            'options' => $sortFieldsOptions,
+        ];
+
+        $result = function () use ($data) {
+            return $data;
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}