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 index 6903a17bcdcca..a2804a8723ce0 100644 --- 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; isetDownloadableProductLinks($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 index f6fb4ae8e078a..855ab88de5038 100644 --- 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 index 8825f4ea3f5a2..a3142b56abd27 100644 --- 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 index f195a28908abe..186c2c822f3d5 100644 --- 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 index 57a5535751f09..375d85806a7d1 100644 --- 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];