🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:

Author: magento-engcom-team

app/code/Magento/Customer/etc/config.xml

@@ -81,17 +81,15 @@ T: {{var telephone}}
 {{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
                 <pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
 {{depend company}}{{var company}}|{{/depend}}
-{{if street1}}{{var street1}}
-{{/if}}
+{{if street1}}{{var street1}}|{{/if}}
 {{depend street2}}{{var street2}}|{{/depend}}
 {{depend street3}}{{var street3}}|{{/depend}}
 {{depend street4}}{{var street4}}|{{/depend}}
-{{if city}}{{var city}},|{{/if}}
-{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
+{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
 {{var country}}|
-{{depend telephone}}T: {{var telephone}}{{/depend}}|
-{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
-{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
+{{depend telephone}}T: {{var telephone}}|{{/depend}}
+{{depend fax}}F: {{var fax}}|{{/depend}}|
+{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}|]]></pdf>
             </address_templates>
         </customer>
         <general>

app/code/Magento/Robots/Controller/Index/Index.php

@@ -43,6 +43,7 @@ public function execute()
         /** @var Page $resultPage */
         $resultPage = $this->resultPageFactory->create(true);
         $resultPage->addHandle('robots_index_index');
+        $resultPage->setHeader('Content-Type', 'text/plain');
         return $resultPage;
     }
 }

app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php

@@ -51,6 +51,9 @@ public function testExecute()
         $resultPageMock->expects($this->once())
             ->method('addHandle')
             ->with('robots_index_index');
+        $resultPageMock->expects($this->once())
+            ->method('setHeader')
+            ->with('Content-Type', 'text/plain');
 
         $this->resultPageFactory->expects($this->any())
             ->method('create')

app/code/Magento/Theme/view/frontend/templates/html/print.phtml

@@ -5,7 +5,14 @@
  */
 ?>
 <script>
-    jQuery(function() {
-        window.print();
-    });
+    require(
+        [
+            'jquery'
+        ],
+        function($) {
+            $(function() {
+                window.print();
+            });
+        }
+    );
 </script>

app/code/Magento/Ui/view/base/web/js/form/form.js

@@ -38,7 +38,8 @@ define([
      * @returns {Object}
      */
     function collectData(items) {
-        var result = {};
+        var result = {},
+            name;
 
         items = Array.prototype.slice.call(items);
 
@@ -54,6 +55,11 @@ define([
                     }
                     break;
 
+                case 'select-multiple':
+                    name = item.name.substring(0, item.name.length - 2); //remove [] from the name ending
+                    result[name] = _.pluck(item.selectedOptions, 'value');
+                    break;
+
                 default:
                     result[item.name] = item.value;
             }

dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php

@@ -56,7 +56,7 @@ public function renderArrayDataProvider()
             [
                 $addressAttributes,
                 AttributeDataFactory::OUTPUT_FORMAT_PDF,
-                "John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
+                "John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
             ],
             [
                 $addressAttributes,
@@ -112,7 +112,7 @@ public function renderDataProvider()
             [
                 $address,
                 AttributeDataFactory::OUTPUT_FORMAT_PDF,
-                "John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|
+                "John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|
 United States|\nT: 3468676|\n|\n|"
             ],
             [