Merge remote-tracking branch 'mainline/develop' into develop

magento · Dec 20, 2015 · b895ea1 · b895ea1
2 parents 8d98c7e + 3f148f9
commit b895ea1
Show file tree

Hide file tree

Showing 37 changed files with 599 additions and 376 deletions.
diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/BraintreeTwo/view/adminhtml/layout/sales_order_create_index.xml
@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <css src="Magento_BraintreeTwo::css/styles.css"/>
-    </head>
     <body>
         <referenceBlock name="order_create_billing_form">
             <action method="setMethodFormTemplate">

diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml
@@ -36,9 +36,12 @@ $ccType = $block->getInfoData('cc_type');
             <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
         </label>
         <div class="admin__field-control control">
-            <div id="<?php /* @noEscape */ echo $code; ?>_cc_number" class="control-container">
+            <div id="<?php /* @noEscape */ echo $code; ?>_cc_number" class="admin__control-text hosted-control">
                 <span class="icon-type"></span>
             </div>
+            <div class="hosted-error admin__field-error">
+                <?php echo $block->escapeHtml(__('Please enter valid Credit Card Number')); ?>
+            </div>
         </div>
     </div>
 
@@ -47,9 +50,15 @@ $ccType = $block->getInfoData('cc_type');
             <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
         </label>
         <div class="admin__field-control control">
-            <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_month" class="control-container select-date"></div>
-            <span class="inline-separator">/</span>
-            <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_year" class="control-container select-date"></div>
+            <div class="hosted-date-wrap">
+                <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_month"
+                     class="admin__control-text hosted-control hosted-date"></div>
+
+                <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_year"
+                     class="admin__control-text hosted-control hosted-date"></div>
+
+                <div class="hosted-error admin__field-error"><?php echo $block->escapeHtml(__('Please enter valid Expiration Date')); ?></div>
+            </div>
         </div>
     </div>
     <?php if($block->hasVerification()): ?>
@@ -58,7 +67,12 @@ $ccType = $block->getInfoData('cc_type');
                 <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
             </label>
             <div class="admin__field-control control">
-                <div id="<?php /* @noEscape */ echo $code; ?>_cc_cid" class="control-container"></div>
+                <div id="<?php /* @noEscape */ echo $code; ?>_cc_cid"
+                     class="admin__control-text hosted-control hosted-cid"></div>
+
+                <div class="hosted-error admin__field-error">
+                    <?php echo $block->escapeHtml(__('Please enter valid Card Verification Number')); ?>
+                </div>
             </div>
         </div>
     <?php endif; ?>

diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/web/css/styles.css b/app/code/Magento/BraintreeTwo/view/adminhtml/web/css/styles.css
diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/web/images/cards.png b/app/code/Magento/BraintreeTwo/view/adminhtml/web/images/cards.png
diff --git a/app/code/Magento/BraintreeTwo/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/BraintreeTwo/view/frontend/layout/checkout_index_index.xml
@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <css src="Magento_BraintreeTwo::css/styles.css"/>
-    </head>
     <body>
         <referenceBlock name="checkout.root">
             <arguments>

diff --git a/app/code/Magento/BraintreeTwo/view/frontend/web/css/styles.css b/app/code/Magento/BraintreeTwo/view/frontend/web/css/styles.css
diff --git a/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/form.html b/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/form.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="payment-method" data-bind="css: {'_active': isActive() && scriptLoaded()}">
+<div data-bind="attr: {class: 'payment-method payment-method-' + getCode()}, css: {'_active': isActive() && scriptLoaded()}">
     <div class="payment-method-title field choice">
         <input type="radio"
                name="payment[method]"
@@ -61,25 +61,23 @@
                         <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
                     </label>
                     <div class="control">
-                        <div data-bind="attr: {id: getCode() + '_cc_number'}"></div>
+                        <div data-bind="attr: {id: getCode() + '_cc_number'}" class="hosted-control"></div>
+                        <div class="hosted-error"><!-- ko i18n: 'Please enter valid Credit Card Number'--><!-- /ko --></div>
                     </div>
                 </div>
                 <div class="field number required">
                     <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
                         <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
                     </label>
                     <div class="control">
-                        <div class="fields group group-2">
-                            <div class="field no-label month">
-                                <div class="control">
-                                    <div data-bind="attr: {id: getCode() + '_expirationMonth'}"></div>
-                                </div>
-                            </div>
-                            <div class="field no-label year">
-                                <div class="control">
-                                    <div data-bind="attr: {id: getCode() + '_expirationYear'}"></div>
-                                </div>
-                            </div>
+                        <div class="hosted-date-wrap">
+                            <div data-bind="attr: {id: getCode() + '_expirationMonth'}"
+                                 class="hosted-control hosted-date"></div>
+
+                            <div data-bind="attr: {id: getCode() + '_expirationYear'}"
+                                 class="hosted-control hosted-date"></div>
+
+                            <div class="hosted-error"><!-- ko i18n: 'Please enter valid Expiration Date'--><!-- /ko --></div>
                         </div>
                     </div>
                 </div>
@@ -89,7 +87,9 @@
                         <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                     </label>
                     <div class="control _with-tooltip">
-                        <div data-bind="attr: {id: getCode() + '_cc_cid'}"></div>
+                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
+                        <div class="hosted-error"><!-- ko i18n: 'Please enter valid Card Verification Number'--><!-- /ko --></div>
+
                         <div class="field-tooltip toggle">
                             <span class="field-tooltip-action action-cvv"
                                   tabindex="0"

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -306,3 +306,10 @@ jQuery(window).load(function() {
 
 });
 </script>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Bundle/js/bundle-type-handler": {}
+        }
+    }
+</script>
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
@@ -11,7 +11,7 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
 
-class Attributes extends \Magento\Backend\Block\Widget\Form\Generic
+class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
 {
     /**
      * Retrieve Category object

diff --git a/app/code/Magento/Catalog/Setup/InstallData.php b/app/code/Magento/Catalog/Setup/InstallData.php
@@ -89,13 +89,13 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $categorySetup->updateAttributeGroup($entityTypeId, $attributeSetId, $attributeGroupId, 'sort_order', '10');
 
         $groups = [
-            'display' => ['name' => 'Display Settings', 'sort' => 20, 'id' => null],
-            'design' => ['name' => 'Custom Design', 'sort' => 30, 'id' => null],
+            'display' => ['name' => 'Display Settings', 'code' => 'display-settings', 'sort' => 20, 'id' => null],
+            'design' => ['name' => 'Custom Design', 'code' => 'custom-design', 'sort' => 30, 'id' => null],
         ];
 
         foreach ($groups as $k => $groupProp) {
             $categorySetup->addAttributeGroup($entityTypeId, $attributeSetId, $groupProp['name'], $groupProp['sort']);
-            $groups[$k]['id'] = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $groupProp['name']);
+            $groups[$k]['id'] = $categorySetup->getAttributeGroupId($entityTypeId, $attributeSetId, $groupProp['code']);
         }
 
         // update attributes group and sort
@@ -183,25 +183,25 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $tabNames = [
             'General' => [
                 'attribute_group_name' => $newGeneralTabName,
-                'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newGeneralTabName)),
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newGeneralTabName),
                 'tab_group_code' => 'basic',
                 'sort_order' => 10,
             ],
             'Images' => [
                 'attribute_group_name' => $newImagesTabName,
-                'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newImagesTabName)),
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newImagesTabName),
                 'tab_group_code' => 'basic',
                 'sort_order' => 20,
             ],
             'Meta Information' => [
                 'attribute_group_name' => $newMetaTabName,
-                'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newMetaTabName)),
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newMetaTabName),
                 'tab_group_code' => 'basic',
                 'sort_order' => 30,
             ],
             'Prices' => [
                 'attribute_group_name' => $newPriceTabName,
-                'attribute_group_code' => preg_replace('/[^a-z0-9]+/', '-', strtolower($newPriceTabName)),
+                'attribute_group_code' => $categorySetup->convertToAttributeGroupCode($newPriceTabName),
                 'tab_group_code' => 'advanced',
                 'sort_order' => 40,
             ],

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js
@@ -16,7 +16,8 @@ define([
          */
         init: function () {
 
-            if (weight.productHasWeight()) {
+            //not weight switcher for specific product
+            if (weight.productHasWeightBySwitcher() && weight.hasWeightSwither()) {
                 this.type = {
                     virtual: 'virtual',
                     real: this.$type.val() //simple, configurable