Merge remote-tracking branch 'origin/MAGETWO-51620' into MAGETWO-52374

Author: mlogvin

app/code/Magento/SalesRule/Model/Converter/ToModel.php

@@ -169,6 +169,12 @@ public function toModel(RuleDataModel $dataModel)
             }
         } else {
             $ruleModel = $this->ruleFactory->create();
+            $dataModel->setFromDate(
+                $this->formattingDate($dataModel->getFromDate())
+            );
+            $dataModel->setToDate(
+                $this->formattingDate($dataModel->getToDate())
+            );
         }
 
         $modelData = $ruleModel->getData();
@@ -197,4 +203,20 @@ public function toModel(RuleDataModel $dataModel)
 
         return $ruleModel;
     }
+
+    /**
+     * Convert date to ISO8601
+     * 
+     * @param string|null $date
+     * @return string|null
+     */
+    private function formattingDate($date)
+    {
+        if ($date) {
+            $fromDate = new \DateTime($date);
+            $date = $fromDate->format(\DateTime::ISO8601);
+        }
+
+        return $date;
+    }
 }

app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToModelTest.php

@@ -187,4 +187,119 @@ public function testToModel()
         $result = $this->model->toModel($dataModel);
         $this->assertEquals($ruleModel, $result);
     }
+
+    /**
+     * @dataProvider expectedDatesProvider
+     */
+    public function testFormattingDate($data)
+    {
+        /**
+         * @var \Magento\SalesRule\Model\Data\Rule|\PHPUnit_Framework_MockObject_MockObject $dataModel
+         */
+        $dataModel = $this->getMockBuilder(\Magento\SalesRule\Model\Data\Rule::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'create',
+                    'load',
+                    'getData',
+                    'getRuleId',
+                    'getCondition',
+                    'getActionCondition',
+                    'getStoreLabels',
+                    'getFromDate',
+                    'setFromDate',
+                    'getToDate',
+                    'setToDate',
+                ])
+            ->getMock();
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('getRuleId')
+            ->willReturn(null);
+
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('getCondition')
+            ->willReturn(false);
+
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('getActionCondition')
+            ->willReturn(false);
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('getStoreLabels')
+            ->willReturn([]);
+        $ruleModel = $this->getMockBuilder('\Magento\SalesRule\Model\Rule')
+            ->disableOriginalConstructor()
+            ->setMethods(['create', 'load', 'getId', 'getData'])
+            ->getMock();
+        $ruleModel
+            ->expects($this->atLeastOnce())
+            ->method('getData')
+            ->willReturn(['data_1'=>1]);
+
+        $this->dataObjectProcessor
+            ->expects($this->any())
+            ->method('buildOutputDataArray')
+            ->willReturn(['data_2'=>2]);
+
+        $this->ruleFactory
+            ->expects($this->any())
+            ->method('create')
+            ->willReturn($ruleModel);
+
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('getFromDate')
+            ->willReturn($data['from_date']);
+
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('getToDate')
+            ->willReturn($data['to_date']);
+
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('setFromDate')
+            ->with($data['expected_from_date']);
+
+        $dataModel
+            ->expects($this->atLeastOnce())
+            ->method('setToDate')
+            ->with($data['expected_to_date']);
+
+        $this->model->toModel($dataModel);
+    }
+
+    public function expectedDatesProvider()
+    {
+        return [
+            'mm/dd/yyyy to yyyy-mm-dd' => [
+                [
+                    'from_date' => '03/24/2016',
+                    'to_date' => '03/25/2016',
+                    'expected_from_date' => '2016-03-24T00:00:00-0700',
+                    'expected_to_date' => '2016-03-25T00:00:00-0700',
+                ]
+            ],
+            'yyyy-mm-dd to yyyy-mm-dd' => [
+                [
+                    'from_date' => '2016-03-24',
+                    'to_date' => '2016-03-25',
+                    'expected_from_date' => '2016-03-24T00:00:00-0700',
+                    'expected_to_date' => '2016-03-25T00:00:00-0700',
+                ]
+            ],
+            'yymmdd to yyyy-mm-dd' => [
+                [
+                    'from_date' => '20160324',
+                    'to_date' => '20160325',
+                    'expected_from_date' => '2016-03-24T00:00:00-0700',
+                    'expected_to_date' => '2016-03-25T00:00:00-0700',
+                ]
+            ],
+        ];
+    }
 }