Merge pull request #192 from magento-firedrakes/bugfixes

[Firedrakes && South && WebDev] Bugfixes

Author: Logvin, Michael(mlogvin)

app/code/Magento/Backend/i18n/en_US.csv

@@ -361,7 +361,7 @@ password,password
 "Shipping Amount","Shipping Amount"
 "Tax Amount","Tax Amount"
 "Browse Files...","Browse Files..."
-"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce Inc. All rights reserved."
 "Magento ver. %1","Magento ver. %1"
 "Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
 "Account Setting","Account Setting"

app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

@@ -8,4 +8,4 @@
 
 ?>
 <a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
-<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
+<?php /* @escapeNotVerified */ echo __('Copyright&copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>

app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php

@@ -63,13 +63,13 @@ protected function getCustomerIdsForReindex()
         $gridTableName = $this->flatScopeResolver->resolve(Customer::CUSTOMER_GRID_INDEXER_ID, []);
 
         $select = $connection->select()
-            ->from($connection->getTableName($gridTableName), 'last_visit_at')
+            ->from($this->resource->getTableName($gridTableName), 'last_visit_at')
             ->order('last_visit_at DESC')
             ->limit(1);
         $lastVisitAt = $connection->query($select)->fetchColumn();
 
         $select = $connection->select()
-            ->from($connection->getTableName('customer_log'), 'customer_id')
+            ->from($this->resource->getTableName('customer_log'), 'customer_id')
             ->where('last_login_at > ?', $lastVisitAt);
 
         $customerIds = [];

app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php

@@ -21,7 +21,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase
 
     const CHANGE_PASSWORD_URL = 'http://localhost/index.php/account/edit/changepass/1';
 
-    const EMAIL_ADDRESS = 'john.doe@ebay.com';
+    const EMAIL_ADDRESS = 'john.doe@example.com';
 
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\View\Element\Template\Context */
     private $_context;

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Customer/GridTest.php

@@ -90,7 +90,7 @@ public function testSyncCustomerGrid()
             ->with(\Magento\Customer\Model\Customer::CUSTOMER_GRID_INDEXER_ID, [])
             ->willReturn($gridTable);
 
-        $this->connection->expects($this->exactly(2))
+        $this->resource->expects($this->exactly(2))
             ->method('getTableName')
             ->willReturnMap([
                 [$gridTable],

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

@@ -508,7 +508,6 @@
             </field>
             <field name="base_shipping_amount">
                 <aspect name="to_quote_address_shipping" />
-                <aspect name="to_cm"/>
             </field>
             <field name="base_shipping_incl_tax">
                 <aspect name="to_quote_address_shipping" />

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -1152,11 +1152,22 @@ define([
                 jQuery('#edit_form').triggerHandler('save');
             }
             if (this.orderItemChanged) {
-                if (confirm('You have item changes')) {
-                    disableAndSave();
-                } else {
-                    this.itemsUpdate();
-                }
+                var self = this;
+
+                jQuery('#edit_form').trigger('processStop');
+
+                confirm({
+                    content: jQuery.mage.__('You have item changes'),
+                    actions: {
+                        confirm: function() {
+                            jQuery('#edit_form').trigger('processStart');
+                            disableAndSave();
+                        },
+                        cancel: function() {
+                            self.itemsUpdate();
+                        }
+                    }
+                });
             } else {
                 disableAndSave();
             }

app/code/Magento/Ui/Setup/InstallSchema.php

@@ -80,7 +80,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->addForeignKey(
                 $setup->getFkName('ui_bookmark', 'user_id', 'admin_user', 'user_id'),
                 'user_id',
-                'admin_user',
+                $setup->getTable('admin_user'),
                 'user_id',
                 Table::ACTION_CASCADE
             )

app/code/Magento/Ui/composer.json

@@ -6,7 +6,8 @@
         "magento/module-backend": "100.0.*",
         "magento/framework": "100.0.*",
         "magento/module-eav": "100.0.*",
-        "magento/module-authorization": "100.0.*"
+        "magento/module-authorization": "100.0.*",
+        "magento/module-user": "100.0.*"
     },
     "type": "magento2-module",
     "version": "100.0.1",