Skip to content

Commit 2e17c71

Browse files
engcom-Foxtrotengcom-Foxtrot
committed
Merge remote-tracking branch 'mainline/2.2-develop' into back-port-pull-21200
2 parents 49e6843 + e20027b commit 2e17c71

File tree

19 files changed

+66
-33
lines changed

19 files changed

+66
-33
lines changed

‎app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@
1010
use Magento\Search\Model\QueryFactory;
1111
use Magento\Search\Model\Autocomplete\DataProviderInterface;
1212
use Magento\Search\Model\Autocomplete\ItemFactory;
13+
use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
14+
use Magento\Store\Model\ScopeInterface;
1315

1416
class DataProvider implements DataProviderInterface
1517
{
18+
/**
19+
* Autocomplete limit
20+
*/
21+
private static $CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
22+
1623
/**
1724
* Query factory
1825
*
@@ -27,16 +34,25 @@ class DataProvider implements DataProviderInterface
2734
*/
2835
protected $itemFactory;
2936

37+
/**
38+
* Scope Config Object
39+
*
40+
* @var ScopeConfig
41+
*/
42+
private $scopeConfig;
43+
3044
/**
3145
* @param QueryFactory $queryFactory
3246
* @param ItemFactory $itemFactory
3347
*/
3448
public function __construct(
3549
QueryFactory $queryFactory,
36-
ItemFactory $itemFactory
50+
ItemFactory $itemFactory,
51+
ScopeConfig $scopeConfig
3752
) {
3853
$this->queryFactory = $queryFactory;
3954
$this->itemFactory = $itemFactory;
55+
$this->scopeConfig = $scopeConfig;
4056
}
4157

4258
/**
@@ -46,6 +62,10 @@ public function getItems()
4662
{
4763
$collection = $this->getSuggestCollection();
4864
$query = $this->queryFactory->get()->getQueryText();
65+
$limit = (int) $this->scopeConfig->getValue(
66+
static::$CONFIG_AUTOCOMPLETE_LIMIT,
67+
ScopeInterface::SCOPE_STORE
68+
);
4969
$result = [];
5070
foreach ($collection as $item) {
5171
$resultItem = $this->itemFactory->create([
@@ -58,7 +78,7 @@ public function getItems()
5878
$result[] = $resultItem;
5979
}
6080
}
61-
return $result;
81+
return ($limit) ? array_splice($result, 0, $limit) : $result;
6282
}
6383

6484
/**

‎app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
2525
*/
2626
private $itemFactory;
2727

28+
/**
29+
* @var Magento\Framework\App\Config\ScopeConfigInterface |\PHPUnit_Framework_MockObject_MockObject
30+
*/
31+
private $scopeConfig;
32+
2833
/**
2934
* @var \Magento\Search\Model\ResourceModel\Query\Collection |\PHPUnit_Framework_MockObject_MockObject
3035
*/
@@ -60,18 +65,25 @@ protected function setUp()
6065
->setMethods(['create'])
6166
->getMock();
6267

68+
$this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
69+
->setMethods(['getValue'])
70+
->disableOriginalConstructor()
71+
->getMockForAbstractClass();
72+
6373
$this->model = $helper->getObject(
6474
\Magento\CatalogSearch\Model\Autocomplete\DataProvider::class,
6575
[
6676
'queryFactory' => $queryFactory,
67-
'itemFactory' => $this->itemFactory
77+
'itemFactory' => $this->itemFactory,
78+
'scopeConfig' => $this->scopeConfig
6879
]
6980
);
7081
}
7182

7283
public function testGetItems()
7384
{
7485
$queryString = 'string';
86+
$limit = 3;
7587
$expected = ['title' => $queryString, 'num_results' => 100500];
7688
$collection = [
7789
['query_text' => 'string1', 'num_results' => 1],
@@ -80,6 +92,8 @@ public function testGetItems()
8092
['query_text' => 'string100', 'num_results' => 100],
8193
['query_text' => $queryString, 'num_results' => 100500]
8294
];
95+
$this->scopeConfig->method('getValue')
96+
->willReturn($limit);
8397
$this->buildCollection($collection);
8498
$this->query->expects($this->once())
8599
->method('getQueryText')
@@ -105,6 +119,7 @@ public function testGetItems()
105119
$this->itemFactory->expects($this->any())->method('create')->willReturn($itemMock);
106120
$result = $this->model->getItems();
107121
$this->assertEquals($expected, $result[0]->toArray());
122+
$this->assertEquals($limit, count($result));
108123
}
109124

110125
/**

‎app/code/Magento/CatalogSearch/etc/adminhtml/system.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<comment>Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.</comment>
3535
<validate>validate-digits</validate>
3636
</field>
37+
<field id="autocomplete_limit" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
38+
<label>Autocomplete Limit</label>
39+
<validate>validate-digits</validate>
40+
</field>
3741
<field id="enable_eav_indexer" translate="label" type="select" sortOrder="18" showInDefault="1" showInWebsite="0" showInStore="0">
3842
<label>Enable EAV Indexer</label>
3943
<comment>Enable/Disable Product EAV indexer to improve indexation speed. Make sure that indexer is not used by 3rd party extensions.</comment>

‎app/code/Magento/CatalogSearch/etc/config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<min_query_length>3</min_query_length>
1717
<max_query_length>128</max_query_length>
1818
<max_count_cacheable_search_terms>100</max_count_cacheable_search_terms>
19+
<autocomplete_limit>8</autocomplete_limit>
1920
<enable_eav_indexer>1</enable_eav_indexer>
2021
</search>
2122
</catalog>

‎app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,12 @@
157157
<column name="billing_telephone" sortOrder="60">
158158
<settings>
159159
<filter>text</filter>
160-
<editor>
161-
<editorType>text</editorType>
162-
</editor>
163160
<label translate="true">Phone</label>
164161
</settings>
165162
</column>
166163
<column name="billing_postcode" sortOrder="70">
167164
<settings>
168165
<filter>text</filter>
169-
<editor>
170-
<editorType>text</editorType>
171-
</editor>
172166
<label translate="true">ZIP</label>
173167
</settings>
174168
</column>
@@ -269,59 +263,41 @@
269263
<column name="billing_city" sortOrder="210">
270264
<settings>
271265
<filter>text</filter>
272-
<editor>
273-
<editorType>text</editorType>
274-
</editor>
275266
<label translate="true">City</label>
276267
<visible>false</visible>
277268
</settings>
278269
</column>
279270
<column name="billing_fax" sortOrder="220">
280271
<settings>
281272
<filter>text</filter>
282-
<editor>
283-
<editorType>text</editorType>
284-
</editor>
285273
<label translate="true">Fax</label>
286274
<visible>false</visible>
287275
</settings>
288276
</column>
289277
<column name="billing_vat_id" sortOrder="230">
290278
<settings>
291279
<filter>text</filter>
292-
<editor>
293-
<editorType>text</editorType>
294-
</editor>
295280
<label translate="true">VAT Number</label>
296281
<visible>false</visible>
297282
</settings>
298283
</column>
299284
<column name="billing_company" sortOrder="240">
300285
<settings>
301286
<filter>text</filter>
302-
<editor>
303-
<editorType>text</editorType>
304-
</editor>
305287
<label translate="true">Company</label>
306288
<visible>false</visible>
307289
</settings>
308290
</column>
309291
<column name="billing_firstname" sortOrder="250">
310292
<settings>
311293
<filter>text</filter>
312-
<editor>
313-
<editorType>text</editorType>
314-
</editor>
315294
<label translate="true">Billing Firstname</label>
316295
<visible>false</visible>
317296
</settings>
318297
</column>
319298
<column name="billing_lastname" sortOrder="260">
320299
<settings>
321300
<filter>text</filter>
322-
<editor>
323-
<editorType>text</editorType>
324-
</editor>
325301
<label translate="true">Billing Lastname</label>
326302
<visible>false</visible>
327303
</settings>

‎app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
name="ship[<?= $block->escapeHtml($_index) ?>][<?= $block->escapeHtml($_item->getQuoteItemId()) ?>][qty]"
6363
value="<?= $block->escapeHtml($_item->getQty()) ?>"
6464
size="2"
65-
class="input-text qty"
66-
data-validate="{number: true}"/>
65+
class="input-text qty required-entry"
66+
data-validate="{number: true, required:true}"/>
6767
</div>
6868
</div>
6969
</td>

‎app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1414
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
1515
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
16-
<?= $block->escapeHtml($_formatedOptionValue['value']) ?>
16+
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
1717
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
1818
<dl class="item options tooltip content">
1919
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
20-
<dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
20+
<dd><?= $block->escapeHtml($_formatedOptionValue['full_view'], ['span']) ?></dd>
2121
</dl>
2222
<?php endif; ?>
2323
</dd>

‎app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ define([
144144
* {Function}
145145
*/
146146
setPaymentInformation: function () {
147-
setPaymentInformationAction(
147+
return setPaymentInformationAction(
148148
this.messageContainer,
149149
{
150150
method: this.getCode()

‎app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ public function send(
100100
$creditmemo->setSendEmail($this->identityContainer->isEnabled());
101101

102102
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
103+
$this->identityContainer->setStore($order->getStore());
104+
103105
$transport = [
104106
'order' => $order,
105107
'creditmemo' => $creditmemo,

‎app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public function __construct(
6363
public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
6464
{
6565
$order = $creditmemo->getOrder();
66+
$this->identityContainer->setStore($order->getStore());
67+
6668
$transport = [
6769
'order' => $order,
6870
'creditmemo' => $creditmemo,

‎app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
104104

105105
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
106106
$order = $creditmemo->getOrder();
107+
$this->identityContainer->setStore($order->getStore());
107108

108109
$transport = [
109110
'order' => $order,

‎app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public function __construct(
6363
public function send(Invoice $invoice, $notify = true, $comment = '')
6464
{
6565
$order = $invoice->getOrder();
66+
$this->identityContainer->setStore($order->getStore());
67+
6668
$transport = [
6769
'order' => $order,
6870
'invoice' => $invoice,

‎app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public function send(Invoice $invoice, $forceSyncMode = false)
104104

105105
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
106106
$order = $invoice->getOrder();
107+
$this->identityContainer->setStore($order->getStore());
107108

108109
$transport = [
109110
'order' => $order,

‎app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public function __construct(
6161
*/
6262
public function send(Order $order, $notify = true, $comment = '')
6363
{
64+
$this->identityContainer->setStore($order->getStore());
65+
6466
$transport = [
6567
'order' => $order,
6668
'comment' => $comment,

‎app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public function __construct(
6363
public function send(Shipment $shipment, $notify = true, $comment = '')
6464
{
6565
$order = $shipment->getOrder();
66+
$this->identityContainer->setStore($order->getStore());
67+
6668
$transport = [
6769
'order' => $order,
6870
'shipment' => $shipment,

‎app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public function send(Shipment $shipment, $forceSyncMode = false)
104104

105105
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
106106
$order = $shipment->getOrder();
107+
$this->identityContainer->setStore($order->getStore());
107108

108109
$transport = [
109110
'order' => $order,

‎app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ public function send(
100100
$invoice->setSendEmail($this->identityContainer->isEnabled());
101101

102102
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
103+
$this->identityContainer->setStore($order->getStore());
104+
103105
$transport = [
104106
'order' => $order,
105107
'invoice' => $invoice,

‎app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ public function send(
100100
$shipment->setSendEmail($this->identityContainer->isEnabled());
101101

102102
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
103+
$this->identityContainer->setStore($order->getStore());
104+
103105
$transport = [
104106
'order' => $order,
105107
'shipment' => $shipment,

‎app/code/Magento/Ups/Model/Carrier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
13471347
$shipperPart->addChild('PhoneNumber', $request->getShipperContactPhoneNumber());
13481348

13491349
$addressPart = $shipperPart->addChild('Address');
1350-
$addressPart->addChild('AddressLine1', $request->getShipperAddressStreet());
1350+
$addressPart->addChild('AddressLine1', $request->getShipperAddressStreet1());
13511351
$addressPart->addChild('AddressLine2', $request->getShipperAddressStreet2());
13521352
$addressPart->addChild('City', $request->getShipperAddressCity());
13531353
$addressPart->addChild('CountryCode', $request->getShipperAddressCountryCode());

0 commit comments

Comments
 (0)