🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #14922: [Backport] Customer observer name typo fix (by @rogyar)
 - #14903: [Backport] Pass parameter for export button url (by @rogyar)


Fixed GitHub Issues:
 - #12714: Extra records are in exported CSV file for order (reported by @alena-marchenko) has been fixed in #14903 by @rogyar in 2.1-develop branch
   Related commits:
     1. 4bb9d27
     2. 67268ca
     3. 9c5517a

Author: magento-engcom-team

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

@@ -10,7 +10,7 @@
         <observer name="customer_address_before_save_viv_observer" instance="Magento\Customer\Observer\BeforeAddressSaveObserver" />
     </event>
     <event name="customer_address_save_after">
-        <observer name="customer_addres_after_save_viv_observer" instance="Magento\Customer\Observer\AfterAddressSaveObserver" />
+        <observer name="customer_address_after_save_viv_observer" instance="Magento\Customer\Observer\AfterAddressSaveObserver" />
     </event>
     <event name="sales_quote_save_after">
         <observer name="customer_visitor" instance="Magento\Customer\Observer\Visitor\BindQuoteCreateObserver" />

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml

@@ -34,7 +34,15 @@
     <listingToolbar name="listing_top">
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <exportButton name="export_button"/>
+        <exportButton name="export_button">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="additionalParams" xsi:type="array">
+                        <item xsi:type="string" name="order_id">*</item>
+                    </item>
+                </item>
+            </argument>
+        </exportButton>
         <filterSearch name="fulltext"/>
         <filters name="listing_filters">
             <filterSelect name="store_id">

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml

@@ -34,7 +34,15 @@
     <listingToolbar name="listing_top">
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <exportButton name="export_button"/>
+        <exportButton name="export_button">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="additionalParams" xsi:type="array">
+                        <item xsi:type="string" name="order_id">*</item>
+                    </item>
+                </item>
+            </argument>
+        </exportButton>
         <filterSearch name="fulltext"/>
         <filters name="listing_filters">
             <filterSelect name="store_id">

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml

@@ -34,7 +34,15 @@
     <listingToolbar name="listing_top">
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <exportButton name="export_button"/>
+        <exportButton name="export_button">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="additionalParams" xsi:type="array">
+                        <item xsi:type="string" name="order_id">*</item>
+                    </item>
+                </item>
+            </argument>
+        </exportButton>
         <filterSearch name="fulltext"/>
         <filters name="listing_filters">
             <filterSelect name="store_id">

app/code/Magento/Ui/Component/ExportButton.php

@@ -54,16 +54,39 @@ public function getComponentName()
      */
     public function prepare()
     {
+        $context = $this->getContext();
         $config = $this->getData('config');
         if (isset($config['options'])) {
             $options = [];
             foreach ($config['options'] as $option) {
-                $option['url'] = $this->urlBuilder->getUrl($option['url']);
+                $additionalParams = $this->getAdditionalParams($config, $context);
+                $option['url'] = $this->urlBuilder->getUrl($option['url'], $additionalParams);
                 $options[] = $option;
             }
             $config['options'] = $options;
             $this->setData('config', $config);
         }
         parent::prepare();
     }
+
+    /**
+     * Get export button additional parameters
+     *
+     * @param array $config
+     * @param ContextInterface $context
+     * @return array
+     */
+    private function getAdditionalParams($config, $context)
+    {
+        $additionalParams = [];
+        if (isset($config['additionalParams'])) {
+            foreach ($config['additionalParams'] as $paramName => $paramValue) {
+                if ('*' == $paramValue) {
+                    $paramValue = $context->getRequestParam($paramName);
+                }
+                $additionalParams[$paramName] = $paramValue;
+            }
+        }
+        return $additionalParams;
+    }
 }