Merge pull request #5861 from magento-tango/TANGO-PR-07-08-2020-v23

TANGO-PR-07-08-2020-v23

Author: dhorytskyi

app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php

@@ -102,6 +102,12 @@ public function beforeSave($object)
             }
             $object->setData($attributeCode, implode(',', $data) ?: null);
         }
+        if ($attributeCode == 'default_sort_by') {
+            $data = $object->getData($attributeCode);
+            $attributeValue = is_array($data) ? reset($data) :
+                (!empty($data)) ? $data : null;
+            $object->setData($attributeCode, $attributeValue);
+        }
         if (!$object->hasData($attributeCode)) {
             $object->setData($attributeCode, null);
         }

app/code/Magento/Catalog/Model/Plugin/DefaultSortByUpdateCategorySavePlugin.php

@@ -1332,7 +1332,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Catalog\Api\CategoryRepositoryInterface">
-        <plugin name="DefaultSortByUpdateCategorySavePlugin" type="Magento\Catalog\Model\Plugin\DefaultSortByUpdateCategorySavePlugin"/>
-    </type>
 </config>

app/code/Magento/Catalog/Test/Unit/Model/Plugin/DefaultSortByUpdateCategorySavePluginTest.php

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypal"/>
+            <skip>
+                <issueId value="MC-35792"/>
+            </skip>
         </annotations>
         <before>
 

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

@@ -7,14 +7,14 @@
 namespace Magento\Catalog\Api;
 
 use Magento\Authorization\Model\Role;
+use Magento\Authorization\Model\RoleFactory;
 use Magento\Authorization\Model\Rules;
+use Magento\Authorization\Model\RulesFactory;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\Integration\Api\AdminTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use Magento\Authorization\Model\RoleFactory;
-use Magento\Authorization\Model\RulesFactory;
 
 /**
  * Test repository web API.
@@ -217,6 +217,35 @@ public function testUpdate()
         $this->deleteCategory($categoryId);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testUpdateWithDefaultSortByAttribute()
+    {
+        $categoryId = 333;
+        $categoryData = [
+            'name' => 'Update Category Test With default_sort_by Attribute',
+            'is_active' => true,
+            "available_sort_by" => [],
+            'custom_attributes' => [
+                [
+                    'attribute_code' => 'default_sort_by',
+                    'value' => ["name"],
+                ],
+            ],
+        ];
+        $result = $this->updateCategory($categoryId, $categoryData);
+        $this->assertEquals($categoryId, $result['id']);
+        /** @var \Magento\Catalog\Model\Category $model */
+        $model = Bootstrap::getObjectManager()->get(\Magento\Catalog\Model\Category::class);
+        $category = $model->load($categoryId);
+        $this->assertTrue((bool)$category->getIsActive(), 'Category "is_active" must equal to true');
+        $this->assertEquals("Update Category Test With default_sort_by Attribute", $category->getName());
+        $this->assertEquals("name", $category->getDefaultSortBy());
+        // delete category to clean up auto-generated url rewrites
+        $this->deleteCategory($categoryId);
+    }
+
     protected function getSimpleCategoryData($categoryData = [])
     {
         return [

app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml

@@ -68,6 +68,35 @@ public function testGet()
         $this->assertEquals($product->getSpecialPrice(), $response[0]['price']);
     }
 
+    /**
+     * Test get method when special price is 0.
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testGetZeroValue()
+    {
+        $specialPrice = 0;
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU, true);
+        $product->setData('special_price', $specialPrice);
+        $productRepository->save($product);
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/products/special-price-information',
+                'httpMethod' => Request::HTTP_METHOD_POST
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Get',
+            ],
+        ];
+        $response = $this->_webApiCall($serviceInfo, ['skus' => [self::SIMPLE_PRODUCT_SKU]]);
+        $this->assertNotEmpty($response);
+        $this->assertEquals($specialPrice, $response[0]['price']);
+    }
+
     /**
      * Test update method.
      *

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php

@@ -52,7 +52,7 @@ public function testAttributeTypeResolver()
       attribute_type
       entity_type
       input_type
-    } 
+    }
   }
  }
 QUERY;
@@ -125,7 +125,7 @@ public function testComplexAttributeTypeResolver()
       attribute_type
       entity_type
       input_type
-    } 
+    }
   }
  }
 QUERY;
@@ -199,8 +199,8 @@ public function testUnDefinedAttributeType()
     {
       attribute_code
       attribute_type
-      entity_type      
-    } 
+      entity_type
+    }
   }
  }
 QUERY;

dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php

@@ -15,6 +15,17 @@ class Format implements \Magento\Framework\Locale\FormatInterface
      */
     private const JAPAN_LOCALE_CODE = 'ja_JP';
 
+    /**
+     * Arab locale code
+     */
+    private const ARABIC_LOCALE_CODES = [
+        'ar_DZ',
+        'ar_EG',
+        'ar_KW',
+        'ar_MA',
+        'ar_SA',
+    ];
+
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
      */
@@ -73,6 +84,11 @@ public function getNumber($value)
             return (float)$value;
         }
 
+        /** Normalize for Arabic locale */
+        if (in_array($this->_localeResolver->getLocale(), self::ARABIC_LOCALE_CODES)) {
+            $value = $this->normalizeArabicLocale($value);
+        }
+
         //trim spaces and apostrophes
         $value = preg_replace('/[^0-9^\^.,-]/m', '', $value);
 
@@ -163,4 +179,22 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
 
         return $result;
     }
+
+    /**
+     * Normalizes the number of Arabic locale.
+     *
+     * Substitutes Arabic thousands grouping and Arabic decimal separator symbols (U+066C, U+066B)
+     * with common grouping and decimal separator
+     *
+     * @param string $value
+     * @return string
+     */
+    private function normalizeArabicLocale($value): string
+    {
+        $arabicGroupSymbol = '٬';
+        $arabicDecimalSymbol = '٫';
+        $value = str_replace([$arabicGroupSymbol, $arabicDecimalSymbol], [',', '.'], $value);
+
+        return $value;
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php

@@ -136,6 +136,8 @@ public function provideNumbers(): array
             ['2,054.00', 2054],
             ['4,000', 4000.0, 'ja_JP'],
             ['4,000', 4.0, 'en_US'],
+            ['2٬599٫50', 2599.50, 'ar_EG'],
+            ['2٬000٬000٫99', 2000000.99, 'ar_SA'],
         ];
     }
 }