Merge branch 'develop' into MAGETWO-31478

Author: Michael Logvin

Gruntfile.js

@@ -480,6 +480,11 @@ module.exports = function (grunt) {
                     areaDir: 'frontend',
                     theme: 'blank'
                 }
+            },
+            lib: {
+                options: {
+                    port: 8080
+                }
             }
         },
 
@@ -488,6 +493,8 @@ module.exports = function (grunt) {
                 template: require('grunt-template-jasmine-requirejs'),
                 ignoreEmpty: true
             },
+            'lib-unit':               specRunner.configure('unit', 'lib', 8080),
+            'lib-integration':        specRunner.configure('integration', 'lib', 8080),
             'backend-unit':           specRunner.configure('unit', 'adminhtml', 8000),
             'backend-integration':    specRunner.configure('integration', 'adminhtml', 8000),
             'frontend-unit':          specRunner.configure('unit', 'frontend', 3000),
@@ -550,16 +557,19 @@ module.exports = function (grunt) {
     //  ---------------------------------------------
 
     grunt.registerTask('spec', [
+        'specRunner:lib',
         'specRunner:backend',
         'specRunner:frontend'
     ]);
 
     grunt.registerTask('unit', [
+        'jasmine:lib-unit',
         'jasmine:backend-unit',
         'jasmine:frontend-unit'
     ]);
 
     grunt.registerTask('integration', [
+        'jasmine:lib-integration',
         'jasmine:backend-integration',
         'jasmine:frontend-integration'
     ]);

app/code/Magento/Customer/Model/Resource/Customer.php

@@ -223,12 +223,8 @@ protected function _saveAddresses(\Magento\Customer\Model\Customer $customer)
                 }
             }
         }
-        if ($customer->dataHasChangedFor('default_billing')) {
-            $this->saveAttribute($customer, 'default_billing');
-        }
-        if ($customer->dataHasChangedFor('default_shipping')) {
-            $this->saveAttribute($customer, 'default_shipping');
-        }
+        $this->saveAttribute($customer, 'default_billing');
+        $this->saveAttribute($customer, 'default_shipping');
 
         return $this;
     }

app/code/Magento/Quote/composer.json

@@ -2,7 +2,7 @@
   "name": "magento/module-quote",
   "description": "N/A",
   "require": {
-      "php": "~5.4.11|~5.5.0",
+      "php": "~5.4.11|~5.5.0|~5.6.0",
       "magento/module-store": "0.42.0-beta6",
       "magento/module-catalog": "0.42.0-beta6",
       "magento/module-customer": "0.42.0-beta6",

app/code/Magento/Sales/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Sales" schema_version="2.0.0">
+    <module name="Magento_Sales" schema_version="2.0.1">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>

app/code/Magento/Sales/sql/sales_setup/update-2.0.1.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\DB\Ddl\Table;
+
+/**
+ * update columns created_at and updated_at in sales entities tables
+ */
+
+$tables = [
+    'sales_creditmemo',
+    'sales_creditmemo_comment',
+    'sales_invoice',
+    'sales_invoice_comment',
+    'sales_order',
+    'sales_order_item',
+    'sales_order_status_history',
+    'sales_payment_transaction',
+    'sales_shipment',
+    'sales_shipment_comment',
+    'sales_shipment_track'
+];
+/** @var \Magento\Framework\DB\Adapter\AdapterInterface $connection */
+$connection = $this->getConnection();
+foreach ($tables as $table) {
+    $columns = $connection->describeTable($this->getTable($table));
+    if (isset($columns['created_at'])) {
+        $createdAt = $columns['created_at'];
+        $createdAt['DEFAULT'] = Table::TIMESTAMP_INIT;
+        $createdAt['TYPE'] = Table::TYPE_TIMESTAMP;
+        $connection->modifyColumn($this->getTable($table), 'created_at', $createdAt);
+    }
+    if (isset($columns['updated_at'])) {
+        $updatedAt = $columns['updated_at'];
+        $updatedAt['DEFAULT'] = Table::TIMESTAMP_UPDATE;
+        $updatedAt['TYPE'] = Table::TYPE_TIMESTAMP;
+        $connection->modifyColumn($this->getTable($table), 'updated_at', $updatedAt);
+    }
+}

app/code/Magento/Sales/sql/sales_setup/upgrade-2.0.0-2.0.1.php

@@ -118,7 +118,7 @@
 </div>
 
 <script>
-require(['prototype'], function(){
+require(['jquery', 'prototype'], function($){
 
 //<![CDATA[
 var submitButtons = $$('.submit-button');
@@ -129,7 +129,7 @@ var fields = $$('.qty-input');
 updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
 
 for(var i=0;i<fields.length;i++){
-    fields[i].observe('change', checkButtonsRelation)
+    $(fields[i]).on('keyup', checkButtonsRelation);
     fields[i].baseValue = fields[i].value;
 }