Merge branch 2.2-develop into ENGCOM-4247-magento-magento2-20529

Author: magento-engcom-team

app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php

@@ -6,6 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Design;
 
+/**
+ * Save design action.
+ */
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
@@ -26,6 +29,8 @@ protected function _filterPostData($data)
     }
 
     /**
+     * Save design action.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -54,10 +59,10 @@ public function execute()
             } catch (\Exception $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
-                return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
+                return $resultRedirect->setPath('*/*/edit', ['id' => $design->getId()]);
             }
         }
 
-        return $resultRedirect->setPath('adminhtml/*/');
+        return $resultRedirect->setPath('*/*/');
     }
 }

app/code/Magento/Customer/Model/Vat.php

@@ -179,18 +179,21 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
             return $gatewayResponse;
         }
 
+        $countryCodeForVatNumber = $this->getCountryCodeForVatNumber($countryCode);
+        $requesterCountryCodeForVatNumber = $this->getCountryCodeForVatNumber($requesterCountryCode);
+
         try {
             $soapClient = $this->createVatNumberValidationSoapClient();
 
             $requestParams = [];
-            $requestParams['countryCode'] = $countryCode;
+            $requestParams['countryCode'] = $countryCodeForVatNumber;
             $vatNumberSanitized = $this->isCountryInEU($countryCode)
-                ? str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber)
+                ? str_replace([' ', '-', $countryCodeForVatNumber], ['', '', ''], $vatNumber)
                 : str_replace([' ', '-'], ['', ''], $vatNumber);
             $requestParams['vatNumber'] = $vatNumberSanitized;
-            $requestParams['requesterCountryCode'] = $requesterCountryCode;
+            $requestParams['requesterCountryCode'] = $requesterCountryCodeForVatNumber;
             $reqVatNumSanitized = $this->isCountryInEU($requesterCountryCode)
-                ? str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber)
+                ? str_replace([' ', '-', $requesterCountryCodeForVatNumber], ['', '', ''], $requesterVatNumber)
                 : str_replace([' ', '-'], ['', ''], $requesterVatNumber);
             $requestParams['requesterVatNumber'] = $reqVatNumSanitized;
             // Send request to service
@@ -301,4 +304,22 @@ public function isCountryInEU($countryCode, $storeId = null)
         );
         return in_array($countryCode, $euCountries);
     }
+
+    /**
+     * Returns the country code to use in the VAT number which is not always the same as the normal country code
+     *
+     * @param string $countryCode
+     * @return string
+     */
+    private function getCountryCodeForVatNumber(string $countryCode): string
+    {
+        // Greece uses a different code for VAT numbers then its country code
+        // See: http://ec.europa.eu/taxation_customs/vies/faq.html#item_11
+        // And https://en.wikipedia.org/wiki/VAT_identification_number:
+        // "The full identifier starts with an ISO 3166-1 alpha-2 (2 letters) country code
+        // (except for Greece, which uses the ISO 639-1 language code EL for the Greek language,
+        // instead of its ISO 3166-1 alpha-2 country code GR)"
+
+        return $countryCode === 'GR' ? 'EL' : $countryCode;
+    }
 }

app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html

@@ -36,7 +36,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }
@@ -52,7 +52,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }

app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php

@@ -65,17 +65,16 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
             UrlRewrite::STORE_ID => $oldStoreId,
         ]);
         if ($oldRewrite) {
+            $targetUrl = $targetStore->getBaseUrl();
             // look for url rewrite match on the target store
             $currentRewrite = $this->urlFinder->findOneByData([
-                UrlRewrite::REQUEST_PATH => $urlPath,
+                UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
                 UrlRewrite::STORE_ID => $targetStore->getId(),
             ]);
-            if (null === $currentRewrite) {
-                /** @var \Magento\Framework\App\Response\Http $response */
-                $targetUrl = $targetStore->getBaseUrl();
+            if ($currentRewrite) {
+                $targetUrl .= $currentRewrite->getRequestPath();
             }
         }
-
         return $targetUrl;
     }
 }

app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less

@@ -83,7 +83,7 @@
 
 .message-system-short-wrapper {
     overflow: hidden;
-    padding: 0 1.5rem 0 @indent__l;
+    padding: 0 1.5rem 0 1rem;
 }
 
 .message-system-collapsible {

app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less

@@ -85,7 +85,7 @@
         cursor: pointer;
     }
 
-    &:focus {
+    &:active {
         background-image+: url('../images/arrows-bg.svg');
         background-position+: ~'calc(100% - 12px)' 13px;
 
@@ -107,19 +107,6 @@
     }
 }
 
-//  ToDo UI: add month and date styles
-//  .admin__control-select-month {
-//      width: 140px;
-//  }
-
-//  .admin__control-select-year {
-//      width: 103px;
-//  }
-
-//  .admin__control-cvn {
-//      width: 3em;
-//  }
-
 option:empty {
     display: none;
 }
@@ -151,22 +138,24 @@ option:empty {
 .admin__control-file-label {
     &:before {
         &:extend(.abs-form-control-pattern);
-
-        content:'';
-        left: 0;
-        position: absolute;
-        top: 0;
-        width: 100%;
-        z-index: 0;
-
         .admin__control-file:active + &,
         .admin__control-file:focus + & {
+            /**
+             * @codingStandardsIgnoreStart
+             */
             &:extend(.abs-form-control-pattern:focus);
         }
 
         .admin__control-file[disabled] + & {
             &:extend(.abs-form-control-pattern[disabled]);
         }
+
+        content: '';
+        left: 0;
+        position: absolute;
+        top: 0;
+        width: 100%;
+        z-index: 0;
     }
 }
 

app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less

@@ -643,8 +643,8 @@
         &.admin__field {
             > .admin__field-control {
                 &:extend(.abs-field-size-small all);
-                float: left;
                 position: relative;
+                display: inline-block;
             }
         }
 

app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less

@@ -451,7 +451,8 @@
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,
-    .form.create.account {
+    .form.create.account,
+    .form.form-orders-search {
         min-width: 600px;
         width: 50%;
     }

app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less

@@ -18,6 +18,20 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
+    
+    .search {
+        .fieldset {
+            .control {
+                .addon {
+                    input {
+                        flex-basis: auto;
+                        width: 100%;
+                    }
+                }
+            }
+        }
+    }
+    
     .block-search {
         margin-bottom: 0;
 

app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less

@@ -402,7 +402,8 @@
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,
-    .form.create.account {
+    .form.create.account,
+    .form.form-orders-search {
         min-width: 600px;
         width: 50%;
     }