Skip to content

Commit 80d5c6d

Browse files
serhii-balkoserhii-balko
committed
Merge branch '2.2-develop' into MC-17882
2 parents 3a15e87 + 6fd1cb4 commit 80d5c6d

File tree

14 files changed

+23
-30
lines changed

14 files changed

+23
-30
lines changed

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<?php foreach ($_options as $_option) : ?>
1313
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1414
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
15-
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>
16-
<?= $block->escapeHtml($_formatedOptionValue['value']) ?>
15+
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
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/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,

0 commit comments

Comments
 (0)