Skip to content

Commit 151726a

Browse files
author
Oleksii Korshenko
committed
Merge pull request #84 from magento-firedrakes/MAGETWO-53988
[Firedrakes] Bugfixes
2 parents 54f4cb7 + 84874ad commit 151726a

File tree

13 files changed

+57
-10
lines changed

13 files changed

+57
-10
lines changed

‎app/code/Magento/Checkout/Controller/Index/Index.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public function execute()
3434

3535
$this->_customerSession->regenerateId();
3636
$this->_objectManager->get('Magento\Checkout\Model\Session')->setCartWasUpdated(false);
37-
$currentUrl = $this->_url->getUrl('*/*/*', ['_secure' => true]);
38-
$this->_objectManager->get('Magento\Customer\Model\Session')->setBeforeAuthUrl($currentUrl);
3937
$this->getOnepage()->initCheckout();
4038
$resultPage = $this->resultPageFactory->create();
4139
$resultPage->getConfig()->getTitle()->set(__('Checkout'));

‎app/code/Magento/Sales/Model/Order/AddressRepository.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
9191
$searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
9292
}
9393
}
94-
9594
$searchResult->setCurPage($searchCriteria->getCurrentPage());
9695
$searchResult->setPageSize($searchCriteria->getPageSize());
9796

‎app/code/Magento/Sales/Model/Order/CreditmemoRepository.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
9999
$searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
100100
}
101101
}
102+
$searchResult->setSearchCriteria($searchCriteria);
102103
$searchResult->setCurPage($searchCriteria->getCurrentPage());
103104
$searchResult->setPageSize($searchCriteria->getPageSize());
104105
return $searchResult;

‎app/code/Magento/Sales/Model/Order/InvoiceRepository.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
9595
$collection->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
9696
}
9797
}
98+
$collection->setSearchCriteria($searchCriteria);
9899
$collection->setCurPage($searchCriteria->getCurrentPage());
99100
$collection->setPageSize($searchCriteria->getPageSize());
100101
return $collection;

‎app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
193193
$collection->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
194194
}
195195
}
196+
$collection->setSearchCriteria($searchCriteria);
196197
$collection->setCurPage($searchCriteria->getCurrentPage());
197198
$collection->setPageSize($searchCriteria->getPageSize());
198199
$collection->addPaymentInformation(['method']);

‎app/code/Magento/Sales/Model/Order/ShipmentRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
9191
$searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
9292
}
9393
}
94-
94+
$searchResult->setSearchCriteria($searchCriteria);
9595
$searchResult->setCurPage($searchCriteria->getCurrentPage());
9696
$searchResult->setPageSize($searchCriteria->getPageSize());
9797

‎app/code/Magento/Translation/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<arguments>
5959
<argument name="patterns" xsi:type="array">
6060
<item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
61+
<item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
6162
<item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((?s)[^'"]*?(['"])(.+?)\1(?s).*?\)~</item>
6263
<item name="mage_translation_static" xsi:type="string">~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~</item>
6364
</argument>

‎app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ define([
5858
recordsCache: [],
5959
draggableElement: {},
6060
draggableElementClass: '_dragged',
61+
elemPositions: [],
6162
listens: {
6263
'${ $.recordsProvider }:elems': 'setCacheRecords'
64+
},
65+
modules: {
66+
parentComponent: '${ $.recordsProvider }'
6367
}
6468
},
6569

@@ -189,7 +193,9 @@ define([
189193
pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
190194
positionY = pageY - drEl.eventMousedownY;
191195

192-
drEl.depElement = this.getDepElement(drEl.instance, positionY);
196+
drEl.depElement = this.getDepElement(drEl.instance, positionY, this.draggableElement.originRow);
197+
198+
drEl.instance.remove();
193199

194200
if (drEl.depElement) {
195201
depElementCtx = this.getRecord(drEl.depElement.elem[0]);
@@ -210,7 +216,6 @@ define([
210216
this.body.unbind('mouseup', this.mouseupHandler);
211217
}
212218

213-
drEl.instance.remove();
214219
this.draggableElement = {};
215220
},
216221

@@ -224,11 +229,34 @@ define([
224229
setPosition: function (depElem, depElementCtx, dragData) {
225230
var depElemPosition = ~~depElementCtx.position;
226231

232+
this.cacheElementsPosition();
233+
227234
if (dragData.depElement.insert === 'after') {
228235
dragData.instanceCtx.position = depElemPosition + 1;
229236
} else if (dragData.depElement.insert === 'before') {
230237
dragData.instanceCtx.position = depElemPosition;
231238
}
239+
240+
this.normalizePositions();
241+
},
242+
243+
/**
244+
* Saves elements position from current elements
245+
*/
246+
cacheElementsPosition: function () {
247+
this.elemPositions = [];
248+
this.parentComponent().elems.each(function (elem) {
249+
this.elemPositions.push(elem.position);
250+
}, this);
251+
},
252+
253+
/**
254+
* Normalize position, uses start elements position
255+
*/
256+
normalizePositions: function () {
257+
this.parentComponent().elems.each(function (item, index) {
258+
item.position = this.elemPositions[index];
259+
}, this);
232260
},
233261

234262
/**

‎dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoListTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public function testCreditmemoList()
6262
[
6363
$filterBuilder
6464
->setField('state')
65-
->setValue(\Magento\Sales\Model\Order\Creditmemo::STATE_OPEN)
65+
->setValue((string)\Magento\Sales\Model\Order\Creditmemo::STATE_OPEN)
66+
->setConditionType('eq')
6667
->create(),
6768
]
6869
);
@@ -85,5 +86,7 @@ public function testCreditmemoList()
8586
// TODO Test fails, due to the inability of the framework API to handle data collection
8687
$this->assertArrayHasKey('items', $result);
8788
$this->assertCount(1, $result['items']);
89+
$this->assertArrayHasKey('search_criteria', $result);
90+
$this->assertEquals($searchData, $result['search_criteria']);
8891
}
8992
}

‎dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceListTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public function testInvoiceList()
4747
[
4848
$filterBuilder
4949
->setField('state')
50-
->setValue(2)
50+
->setValue((string)\Magento\Sales\Model\Order\Invoice::STATE_PAID)
51+
->setConditionType('eq')
5152
->create(),
5253
]
5354
);
@@ -70,5 +71,7 @@ public function testInvoiceList()
7071
// TODO Test fails, due to the inability of the framework API to handle data collection
7172
$this->assertArrayHasKey('items', $result);
7273
$this->assertCount(1, $result['items']);
74+
$this->assertArrayHasKey('search_criteria', $result);
75+
$this->assertEquals($searchData, $result['search_criteria']);
7376
}
7477
}

‎dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,15 @@ public function testShipmentList()
4343
'Magento\Framework\Api\FilterBuilder'
4444
);
4545

46-
$searchCriteriaBuilder->addFilters([$filterBuilder->setField('shipment_status')->setValue(1)->create()]);
46+
$searchCriteriaBuilder->addFilters(
47+
[
48+
$filterBuilder
49+
->setField('shipment_status')
50+
->setValue((string)\Magento\Sales\Model\Order\Shipment::STATUS_NEW)
51+
->setConditionType('eq')
52+
->create()
53+
]
54+
);
4755
$searchData = $searchCriteriaBuilder->create()->__toArray();
4856

4957
$requestData = ['searchCriteria' => $searchData];
@@ -63,5 +71,7 @@ public function testShipmentList()
6371
// TODO Test fails, due to the inability of the framework API to handle data collection
6472
$this->assertArrayHasKey('items', $result);
6573
$this->assertCount(1, $result['items']);
74+
$this->assertArrayHasKey('search_criteria', $result);
75+
$this->assertEquals($searchData, $result['search_criteria']);
6676
}
6777
}

‎dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/TransactionTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ public function testTransactionList($filters)
141141
$expectedData = [$transactionData, $childTransactionData];
142142

143143
$this->assertEquals($expectedData, $result['items']);
144+
$this->assertArrayHasKey('search_criteria', $result);
145+
$this->assertEquals($searchData, $result['search_criteria']);
144146
}
145147

146148
/**

‎lib/internal/Magento/Framework/Url.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ protected function _parseUrl($url)
232232
'user' => 'setUser',
233233
'pass' => 'setPassword',
234234
'path' => 'setPath',
235-
'query' => 'setQuery',
235+
'query' => '_setQuery',
236236
'fragment' => 'setFragment',
237237
];
238238

0 commit comments

Comments
 (0)