🔃 [Magento Community Engineering] Community Contributions - 2.2-develop

Accepted Community Pull Requests:
 - #23614: [Backport] Removed editor from phone and zipcode (by @krishprakash)
 - #23438: [Backport] Fix issue with incorrect payment translation in sales emails (by @ihor-sviziev)


Fixed GitHub Issues:
 - #23467: Phone and Zip not update if customer have no saved address (reported by @vrajesh-patel1993) has been fixed in #23614 by @krishprakash in 2.2-develop branch
   Related commits:
     1. c2c2fd5
     2. e2e9010

 - #23333: Incorrect payment method translation in order emails (reported by @alexeya-ven) has been fixed in #23438 by @ihor-sviziev in 2.2-develop branch
   Related commits:
     1. 171c9ce

Author: magento-engcom-team

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

@@ -157,18 +157,12 @@
         <column name="billing_telephone" sortOrder="60">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">Phone</label>
             </settings>
         </column>
         <column name="billing_postcode" sortOrder="70">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">ZIP</label>
             </settings>
         </column>
@@ -269,59 +263,41 @@
         <column name="billing_city" sortOrder="210">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">City</label>
                 <visible>false</visible>
             </settings>
         </column>
         <column name="billing_fax" sortOrder="220">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">Fax</label>
                 <visible>false</visible>
             </settings>
         </column>
         <column name="billing_vat_id" sortOrder="230">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">VAT Number</label>
                 <visible>false</visible>
             </settings>
         </column>
         <column name="billing_company" sortOrder="240">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">Company</label>
                 <visible>false</visible>
             </settings>
         </column>
         <column name="billing_firstname" sortOrder="250">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">Billing Firstname</label>
                 <visible>false</visible>
             </settings>
         </column>
         <column name="billing_lastname" sortOrder="260">
             <settings>
                 <filter>text</filter>
-                <editor>
-                    <editorType>text</editorType>
-                </editor>
                 <label translate="true">Billing Lastname</label>
                 <visible>false</visible>
             </settings>

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

@@ -100,6 +100,8 @@ public function send(
         $creditmemo->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
+            $this->identityContainer->setStore($order->getStore());
+
             $transport = [
                 'order' => $order,
                 'creditmemo' => $creditmemo,

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

@@ -63,6 +63,8 @@ public function __construct(
     public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
     {
         $order = $creditmemo->getOrder();
+        $this->identityContainer->setStore($order->getStore());
+
         $transport = [
             'order' => $order,
             'creditmemo' => $creditmemo,

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

@@ -104,6 +104,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $creditmemo->getOrder();
+            $this->identityContainer->setStore($order->getStore());
 
             $transport = [
                 'order' => $order,

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

@@ -63,6 +63,8 @@ public function __construct(
     public function send(Invoice $invoice, $notify = true, $comment = '')
     {
         $order = $invoice->getOrder();
+        $this->identityContainer->setStore($order->getStore());
+
         $transport = [
             'order' => $order,
             'invoice' => $invoice,

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

@@ -104,6 +104,7 @@ public function send(Invoice $invoice, $forceSyncMode = false)
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $invoice->getOrder();
+            $this->identityContainer->setStore($order->getStore());
 
             $transport = [
                 'order' => $order,

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

@@ -61,6 +61,8 @@ public function __construct(
      */
     public function send(Order $order, $notify = true, $comment = '')
     {
+        $this->identityContainer->setStore($order->getStore());
+
         $transport = [
             'order' => $order,
             'comment' => $comment,

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

@@ -63,6 +63,8 @@ public function __construct(
     public function send(Shipment $shipment, $notify = true, $comment = '')
     {
         $order = $shipment->getOrder();
+        $this->identityContainer->setStore($order->getStore());
+
         $transport = [
             'order' => $order,
             'shipment' => $shipment,

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

@@ -104,6 +104,7 @@ public function send(Shipment $shipment, $forceSyncMode = false)
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $shipment->getOrder();
+            $this->identityContainer->setStore($order->getStore());
 
             $transport = [
                 'order' => $order,

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

@@ -100,6 +100,8 @@ public function send(
         $invoice->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
+            $this->identityContainer->setStore($order->getStore());
+
             $transport = [
                 'order' => $order,
                 'invoice' => $invoice,