🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests: - magento#19447: [Backport] chore: remove unused code in admin view of catalog (by @DanielRuf) - magento#19431: [Backport] Sample Link Issue in Downloadable product in magento-2.2.6 magento#19344 (by @ansari-krish) - magento#19430: Fixed issue with Base Currency for website is CND when PayPal Payflow Pro is charging in USD (by @Rykh) - magento#19239: [Backport] Allow to read HTTP/2 response header. (by @gelanivishal) - magento#18922: Fixed 18918 Asterisk sign display twice (by @suryakant-krish) Fixed GitHub Issues: - magento#19344: Sample Link Issue in Downloadable product. (reported by @ansari-krish) has been fixed in magento#19431 by @ansari-krish in 2.2-develop branch Related commits: 1. eed8485 2. 99dbb54 3. 29eea73 4. 3b6307b 5. e519bc6 - magento#19127: Cannot connect to Magento 2 market place (reported by @terrybakshi) has been fixed in magento#19239 by @gelanivishal in 2.2-develop branch Related commits: 1. ebe4af7 - magento#18918: Asterisk sign display twice (reported by @suryakant-krish) has been fixed in magento#18922 by @suryakant-krish in 2.2-develop branch Related commits: 1. 9fbf41a 2. fd9a423 3. 7365f5f 4. c870f0d 5. 1197845 6. c230c7e
dipti2jcommerce · Nov 30, 2018 · a72f59b · a72f59b
2 parents 302437a + ad398bf
commit a72f59b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 37 deletions.
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -469,26 +469,6 @@ define([
             }
         },
 
-        /**
-         * toggles Selects states (for IE) except those to be shown in popup
-         */
-        /*_toggleSelectsExceptBlock: function(flag) {
-         if(Prototype.Browser.IE){
-         if (this.blockForm) {
-         var states = new Array;
-         var selects = this.blockForm.getElementsByTagName("select");
-         for(var i=0; i<selects.length; i++){
-         states[i] = selects[i].style.visibility
-         }
-         }
-         if (this.blockForm) {
-         for(i=0; i<selects.length; i++){
-         selects[i].style.visibility = states[i]
-         }
-         }
-         }
-         },*/
-
         /**
          * Close configuration window
          */

diff --git a/...o/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php b/...o/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
@@ -11,6 +11,9 @@
 use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
 use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
 
+/**
+ * Class for initialization downloadable info from request.
+ */
 class Downloadable
 {
     /**
@@ -92,6 +95,8 @@ public function afterInitialize(
                     }
                 }
                 $extension->setDownloadableProductLinks($links);
+            } else {
+                $extension->setDownloadableProductLinks([]);
             }
             if (isset($downloadable['sample']) && is_array($downloadable['sample'])) {
                 $samples = [];
@@ -107,6 +112,8 @@ public function afterInitialize(
                     }
                 }
                 $extension->setDownloadableProductSamples($samples);
+            } else {
+                $extension->setDownloadableProductSamples([]);
             }
             $product->setExtensionAttributes($extension);
             if ($product->getLinksPurchasedSeparately()) {

diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -419,6 +419,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
             $request->setTrxtype(self::TRXTYPE_SALE);
             $request->setOrigid($payment->getAdditionalInformation(self::PNREF));
             $payment->unsAdditionalInformation(self::PNREF);
+            $request->setData('currency', $payment->getOrder()->getBaseCurrencyCode());
         } elseif ($payment->getParentTransactionId()) {
             $request = $this->buildBasicRequest();
             $request->setOrigid($payment->getParentTransactionId());

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -187,12 +187,12 @@
         display: block;
     }
 
-    // External link marker
+    //  External link marker
     [target='_blank'] {
         &:after {
             &:extend(.abs-icon all);
             content: @icon-external-link__content;
-            font-size: 0.5rem;
+            font-size: .5rem;
             margin-left: @indent__xs;
             vertical-align: super;
         }
@@ -271,9 +271,17 @@
 
         &._show {
             > .submenu {
+                display: block;
+                float: left;
+                left: 100%;
+                max-width: 1640px;
+                min-height: 98.65%;
+                min-width: 100%;
+                overflow-x: scroll;
+                position: absolute;
                 transform: translateX(0);
                 visibility: visible;
-                z-index: @submenu__z-index;
+                z-index: 698;
             }
         }
     }

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -60,11 +60,11 @@
 
 .abs-field-no-label {
     /**
-     * @codingStandardsIgnoreStart
+     *@codingStandardsIgnoreStart
      */
     #mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
-    //@codingStandardsIgnoreEnd
     margin-left: @_length;
+    //@codingStandardsIgnoreEnd
 }
 
 //
@@ -170,13 +170,6 @@
     .admin__control-text,
     .admin__control-textarea {
         width: 100%;
-        &.disabled {
-            background-color: #e9e9e9;
-            border-color: #adadad;
-            color: #303030;
-            cursor: not-allowed;
-            opacity: .5;
-        }
     }
 }
 
@@ -194,13 +187,10 @@
 
 .admin__field-label {
     color: @field-label__color;
+    cursor: pointer;
     margin: 0;
     text-align: right;
 
-    label {
-        cursor: pointer;
-    }
-
     + br {
         display: none;
     }
@@ -296,6 +286,14 @@
             opacity: 1;
         }
     }
+
+    legend.admin__field-label {
+        span {
+            &:after {
+                display: none;
+            } 
+        }
+    }
 
     //  ToDo UI: Scope Labels must be moved from right side of each control to the place under the label of the control.
     //  This code must be removed after Scope Labels are moved completely.
@@ -307,7 +305,11 @@
             content: attr(data-config-scope);
             display: inline-block;
             font-size: @font-size__s;
+            /**
+             *@codingStandardsIgnoreStart
+             */
             left: @_length;
+            //@codingStandardsIgnoreEnd
             line-height: 3.2rem;
             margin-left: 2 * @temp_gutter;
             position: absolute;

diff --git a/lib/internal/Magento/Framework/HTTP/Client/Curl.php b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
@@ -432,7 +432,7 @@ protected function parseHeaders($ch, $data)
     {
         if ($this->_headerCount == 0) {
             $line = explode(" ", trim($data), 3);
-            if (count($line) != 3) {
+            if (count($line) < 2) {
                 $this->doError("Invalid response line returned from server: " . $data);
             }
             $this->_responseStatus = (int)$line[1];