Merge pull request #250 from magento-frontend/PR

Oleksii Korshenko · web-flow · commit 2a70b8237ea4 · 2016-08-16T14:14:35.000-05:00
Fixed Issues:
 - MAGETWO-54186: Problem with js validation when adding product to shopping cart
 - MAGETWO-47553: Customer account info form is broken if middle name attribute is visible
 - MAGETWO-55279: XSD for view.xml is too strict
 - MAGETWO-53533: Gift Wrapping price field is broken in Admin page
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
@@ -40,6 +40,7 @@
     </div>
 </div>
 <?php endif; ?>
+<?php if ($block->isRedirectToCartEnabled()) : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
@@ -49,11 +50,11 @@
         }
     }
 </script>
-<?php if (!$block->isRedirectToCartEnabled()) : ?>
+<?php else : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
-            "catalogAddToCart": {}
+            "Magento_Catalog/js/validate-product": {}
         }
     }
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js b/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js
@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/mage',
+    'Magento_Catalog/product/view/validation',
+    'catalogAddToCart'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.productValidate', {
+        options: {
+            bindSubmit: false,
+            radioCheckboxClosest: '.nested'
+        },
+
+        /**
+         * Uses Magento's validation widget for the form object.
+         * @private
+         */
+        _create: function () {
+            var bindSubmit = this.options.bindSubmit;
+
+            this.element.validation({
+                radioCheckboxClosest: this.options.radioCheckboxClosest,
+
+                /**
+                 * Uses catalogAddToCart widget as submit handler.
+                 * @param {Object} form
+                 * @returns {Boolean}
+                 */
+                submitHandler: function (form) {
+                    var jqForm = $(form).catalogAddToCart({
+                        bindSubmit: bindSubmit
+                    });
+
+                    jqForm.catalogAddToCart('submitForm', jqForm);
+
+                    return false;
+                }
+            });
+        }
+    });
+
+    return $.mage.productValidate;
+});
diff --git a/app/code/Magento/Customer/Setup/CustomerSetup.php b/app/code/Magento/Customer/Setup/CustomerSetup.php
@@ -166,7 +166,7 @@ public function getDefaultEntities()
                     ],
                     'prefix' => [
                         'type' => 'static',
-                        'label' => 'Prefix',
+                        'label' => 'Name Prefix',
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 30,
@@ -202,7 +202,7 @@ public function getDefaultEntities()
                     ],
                     'suffix' => [
                         'type' => 'static',
-                        'label' => 'Suffix',
+                        'label' => 'Name Suffix',
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 70,
@@ -350,7 +350,7 @@ public function getDefaultEntities()
                 'attributes' => [
                     'prefix' => [
                         'type' => 'static',
-                        'label' => 'Prefix',
+                        'label' => 'Name Prefix',
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 10,
@@ -386,7 +386,7 @@ public function getDefaultEntities()
                     ],
                     'suffix' => [
                         'type' => 'static',
-                        'label' => 'Suffix',
+                        'label' => 'Name Suffix',
                         'input' => 'text',
                         'required' => false,
                         'sort_order' => 50,
diff --git a/app/code/Magento/Customer/Setup/InstallSchema.php b/app/code/Magento/Customer/Setup/InstallSchema.php
@@ -100,7 +100,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
             40,
             ['nullable' => true, 'default' => null],
-            'Prefix'
+            'Name Prefix'
         )->addColumn(
             'firstname',
             \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
@@ -124,7 +124,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
             40,
             ['nullable' => true, 'default' => null],
-            'Suffix'
+            'Name Suffix'
         )->addColumn(
             'dob',
             \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
@@ -308,7 +308,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
             40,
             ['nullable' => true, 'default' => null],
-            'Prefix'
+            'Name Prefix'
         )->addColumn(
             'region',
             \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
@@ -332,7 +332,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
             40,
             ['nullable' => true, 'default' => null],
-            'Suffix'
+            'Name Suffix'
         )->addColumn(
             'telephone',
             \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php
@@ -44,7 +44,7 @@ class NameTest extends \PHPUnit_Framework_TestCase
 
     const INVALID_ATTRIBUTE_CODE = 'invalid attribute code';
 
-    const PREFIX_STORE_LABEL = 'Prefix';
+    const PREFIX_STORE_LABEL = 'Name Prefix';
 
     /**#@-*/
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -198,7 +198,7 @@ public function testSendNewAccountEmailWithoutStoreId()
                 'firstname'  => 'FirstName',
                 'lastname'   => 'LastName',
                 'middlename' => 'MiddleName',
-                'prefix'     => 'Prefix',
+                'prefix'     => 'Name Prefix',
         ]);
         $this->_model->sendNewAccountEmail('registered');
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_GiftWrapping/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_GiftWrapping/web/css/source/_module.less
@@ -82,3 +82,76 @@
         }
     }
 }
+
+//
+//  Stores -> Other Settings -> Gift wrapping (create/edit)
+//  _____________________________________________
+//  TODO UI: remove after page build on ui-components
+
+[class*='adminhtml-giftwrapping-'] {
+    .field-base_price {
+        .admin__field-control {
+            max-width: @field-size__s;
+        }
+
+        .admin__control-addon {
+            > .addafter {
+                &:extend(.admin__addon-prefix all);
+                .lib-vendor-prefix-flex-basis(auto);
+                .lib-vendor-prefix-flex-grow(0);
+                .lib-vendor-prefix-flex-shrink(0);
+                position: relative;
+                z-index: 1;
+            }
+
+            [class*='admin__control-'][class] {
+                & ~ .addafter:last-child {
+                    padding-left: 1rem;
+                    position: static !important;
+                    z-index: 0;
+
+                    > * {
+                        position: relative;
+                        vertical-align: top;
+                        z-index: 1;
+                    }
+                }
+
+                & ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern);
+                    bottom: 0;
+                    box-sizing: border-box;
+                    content: '';
+                    left: 0;
+                    position: absolute;
+                    top: 0;
+                    width: 100%;
+                    z-index: -1;
+                }
+
+                &[disabled] ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern[disabled]);
+                }
+
+                &:focus ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern:focus);
+                }
+
+                &:hover ~ .addafter:last-child:before {
+                    &:extend(.abs-form-control-pattern:hover);
+                }
+            }
+        }
+    }
+
+    .field-image {
+        .admin__field-control {
+            padding-top: .8rem;
+
+            > a {
+                display: inline-block;
+                vertical-align: middle;
+            }
+        }
+    }
+}
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -87,6 +87,25 @@
         }
     }
 
+    //  Full name fieldset
+    .fieldset {
+        .fullname {
+            &.field {
+                > .label {
+                    &:extend(.abs-visually-hidden all);
+
+                    + .control {
+                        width: 100%;
+                    }
+                }
+            }
+
+            .field {
+                &:extend(.abs-add-clearfix all);
+            }
+        }
+    }
+
     //
     //  My account
     //  ---------------------------------------------
@@ -400,18 +419,23 @@
         }
     }
 
-    .form-create-account {
-        .fieldset-fullname {
-            .fields {
-                .field {
+    //  Full name fieldset
+    .fieldset {
+        .fullname {
+            .field {
+                .label {
+                    .lib-css(margin, @form-field-type-label-inline__margin);
+                    .lib-css(padding, @form-field-type-label-inline__padding);
+                    .lib-css(text-align, @form-field-type-label-inline__align);
+                    .lib-css(width, @form-field-type-label-inline__width);
+                    box-sizing: border-box;
                     float: left;
-                    margin: 0 @indent__s @indent__s 0;
                 }
-            }
 
-            .field-name-prefix,
-            .field-name-suffix {
-                width: 50px;
+                .control {
+                    .lib-css(width, @form-field-type-control-inline__width);
+                    float: left;
+                }
             }
         }
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -95,6 +95,15 @@
         }
     }
 
+    //  Full name fieldset
+    .fieldset {
+        .fullname {
+            > .label {
+                &:extend(.abs-visually-hidden all);
+            }
+        }
+    }
+
     .box-billing-address,
     .box-shipping-address,
     .box-information,
@@ -349,9 +358,15 @@
     .form-create-account {
         .fieldset-fullname {
             .fields {
+                display: table;
+                width: 100%;
+
                 .field {
-                    float: left;
-                    margin: 0 @indent__s @indent__s 0;
+                    display: table-cell;
+
+                    + .field {
+                        padding-left: @indent__s;
+                    }
                 }
             }
 
@@ -441,7 +456,7 @@
     }
 
     .form-address-edit {
-        .fieldset {
+        > .fieldset {
             &:extend(.abs-blocks-2columns all);
         }
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php
@@ -48,8 +48,8 @@ public function testToHtmlSimpleName()
         $this->assertContains('title="Last Name"', $html);
         $this->assertContains('value="Doe"', $html);
         $this->assertNotContains('title="Middle Name/Initial"', $html);
-        $this->assertNotContains('title="Prefix"', $html);
-        $this->assertNotContains('title="Suffix"', $html);
+        $this->assertNotContains('title="Name Prefix"', $html);
+        $this->assertNotContains('title="Name Suffix"', $html);
     }
 
     /**
@@ -84,9 +84,9 @@ public function testToHtmlFancyName()
         $this->assertContains('value="Doe"', $html);
         $this->assertContains('title="Middle Name/Initial"', $html);
         $this->assertContains('value="Roe"', $html);
-        $this->assertContains('title="Prefix"', $html);
+        $this->assertContains('title="Name Prefix"', $html);
         $this->assertContains('value="Dr."', $html);
-        $this->assertContains('title="Suffix"', $html);
+        $this->assertContains('title="Name Suffix"', $html);
         $this->assertContains('value="Ph.D."', $html);
     }
 }
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/XsdTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/XsdTest.php
@@ -38,6 +38,6 @@ public function testInvalidXmlFile($xsdFile, $invalidXmlFile, $expectedErrorsQty
      */
     public function invalidXmlFileDataProvider()
     {
-        return [['view.xsd', 'view_invalid.xml', 1], ['theme.xsd', 'theme_invalid.xml', 1]];
+        return [['view.xsd', 'view_invalid.xml', 8], ['theme.xsd', 'theme_invalid.xml', 1]];
     }
 }
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/view_invalid.xml b/lib/internal/Magento/Framework/Config/Test/Unit/_files/view_invalid.xml
@@ -10,4 +10,21 @@
         <var name="var1">Value1</var>
         <var name="var1">Value1</var><!-- duplicate var name -->
     </vars>
+    <media>
+        <images module="Magento_Catalog">
+            <!-- Valid image type values -->
+            <image id="test" type="valid"/>
+            <image id="test" type="valid_image"/>
+            <image id="test" type="valid_image_type"/>
+            <!-- Invalid image type values -->
+            <image id="test" type="_invalid_image_type"/>
+            <image id="test" type="invalid-image"/>
+            <image id="test" type="Invalid"/>
+            <image id="test" type="invalid_"/>
+            <image id="test" type="invalid__image"/>
+            <image id="test" type="i"/>
+            <image id="test" type="?invalid"/>
+            <image id="test" type="123"/>
+        </images>
+    </media>
 </view>
diff --git a/lib/internal/Magento/Framework/Config/etc/view.xsd b/lib/internal/Magento/Framework/Config/etc/view.xsd

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`</div>`
`41`	`41`	`</div>`
`42`	`42`	`<?php endif; ?>`
	`43`	`+<?php if ($block->isRedirectToCartEnabled()) : ?>`
`43`	`44`	`<script type="text/x-magento-init">`
`44`	`45`	`{`
`45`	`46`	`"#product_addtocart_form": {`
`@@ -49,11 +50,11 @@`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`	`</script>`
`52`		`-<?php if (!$block->isRedirectToCartEnabled()) : ?>`
	`53`	`+<?php else : ?>`
`53`	`54`	`<script type="text/x-magento-init">`
`54`	`55`	`{`
`55`	`56`	`"#product_addtocart_form": {`
`56`		`- "catalogAddToCart": {}`
	`57`	`+ "Magento_Catalog/js/validate-product": {}`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`	`</script>`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public function testSendNewAccountEmailWithoutStoreId()`
`198`	`198`	`'firstname' => 'FirstName',`
`199`	`199`	`'lastname' => 'LastName',`
`200`	`200`	`'middlename' => 'MiddleName',`
`201`		`- 'prefix' => 'Prefix',`
	`201`	`+ 'prefix' => 'Name Prefix',`
`202`	`202`	`]);`
`203`	`203`	`$this->_model->sendNewAccountEmail('registered');`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,15 @@`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ // Full name fieldset`
	`99`	`+ .fieldset {`
	`100`	`+ .fullname {`
	`101`	`+ > .label {`
	`102`	`+ &:extend(.abs-visually-hidden all);`
	`103`	`+ }`
	`104`	`+ }`
	`105`	`+ }`
	`106`	`+`
`98`	`107`	`.box-billing-address,`
`99`	`108`	`.box-shipping-address,`
`100`	`109`	`.box-information,`
`@@ -349,9 +358,15 @@`
`349`	`358`	`.form-create-account {`
`350`	`359`	`.fieldset-fullname {`
`351`	`360`	`.fields {`
	`361`	`+ display: table;`
	`362`	`+ width: 100%;`
	`363`	`+`
`352`	`364`	`.field {`
`353`		`- float: left;`
`354`		`- margin: 0 @indent__s @indent__s 0;`
	`365`	`+ display: table-cell;`
	`366`	`+`
	`367`	`+ + .field {`
	`368`	`+ padding-left: @indent__s;`
	`369`	`+ }`
`355`	`370`	`}`
`356`	`371`	`}`
`357`	`372`
`@@ -441,7 +456,7 @@`
`441`	`456`	`}`
`442`	`457`
`443`	`458`	`.form-address-edit {`
`444`		`- .fieldset {`
	`459`	`+ > .fieldset {`
`445`	`460`	`&:extend(.abs-blocks-2columns all);`
`446`	`461`	`}`
`447`	`462`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ public function testInvalidXmlFile($xsdFile, $invalidXmlFile, $expectedErrorsQty`
`38`	`38`	`*/`
`39`	`39`	`public function invalidXmlFileDataProvider()`
`40`	`40`	`{`
`41`		`- return [['view.xsd', 'view_invalid.xml', 1], ['theme.xsd', 'theme_invalid.xml', 1]];`
	`41`	`+ return [['view.xsd', 'view_invalid.xml', 8], ['theme.xsd', 'theme_invalid.xml', 1]];`
`42`	`42`	`}`
`43`	`43`	`}`