Merge pull request #794 from magento-engcom/develop-prs

Merged Public Pull Requests:

- #8183
- #8185

Author: Oleksii Korshenko

app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php

@@ -242,7 +242,7 @@ protected function _getFormFilter()
         if ($filterCode) {
             $filterClass = 'Magento\Framework\Data\Form\Filter\\' . ucfirst($filterCode);
             if ($filterCode == 'date') {
-                $filter = new $filterClass($this->_dateFilterFormat(), $this->_localeResolver->getLocale());
+                $filter = new $filterClass($this->_dateFilterFormat(), $this->_localeResolver);
             } else {
                 $filter = new $filterClass();
             }

app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/AbstractDataTest.php

@@ -95,9 +95,10 @@ public function extractedDataDataProvider()
      * @param string $expectedResult
      * @param array $params
      * @param bool $requestScopeOnly
+     * @param string|null $filter
      * @dataProvider getRequestValueDataProvider
      */
-    public function testGetRequestValue($requestScope, $value, $params, $requestScopeOnly, $expectedResult)
+    public function testGetRequestValue($requestScope, $value, $params, $requestScopeOnly, $expectedResult, $filter)
     {
         $requestMock = $this->getMock(
             \Magento\Framework\App\Request\Http::class,
@@ -112,8 +113,17 @@ public function testGetRequestValue($requestScope, $value, $params, $requestScop
         ]));
         $requestMock->expects($this->any())->method('getParams')->will($this->returnValue($params));
 
-        $attributeMock = $this->getMock(\Magento\Eav\Model\Attribute::class, [], [], '', false);
+        $attributeMock = $this->getMock(
+            \Magento\Eav\Model\Attribute::class,
+            ['getInputFilter', 'getAttributeCode'],
+            [],
+            '',
+            false
+        );
         $attributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue('attributeCode'));
+        if ($filter) {
+            $attributeMock->expects($this->any())->method('getInputFilter')->will($this->returnValue($filter));
+        }
 
         $this->model->setAttribute($attributeMock);
         $this->model->setRequestScope($requestScope);
@@ -133,41 +143,55 @@ public function getRequestValueDataProvider()
                 'params' => [],
                 'requestScopeOnly' => true,
                 'expectedResult' => 'value',
+                'filter' => null,
             ],
             [
                 'requestScope' => 'scope/scope',
                 'value' => 'value',
                 'params' => ['scope' => ['scope' => ['attributeCode' => 'data']]],
                 'requestScopeOnly' => true,
-                'expectedResult' => 'data'
+                'expectedResult' => 'data',
+                'filter' => null,
             ],
             [
                 'requestScope' => 'scope/scope',
                 'value' => 'value',
                 'params' => ['scope' => ['scope' => []]],
                 'requestScopeOnly' => true,
-                'expectedResult' => false
+                'expectedResult' => false,
+                'filter' => null,
             ],
             [
                 'requestScope' => 'scope/scope',
                 'value' => 'value',
                 'params' => ['scope'],
                 'requestScopeOnly' => true,
-                'expectedResult' => false
+                'expectedResult' => false,
+                'filter' => null,
             ],
             [
                 'requestScope' => 'scope',
                 'value' => 'value',
                 'params' => ['otherScope' => 1],
                 'requestScopeOnly' => true,
-                'expectedResult' => false
+                'expectedResult' => false,
+                'filter' => null,
             ],
             [
                 'requestScope' => 'scope',
                 'value' => 'value',
                 'params' => ['otherScope' => 1],
                 'requestScopeOnly' => false,
-                'expectedResult' => 'value'
+                'expectedResult' => 'value',
+                'filter' => null,
+            ],
+            [
+                'requestScope' => 'scope',
+                'value' => '1970-01-01',
+                'params' => [],
+                'requestScopeOnly' => false,
+                'expectedResult' => '1970-01-01',
+                'filter' => 'date'
             ]
         ];
     }

app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html

@@ -34,7 +34,7 @@
     </tr>
     <tr class="email-summary">
         <td>
-            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.incrh1ent_id}}</h1>
+            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}</h1>
         </td>
     </tr>
     <tr class="email-information">

app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html

@@ -33,7 +33,7 @@
     </tr>
     <tr class="email-summary">
         <td>
-            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.incrh1ent_id}}</h1>
+            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}</h1>
         </td>
     </tr>
     <tr class="email-information">