Skip to content

Commit 31a28e8

Browse files
Logvin, Michael(mlogvin)Logvin, Michael(mlogvin)
Logvin, Michael(mlogvin)
authored and
Logvin, Michael(mlogvin)
committed
Merge pull request #192 from magento-firedrakes/bugfixes
[Firedrakes && South && WebDev] Bugfixes
2 parents f3bf4cb + 30aacd9 commit 31a28e8

File tree

20 files changed

+75
-45
lines changed

20 files changed

+75
-45
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ password,password
361361
"Shipping Amount","Shipping Amount"
362362
"Tax Amount","Tax Amount"
363363
"Browse Files...","Browse Files..."
364-
"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."
364+
"Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce Inc. All rights reserved."
365365
"Magento ver. %1","Magento ver. %1"
366366
"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
367367
"Account Setting","Account Setting"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ protected function getCustomerIdsForReindex()
6363
$gridTableName = $this->flatScopeResolver->resolve(Customer::CUSTOMER_GRID_INDEXER_ID, []);
6464

6565
$select = $connection->select()
66-
->from($connection->getTableName($gridTableName), 'last_visit_at')
66+
->from($this->resource->getTableName($gridTableName), 'last_visit_at')
6767
->order('last_visit_at DESC')
6868
->limit(1);
6969
$lastVisitAt = $connection->query($select)->fetchColumn();
7070

7171
$select = $connection->select()
72-
->from($connection->getTableName('customer_log'), 'customer_id')
72+
->from($this->resource->getTableName('customer_log'), 'customer_id')
7373
->where('last_login_at > ?', $lastVisitAt);
7474

7575
$customerIds = [];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase
2121

2222
const CHANGE_PASSWORD_URL = 'http://localhost/index.php/account/edit/changepass/1';
2323

24-
const EMAIL_ADDRESS = 'john.doe@ebay.com';
24+
const EMAIL_ADDRESS = 'john.doe@example.com';
2525

2626
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\View\Element\Template\Context */
2727
private $_context;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testSyncCustomerGrid()
9090
->with(\Magento\Customer\Model\Customer::CUSTOMER_GRID_INDEXER_ID, [])
9191
->willReturn($gridTable);
9292

93-
$this->connection->expects($this->exactly(2))
93+
$this->resource->expects($this->exactly(2))
9494
->method('getTableName')
9595
->willReturnMap([
9696
[$gridTable],

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@
508508
</field>
509509
<field name="base_shipping_amount">
510510
<aspect name="to_quote_address_shipping" />
511-
<aspect name="to_cm"/>
512511
</field>
513512
<field name="base_shipping_incl_tax">
514513
<aspect name="to_quote_address_shipping" />

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,11 +1152,22 @@ define([
11521152
jQuery('#edit_form').triggerHandler('save');
11531153
}
11541154
if (this.orderItemChanged) {
1155-
if (confirm('You have item changes')) {
1156-
disableAndSave();
1157-
} else {
1158-
this.itemsUpdate();
1159-
}
1155+
var self = this;
1156+
1157+
jQuery('#edit_form').trigger('processStop');
1158+
1159+
confirm({
1160+
content: jQuery.mage.__('You have item changes'),
1161+
actions: {
1162+
confirm: function() {
1163+
jQuery('#edit_form').trigger('processStart');
1164+
disableAndSave();
1165+
},
1166+
cancel: function() {
1167+
self.itemsUpdate();
1168+
}
1169+
}
1170+
});
11601171
} else {
11611172
disableAndSave();
11621173
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
8080
->addForeignKey(
8181
$setup->getFkName('ui_bookmark', 'user_id', 'admin_user', 'user_id'),
8282
'user_id',
83-
'admin_user',
83+
$setup->getTable('admin_user'),
8484
'user_id',
8585
Table::ACTION_CASCADE
8686
)

‎app/code/Magento/Ui/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"magento/module-backend": "100.0.*",
77
"magento/framework": "100.0.*",
88
"magento/module-eav": "100.0.*",
9-
"magento/module-authorization": "100.0.*"
9+
"magento/module-authorization": "100.0.*",
10+
"magento/module-user": "100.0.*"
1011
},
1112
"type": "magento2-module",
1213
"version": "100.0.1",

‎app/design/frontend/Magento/blank/web/images/logo.svg

Lines changed: 1 addition & 1 deletion
Loading

‎dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function testSetAddress()
104104
'firstname' => 'John',
105105
'lastname' => 'Smith',
106106
'email' => '',
107-
'company' => 'eBay Inc',
107+
'company' => 'Magento Commerce Inc.',
108108
'street' => ['Typical Street', 'Tiny House 18'],
109109
'city' => 'Big City',
110110
'region_id' => 12,
@@ -227,7 +227,7 @@ public function testSetMyAddress()
227227
$addressData = [
228228
'firstname' => 'John',
229229
'lastname' => 'Smith',
230-
'company' => 'eBay Inc',
230+
'company' => 'Magento Commerce Inc.',
231231
'street' => ['Typical Street', 'Tiny House 18'],
232232
'city' => 'Big City',
233233
'region_id' => 12,

‎dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function testSetAddress()
113113
'firstname' => 'John',
114114
'lastname' => 'Smith',
115115
'email' => '',
116-
'company' => 'eBay Inc',
116+
'company' => 'Magento Commerce Inc.',
117117
'street' => ['Typical Street', 'Tiny House 18'],
118118
'city' => 'Big City',
119119
'region_id' => 12,

‎dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<repository class="Magento\UrlRewrite\Test\Repository\UrlRewrite">
1010
<dataset name="default">
1111
<field name="request_path" xsi:type="string">test-test-test%isolation%.html</field>
12-
<field name="target_path" xsi:type="string">http://www.ebayinc.com/</field>
12+
<field name="target_path" xsi:type="string">http://www.example.com/</field>
1313
<field name="redirect_type" xsi:type="string">Temporary (302)</field>
1414
<field name="store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</field>
1515
</dataset>

‎dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testFormPostAction()
7070
'form_key' => $this->_objectManager->get('Magento\Framework\Data\Form\FormKey')->getFormKey(),
7171
'firstname' => 'James',
7272
'lastname' => 'Bond',
73-
'company' => 'Ebay',
73+
'company' => 'Magento Commerce Inc.',
7474
'telephone' => '1112223333',
7575
'fax' => '2223334444',
7676
'street' => ['1234 Monterey Rd', 'Apt 13'],
@@ -117,7 +117,7 @@ public function testFailedFormPostAction()
117117
'form_key' => $this->_objectManager->get('Magento\Framework\Data\Form\FormKey')->getFormKey(),
118118
'firstname' => 'James',
119119
'lastname' => 'Bond',
120-
'company' => 'Ebay',
120+
'company' => 'Magento Commerce Inc.',
121121
'telephone' => '1112223333',
122122
'fax' => '2223334444',
123123
// omit street and city to fail validation

‎dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/FormFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function setUp()
2121
'id' => 13,
2222
'default_shipping' => true,
2323
'default_billing' => false,
24-
'company' => 'eBay Inc.',
24+
'company' => 'Magento Commerce Inc.',
2525
'middlename' => 'MiddleName',
2626
'prefix' => 'Mr.',
2727
'suffix' => 'Esq.',

0 commit comments

Comments
 (0)