🔃 [EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit 872779fb1f00 · 2019-02-14T21:15:10.000+02:00
Accepted Public Pull Requests: - #21157: [Backport] Magento backend catalog cost without currency symbol (by @mage2pratik) - #21199: [Backport] Fixed issue #20555 Meta Keywords/Meta Description are input field in product form while they are defined as textarea (by @amol2jcommerce) - #21198: [Backport] added min=0 to qty field product detail page (by @amol2jcommerce) - #21172: [Backport] Fixes-for-account-my-recent-reviews-alignment-2.2 (by @amol2jcommerce) - #21159: [Backport] Solve custom option dropdown issue (by @mage2pratik) - #21168: [Backport] Adjust table for grouped products (by @mage2pratik) - #21162: [Backport] Fixed issue #20911 In admin login password forgot password page wrong css used to make it vertially aling middle (by @mage2pratik) - #20476: [Backport]Fixed-Product-page-tabbing-content-misalignment-in-mobile-view-2-2 ::� (by @parag2jcommerce) - #18866: [Backport] Fixes #18357 - SQL error when table prefix used. (by @gelanivishal) Fixed GitHub Issues: - #20906: Magento backend catalog "Cost" without currency symbol (reported by @mage2pratik) has been fixed in #21157 by @mage2pratik in 2.2-develop branch Related commits: 1. ee88689 - #20555: Meta Keywords/Meta Description are input field in product form while they are defined as textarea (reported by @amitcedcoss) has been fixed in #21199 by @amol2jcommerce in 2.2-develop branch Related commits: 1. b86a394 - #20800: On account my recent reviews alignment issue (reported by @priti2jcommerce) has been fixed in #21172 by @amol2jcommerce in 2.2-develop branch Related commits: 1. a16427d - #20989: Admin Customizable Options Dropdown sort_order issue (reported by @dharmendra-wagento) has been fixed in #21159 by @mage2pratik in 2.2-develop branch Related commits: 1. 9612b42 - #20911: In admin login password forgot password page wrong css used to make it vertially aling middle (reported by @cedarvinda) has been fixed in #21162 by @mage2pratik in 2.2-develop branch Related commits: 1. 2220707 2. be92e7b 3. bce16b4 - #20468: On Product Page Tabings Content Misaligned on Mobile View (reported by @parag2jcommerce) has been fixed in #20476 by @parag2jcommerce in 2.2-develop branch Related commits: 1. 9e8173f - #18357: checkout_agreement_store doesn't exist (reported by @michelecanal) has been fixed in #18866 by @gelanivishal in 2.2-develop branch Related commits: 1. 2a6f834 - #18954: Magento 2.2.6 Terms and Conditions are Not visible in Admin (reported by @Ctucker9233) has been fixed in #18866 by @gelanivishal in 2.2-develop branch Related commits: 1. 2a6f834
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Config\Source\Product\Options\Price as ProductOptionsPrice;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Ui\Component\Form\Element\Hidden;
 use Magento\Ui\Component\Modal;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\DynamicRows;
@@ -867,10 +868,9 @@ protected function getPositionFieldConfig($sortOrder)
                 'data' => [
                     'config' => [
                         'componentType' => Field::NAME,
-                        'formElement' => Input::NAME,
+                        'formElement' => Hidden::NAME,
                         'dataScope' => static::FIELD_SORT_ORDER_NAME,
                         'dataType' => Number::NAME,
-                        'visible' => false,
                         'sortOrder' => $sortOrder,
                     ],
                 ],
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
@@ -361,8 +361,10 @@ protected function customizeNameListeners(array $meta)
                 'allowImport' => !$this->locator->getProduct()->getId(),
             ];
 
-            if (!in_array($listener, $textListeners)) {
-                $importsConfig['elementTmpl'] = 'ui/form/element/input';
+            if (in_array($listener, $textListeners)) {
+                $importsConfig['cols'] = 15;
+                $importsConfig['rows'] = 2;
+                $importsConfig['elementTmpl'] = 'ui/form/element/textarea';
             }
 
             $meta = $this->arrayManager->merge($listenerPath . static::META_CONFIG_PATH, $meta, $importsConfig);
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -190,6 +190,13 @@
                 <label translate="true">Websites</label>
             </settings>
         </column>
+        <column name="cost" class="Magento\Catalog\Ui\Component\Listing\Columns\Price" sortOrder="120">
+            <settings>
+                <addField>true</addField>
+                <filter>textRange</filter>
+                <label translate="true">Cost</label>
+            </settings>
+        </column>
         <actionsColumn name="actions" class="Magento\Catalog\Ui\Component\Listing\Columns\ProductActions" sortOrder="200">
             <settings>
                 <indexField>entity_id</indexField>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -20,6 +20,7 @@
                 <input type="number"
                        name="qty"
                        id="qty"
+                       min="0"
                        value="<?= /* @escapeNotVerified */ $block->getProductDefaultQty() * 1 ?>"
                        title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                        class="input-text qty"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -20,6 +20,7 @@
                     <input type="number"
                            name="qty"
                            id="qty"
+                           min="0"
                            value=""
                            title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                            class="input-text qty"
diff --git a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
@@ -63,7 +63,7 @@ private function getStoresForAgreements()
 
         if (!empty($agreementId)) {
             $select = $this->getConnection()->select()->from(
-                ['agreement_store' => 'checkout_agreement_store']
+                ['agreement_store' => $this->getResource()->getTable('checkout_agreement_store')]
             )->where(
                 'agreement_store.agreement_id IN (?)',
                 $agreementId
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -33,8 +33,8 @@
         </thead>
 
         <?php if ($_hasAssociatedProducts): ?>
-        <?php foreach ($_associatedProducts as $_item): ?>
         <tbody>
+        <?php foreach ($_associatedProducts as $_item): ?>
             <tr>
                 <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
                     <strong class="product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
@@ -80,8 +80,8 @@
                     </td>
                 </tr>
             <?php endif; ?>
-        </tbody>
         <?php endforeach; ?>
+        </tbody>
         <?php else: ?>
         <tbody>
             <tr>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
@@ -253,7 +253,7 @@ label.mage-error {
 
         .captcha-reload {
             float: right;
-            vertical-align: middle;
+            margin-top: 15px;
         }
     }
 }
@@ -409,30 +409,46 @@ label.mage-error {
             z-index: 1;
 
             &:before {
+                /**
+                 * @codingStandardsIgnoreStart
+                 */
                 &:extend(.admin__control-checkbox + label:before);
+                //  @codingStandardsIgnoreEnd
                 left: 0;
                 position: absolute;
                 top: 0;
             }
 
             &:after {
+                /**
+                 * @codingStandardsIgnoreStart
+                 */
                 &:extend(.action-multicheck-wrap .action-multicheck-toggle:after);
+                //  @codingStandardsIgnoreEnd
                 top: 40% !important;
             }
         }
 
         &:focus {
             + label {
                 &:after {
+                    /**
+                     * @codingStandardsIgnoreStart
+                     */
                     &:extend(.action-multicheck-wrap .action-multicheck-toggle._active:after);
+                    //  @codingStandardsIgnoreEnd
                 }
             }
         }
 
         &._checked {
             + label {
                 &:before {
+                    /**
+                     * @codingStandardsIgnoreStart
+                     */
                     &:extend(.admin__control-checkbox:checked + label:before);
+                    //  @codingStandardsIgnoreEnd
                 }
             }
 
diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less
@@ -34,5 +34,6 @@
         .data.item {
             display: block;
         }
+
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
@@ -364,6 +364,7 @@
             .label {
                 .lib-css(font-weight, @font-weight__semibold);
                 .lib-css(margin-right, @indent__s);
+                vertical-align: middle;
             }
         }
     }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_sections.less b/app/design/frontend/Magento/luma/web/css/source/_sections.less
@@ -19,16 +19,16 @@
             a {
                 position: relative;
                 .lib-icon-font(
-                @_icon-font-content: @icon-down,
-                @_icon-font-size: @font-size__base,
-                @_icon-font-line-height: @icon-font__line-height,
-                @_icon-font-color: @icon-font__color,
-                @_icon-font-color-hover: @icon-font__color-hover,
-                @_icon-font-color-active: @icon-font__color-active,
-                @_icon-font-margin: @icon-font__margin,
-                @_icon-font-vertical-align: @icon-font__vertical-align,
-                @_icon-font-position: after,
-                @_icon-font-display: false
+                    @_icon-font-content: @icon-down,
+                    @_icon-font-size: @font-size__base,
+                    @_icon-font-line-height: @icon-font__line-height,
+                    @_icon-font-color: @icon-font__color,
+                    @_icon-font-color-hover: @icon-font__color-hover,
+                    @_icon-font-color-active: @icon-font__color-active,
+                    @_icon-font-margin: @icon-font__margin,
+                    @_icon-font-vertical-align: @icon-font__vertical-align,
+                    @_icon-font-position: after,
+                    @_icon-font-display: false
                 );
 
                 &:after {
@@ -75,3 +75,17 @@
         }
     }
 }
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .product.data.items {
+        .item.title {
+            > .switch {
+                padding: 1px 15px 1px;
+            }
+        }
+
+        > .item.content {
+            padding: 10px 15px 30px;
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
@@ -27,14 +27,15 @@ class View extends ParentView
      *
      * @var string
      */
-    protected $formatTierPrice = "//tbody[%row-number%]//ul[contains(@class,'tier')]//*[@class='item'][%line-number%]";
+    protected $formatTierPrice =
+        "//tr[@class='row-tier-price'][%row-number%]//ul[contains(@class,'tier')]//*[@class='item'][%line-number%]";
 
     /**
      * This member holds the class name of the special price block.
      *
      * @var string
      */
-    protected $formatSpecialPrice = '//tbody[%row-number%]//*[contains(@class,"price-box")]';
+    protected $formatSpecialPrice = '//tbody//tr[%row-number%]//*[contains(@class,"price-box")]';
 
     /**
      * Get grouped product block

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ label.mage-error {`
`253`	`253`
`254`	`254`	`.captcha-reload {`
`255`	`255`	`float: right;`
`256`		`- vertical-align: middle;`
	`256`	`+ margin-top: 15px;`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`}`
`@@ -409,30 +409,46 @@ label.mage-error {`
`409`	`409`	`z-index: 1;`
`410`	`410`
`411`	`411`	`&:before {`
	`412`	`+ /**`
	`413`	`+ * @codingStandardsIgnoreStart`
	`414`	`+ */`
`412`	`415`	`&:extend(.admin__control-checkbox + label:before);`
	`416`	`+ // @codingStandardsIgnoreEnd`
`413`	`417`	`left: 0;`
`414`	`418`	`position: absolute;`
`415`	`419`	`top: 0;`
`416`	`420`	`}`
`417`	`421`
`418`	`422`	`&:after {`
	`423`	`+ /**`
	`424`	`+ * @codingStandardsIgnoreStart`
	`425`	`+ */`
`419`	`426`	`&:extend(.action-multicheck-wrap .action-multicheck-toggle:after);`
	`427`	`+ // @codingStandardsIgnoreEnd`
`420`	`428`	`top: 40% !important;`
`421`	`429`	`}`
`422`	`430`	`}`
`423`	`431`
`424`	`432`	`&:focus {`
`425`	`433`	`+ label {`
`426`	`434`	`&:after {`
	`435`	`+ /**`
	`436`	`+ * @codingStandardsIgnoreStart`
	`437`	`+ */`
`427`	`438`	`&:extend(.action-multicheck-wrap .action-multicheck-toggle._active:after);`
	`439`	`+ // @codingStandardsIgnoreEnd`
`428`	`440`	`}`
`429`	`441`	`}`
`430`	`442`	`}`
`431`	`443`
`432`	`444`	`&._checked {`
`433`	`445`	`+ label {`
`434`	`446`	`&:before {`
	`447`	`+ /**`
	`448`	`+ * @codingStandardsIgnoreStart`
	`449`	`+ */`
`435`	`450`	`&:extend(.admin__control-checkbox:checked + label:before);`
	`451`	`+ // @codingStandardsIgnoreEnd`
`436`	`452`	`}`
`437`	`453`	`}`
`438`	`454`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@`
`34`	`34`	`.data.item {`
`35`	`35`	`display: block;`
`36`	`36`	`}`
	`37`	`+`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,6 +364,7 @@`
`364`	`364`	`.label {`
`365`	`365`	`.lib-css(font-weight, @font-weight__semibold);`
`366`	`366`	`.lib-css(margin-right, @indent__s);`
	`367`	`+ vertical-align: middle;`
`367`	`368`	`}`
`368`	`369`	`}`
`369`	`370`	`}`