Skip to content

Commit 4267884

Browse files
committed
MAGETWO-52374: Pull request preparation
1 parent 83b1af3 commit 4267884

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public function toModel(RuleDataModel $dataModel)
206206

207207
/**
208208
* Convert date to ISO8601
209-
*
209+
*
210210
* @param string|null $date
211211
* @return string|null
212212
*/

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ public function testToModel()
173173
->method('getData')
174174
->willReturn(['data_1'=>1]);
175175

176-
$this->dataObjectProcessor
177-
->expects($this->any())
178-
->method('buildOutputDataArray')
179-
->willReturn(['data_2'=>2]);
176+
$this->dataObjectProcessor
177+
->expects($this->any())
178+
->method('buildOutputDataArray')
179+
->willReturn(['data_2'=>2]);
180180

181181
$this->ruleFactory
182182
->expects($this->any())

app/code/Magento/Ui/view/base/web/js/grid/massactions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ define([
147147
* @param {Object} data - Selections data.
148148
*/
149149
defaultCallback: function (action, data) {
150-
var itemsType = (data.excludeMode && data.excluded.length !== 0) ? 'excluded' : 'selected',
150+
var itemsType = data.excludeMode && data.excluded.length !== 0 ? 'excluded' : 'selected',
151151
selections = {};
152152

153153
selections[itemsType] = data[itemsType];

0 commit comments

Comments
 (0)