🔃 [EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit b2f141790958 · 2019-02-11T00:30:19.000+02:00
Accepted Public Pull Requests: - #20791: Fixed issue 20790 wishlist icons (by @abrarpathan19) - #20493: Widget-left-navigation-block (by @dipti2jcommerce) - #20727: Exceptions when search product with sku like "42-" (by @Nazar65) - #20756: cms-page-top-spacing-issue :: changes to remove top spacing on Cms pa� (by @ranee2jcommerce) - #19270: escape logo alt text and title (by @ErikPel) - #20762: fixed minor typo (by @pankaj-cedcoss) - #20749: Correct spelling (by @ravi-chandra3197) - #20610: admin-order-info-issue (by @dipti2jcommerce) - #20403: Fixed-Schedule-Update-Form-filed-misalign (by @amol2jcommerce) - #20138: Fixed checkout page product options alignment in order summary (by @mage2pratik) - #19845: Curl - allow setting HTTP version (by @SikailoISM) - #20607: Add filter for `NOT FIND_IN_SET` sql conditions (by @mageprince) Fixed GitHub Issues: - #20790: Luma theme My Wish List page Edit and Remove icons consistency design improvement (reported by @abrarpathan19) has been fixed in #20791 by @abrarpathan19 in 2.3-develop branch Related commits: 1. 5f258f2 2. f4e9176 - #20492: In Admin configuration Widget left navigation block not proper in tablet landscape view (reported by @dipti2jcommerce) has been fixed in #20493 by @dipti2jcommerce in 2.3-develop branch Related commits: 1. 00e1069 - #9988: Quick search by SKU not working properly (reported by @harimayco) has been fixed in #20727 by @Nazar65 in 2.3-develop branch Related commits: 1. cb681ab 2. 7539e8e - #20689: Elastic search not working if sku is like 42-315 (reported by @arijit-codilar) has been fixed in #20727 by @Nazar65 in 2.3-develop branch Related commits: 1. cb681ab 2. 7539e8e - #20716: Exceptions when search product with sku like "42-" (reported by @Nazar65) has been fixed in #20727 by @Nazar65 in 2.3-develop branch Related commits: 1. cb681ab 2. 7539e8e - #20755: cms page top spacing issue at mobile (reported by @priti2jcommerce) has been fixed in #20756 by @ranee2jcommerce in 2.3-develop branch Related commits: 1. 85a5e4d - #19269: Logo "alt" attribute not escaped; possible (self) XSS (reported by @KevinGimbel) has been fixed in #19270 by @ErikPel in 2.3-develop branch Related commits: 1. 42308ca 2. 2d20343 3. be294e8 - #20609: Currency rate value not align proper in order information tab when we create creditmemo from admin (reported by @dipti2jcommerce) has been fixed in #20610 by @dipti2jcommerce in 2.3-develop branch Related commits: 1. 8c4dc05 - #20402: Schedule update from filed misalignment in 768 x 1147 resolution (reported by @amol2jcommerce) has been fixed in #20403 by @amol2jcommerce in 2.3-develop branch Related commits: 1. 9ce78e0 2. 48917fc - #20134: On checkout page product options is not align in order summary (reported by @nainesh2jcommerce) has been fixed in #20138 by @mage2pratik in 2.3-develop branch Related commits: 1. b46a307 2. fb38437 3. b227988 - #19442: Magento/Framework/HTTP/Adapter/Curl.php doesn't allow setting HTTP version (reported by @ryanreeves-taxjar) has been fixed in #19845 by @SikailoISM in 2.3-develop branch Related commits: 1. 3ad96a1
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;
+
 /**
  * Catalog fieldset element renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;
-
 class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
 {
     /**
@@ -29,7 +29,7 @@ public function getDataObject()
     }
 
     /**
-     * Retireve associated with element attribute object
+     * Retrieve associated with element attribute object
      *
      * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
      */
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
@@ -64,7 +64,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
         <see selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" userInput="$$createProduct.price$$" stepKey="checkPriceSimpleProduct"/>
 
-        <!--Login to storfront from customer and check price-->
+        <!--Login to storefront from customer and check price-->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInFromCustomer">
             <argument name="Customer" value="$$createCustomer$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
@@ -104,7 +104,7 @@ $customerUrl = $block->getCustomerViewUrl();
                 <?php if ($order->getBaseCurrencyCode() != $order->getOrderCurrencyCode()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('%1 / %2 rate:', $order->getOrderCurrencyCode(), $order->getBaseCurrencyCode())) ?></th>
-                        <th><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></th>
+                        <td><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></td>
                     </tr>
                 <?php endif; ?>
             </table>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -14,8 +14,8 @@
 <span data-action="toggle-nav" class="action nav-toggle"><span><?= /* @escapeNotVerified */ __('Toggle Nav') ?></span></span>
 <a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
     <img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
-         title="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
-         alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
+         title="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
+         alt="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
          <?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
          <?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
     />
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/controls/bookmarks/bookmarks.js b/app/code/Magento/Ui/view/base/web/js/grid/controls/bookmarks/bookmarks.js
@@ -382,7 +382,7 @@ define([
          * Checks if specified view is in editing state.
          *
          * @param {String} index - Index of a view to be checked.
-         * @returns {Bollean}
+         * @returns {Boolean}
          */
         isEditing: function (index) {
             return this.editing === index;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
@@ -203,7 +203,7 @@
     font-weight: @font-weight__heavier;
     line-height: @line-height__s;
     margin: 0 0 -1px;
-    padding: @admin__page-nav-link__padding;
+    padding: 2rem 0 2rem 1rem;
     transition: @admin__page-nav-transition;
     word-wrap: break-word;
 }
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
@@ -660,10 +660,11 @@
         &.admin__field {
             > .admin__field-control {
                 &:extend(.abs-field-size-small all);
-                float: left;
                 position: relative;
+                display: inline-block;
             }
         }
+        
 
         + .admin__field:last-child {
             width: auto;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -118,6 +118,10 @@
 
             .product {
                 position: relative;
+                .item-options {
+                    &:extend(.abs-product-options-list all);
+                    &:extend(.abs-add-clearfix all);
+                }
             }
         }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -63,6 +63,13 @@
             }
         }
 
+        dl {
+            &.product.options.list {
+                display: inline-block;
+                vertical-align: top;
+            }
+        }
+
         .text {
             &.empty {
                 text-align: center;
@@ -288,6 +295,15 @@
             .details-qty {
                 margin-top: @indent__s;
             }
+
+            .product {
+                .options {
+                    &.list {
+                        &:extend(.abs-product-options-list all);
+                        &:extend(.abs-add-clearfix all);
+                    }
+                }
+            }
         }
 
         .product {
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -118,6 +118,10 @@
 
             .product {
                 position: relative;
+                .item-options {
+                    &:extend(.abs-product-options-list all);
+                    &:extend(.abs-add-clearfix all);
+                }
             }
         }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -458,7 +458,7 @@
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .cms-page-view .page-main {
-        padding-top: 41px;
+        padding-top: 0;
         position: relative;
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -182,6 +182,30 @@
             }
         }
     }
+    .products-grid.wishlist {
+        .product-item-actions { 
+            .action {
+                &.edit,
+                &.delete {
+                    .lib-icon-font(
+                    @icon-edit,
+                    @_icon-font-size: 18px,
+                    @_icon-font-line-height: 20px,
+                    @_icon-font-text-hide: true,
+                    @_icon-font-color: @minicart-icons-color,
+                    @_icon-font-color-hover: @primary__color,
+                    @_icon-font-color-active: @minicart-icons-color
+                    );
+                }
+
+                &.delete {
+                    .lib-icon-font-symbol(
+                    @_icon-font-content: @icon-trash
+                    );
+                }
+            }
+        }
+    }
 }
 
 //
@@ -229,15 +253,7 @@
                         &:last-child {
                             margin-right: 0;
                         }
-
-                        &.edit {
-                            float: left;
-                        }
-
-                        &.delete {
-                            float: right;
-                        }
-
+                        
                         &.edit,
                         &.delete {
                             margin-top: 7px;
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2915,6 +2915,7 @@ public function endSetup()
      * - array("gteq" => $greaterOrEqualValue)
      * - array("lteq" => $lessOrEqualValue)
      * - array("finset" => $valueInSet)
+     * - array("nfinset" => $valueNotInSet)
      * - array("regexp" => $regularExpression)
      * - array("seq" => $stringValue)
      * - array("sneq" => $stringValue)
@@ -2944,6 +2945,7 @@ public function prepareSqlCondition($fieldName, $condition)
             'gteq'          => "{{fieldName}} >= ?",
             'lteq'          => "{{fieldName}} <= ?",
             'finset'        => "FIND_IN_SET(?, {{fieldName}})",
+            'nfinset'       => "NOT FIND_IN_SET(?, {{fieldName}})",
             'regexp'        => "{{fieldName}} REGEXP ?",
             'from'          => "{{fieldName}} >= ?",
             'to'            => "{{fieldName}} <= ?",
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Framework\HTTP\Adapter;
 
+/**
+ * Curl http adapter
+ */
 class Curl implements \Zend_Http_Client_Adapter_Interface
 {
     /**
@@ -139,8 +142,8 @@ public function setConfig($config = [])
     /**
      * Connect to the remote server
      *
-     * @param string  $host
-     * @param int     $port
+     * @param string $host
+     * @param int $port
      * @param boolean $secure
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -167,6 +170,7 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
 
         // set url to post to
         curl_setopt($this->_getResource(), CURLOPT_URL, $url);
+        curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, $http_ver);
         curl_setopt($this->_getResource(), CURLOPT_RETURNTRANSFER, true);
         if ($method == \Zend_Http_Client::POST) {
             curl_setopt($this->_getResource(), CURLOPT_POST, true);
@@ -273,7 +277,7 @@ public function getInfo($opt = 0)
     }
 
     /**
-     * curl_multi_* requests support
+     * Curl_multi_* requests support
      *
      * @param array $urls
      * @param array $options
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -26,7 +26,7 @@ class Match implements QueryInterface
     /**
      * @var string
      */
-    const SPECIAL_CHARACTERS = '+~/\\<>\'":*$#@()!,.?`=%&^';
+    const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
 
     const MINIMAL_CHARACTER_LENGTH = 3;
 

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
	`7`	`+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;`
	`8`	`+`
`7`	`9`	`/**`
`8`	`10`	`* Catalog fieldset element renderer`
`9`	`11`	`*`
`10`	`12`	`* @author Magento Core Team <[email protected]>`
`11`	`13`	`*/`
`12`		`-namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;`
`13`		`-`
`14`	`14`	`class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element`
`15`	`15`	`{`
`16`	`16`	`/**`
`@@ -29,7 +29,7 @@ public function getDataObject()`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * Retireve associated with element attribute object`
	`32`	`+ * Retrieve associated with element attribute object`
`33`	`33`	`*`
`34`	`34`	`* @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute`
`35`	`35`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ define([`
`382`	`382`	`* Checks if specified view is in editing state.`
`383`	`383`	`*`
`384`	`384`	`* @param {String} index - Index of a view to be checked.`
`385`		`- * @returns {Bollean}`
	`385`	`+ * @returns {Boolean}`
`386`	`386`	`*/`
`387`	`387`	`isEditing: function (index) {`
`388`	`388`	`return this.editing === index;`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@`
`203`	`203`	`font-weight: @font-weight__heavier;`
`204`	`204`	`line-height: @line-height__s;`
`205`	`205`	`margin: 0 0 -1px;`
`206`		`- padding: @admin__page-nav-link__padding;`
	`206`	`+ padding: 2rem 0 2rem 1rem;`
`207`	`207`	`transition: @admin__page-nav-transition;`
`208`	`208`	`word-wrap: break-word;`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -660,10 +660,11 @@`
`660`	`660`	`&.admin__field {`
`661`	`661`	`> .admin__field-control {`
`662`	`662`	`&:extend(.abs-field-size-small all);`
`663`		`- float: left;`
`664`	`663`	`position: relative;`
	`664`	`+ display: inline-block;`
`665`	`665`	`}`
`666`	`666`	`}`
	`667`	`+`
`667`	`668`
`668`	`669`	`+ .admin__field:last-child {`
`669`	`670`	`width: auto;`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,10 @@`
`118`	`118`
`119`	`119`	`.product {`
`120`	`120`	`position: relative;`
	`121`	`+ .item-options {`
	`122`	`+ &:extend(.abs-product-options-list all);`
	`123`	`+ &:extend(.abs-add-clearfix all);`
	`124`	`+ }`
`121`	`125`	`}`
`122`	`126`	`}`
`123`	`127`