Skip to content

Commit 70bc364

Browse files
author
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-43691-custom-admin-hostname-2
2 parents 03a2f6c + ea2c7c8 commit 70bc364

File tree

72 files changed

+992
-493
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+992
-493
lines changed

‎app/code/Magento/Braintree/Model/PaymentMethod.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,9 @@ public function __construct(
250250
*
251251
* @param \Magento\Framework\DataObject|mixed $data
252252
* @return $this
253+
* @throws LocalizedException
253254
*/
254-
public function assignData($data)
255+
public function assignData(\Magento\Framework\DataObject $data)
255256
{
256257
parent::assignData($data);
257258
$infoInstance = $this->getInfoInstance();

‎app/code/Magento/Braintree/Model/PaymentMethod/PayPal.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,9 @@ public function getConfigData($field, $storeId = null)
148148
*
149149
* @param \Magento\Framework\DataObject|mixed $data
150150
* @return $this
151+
* @throws LocalizedException
151152
*/
152-
public function assignData($data)
153+
public function assignData(\Magento\Framework\DataObject $data)
153154
{
154155
$infoInstance = $this->getInfoInstance();
155156
$infoInstance->setAdditionalInformation('payment_method_nonce', $data->getPaymentMethodNonce());

‎app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
define([
77
'jquery',
88
'mage/template',
9-
'jquery/ui'
9+
'jquery/ui',
10+
'baseImage'
1011
], function ($, mageTemplate) {
1112
'use strict';
1213

‎app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<?php
1111
$element = $block->getElement();
1212
$fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';
13-
$fieldClass = "field field-{$element->getId()} {$element->getCssClass()}";
13+
$fieldClass = "field admin__field field-{$element->getId()} {$element->getCssClass()}";
1414
$fieldClass .= ($element->getRequired()) ? ' required' : '';
1515
$fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' . $block->getUiId('form-field', $element->getId());
1616
?>
1717

1818
<div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
1919
<?php echo $element->getLabelHtml() ?>
20-
<div class="control">
20+
<div class="control admin__field-control">
2121
<div class="rule-tree">
2222
<div class="rule-tree-wrapper">
2323
<?php echo $block->getInputHtml() ?>

‎app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
9-
<head>
10-
<script src="Magento_Checkout/js/checkout-loader.js"/>
11-
</head>
129
<body>
1310
<referenceContainer name="content">
1411
<block class="Magento\Checkout\Block\Onepage" name="checkout.root" template="onepage.phtml" cacheable="false">

‎app/code/Magento/Checkout/view/frontend/requirejs-config.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ var config = {
99
discountCode: 'Magento_Checkout/js/discount-codes',
1010
shoppingCart: 'Magento_Checkout/js/shopping-cart',
1111
regionUpdater: 'Magento_Checkout/js/region-updater',
12-
sidebar: 'Magento_Checkout/js/sidebar'
12+
sidebar: 'Magento_Checkout/js/sidebar',
13+
checkoutLoader: 'Magento_Checkout/js/checkout-loader',
14+
checkoutData: 'Magento_Checkout/js/checkout-data',
15+
proceedToCheckout: 'Magento_Checkout/js/proceed-to-checkout'
1316
}
14-
}
17+
},
18+
deps: [
19+
"Magento_Checkout/js/checkout-loader"
20+
]
1521
};

‎app/code/Magento/Checkout/view/frontend/web/js/action/select-billing-address.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ define(
88
'jquery',
99
'../model/quote'
1010
],
11-
function($, quote) {
12-
"use strict";
13-
return function(billingAddress) {
11+
function ($, quote) {
12+
'use strict';
13+
14+
return function (billingAddress) {
1415
var address = null;
16+
1517
if (quote.shippingAddress() && billingAddress.getCacheKey() == quote.shippingAddress().getCacheKey()) {
1618
address = $.extend({}, billingAddress);
1719
address.saveInAddressBook = false;
18-
if (quote.shippingAddress().saveInAddressBook || quote.shippingAddress().save_in_address_book) {
19-
address.saveInAddressBook = true;
20-
quote.shippingAddress().saveInAddressBook = false;
21-
}
2220
} else {
2321
address = billingAddress;
2422
}

‎app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/default.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,47 @@
66
define(
77
[
88
'ko',
9-
'jquery',
109
'Magento_Checkout/js/model/quote',
1110
'Magento_Checkout/js/model/resource-url-manager',
1211
'mage/storage',
1312
'Magento_Checkout/js/model/payment-service',
1413
'Magento_Checkout/js/model/payment/method-converter',
1514
'Magento_Checkout/js/model/error-processor',
16-
'Magento_Checkout/js/model/full-screen-loader'
15+
'Magento_Checkout/js/model/full-screen-loader',
16+
'Magento_Checkout/js/action/select-billing-address'
1717
],
1818
function (
1919
ko,
20-
$,
2120
quote,
2221
resourceUrlManager,
2322
storage,
2423
paymentService,
2524
methodConverter,
2625
errorProcessor,
27-
fullScreenLoader
26+
fullScreenLoader,
27+
selectBillingAddressAction
2828
) {
2929
'use strict';
30+
3031
return {
31-
saveShippingInformation: function() {
32-
var billingAddress = quote.billingAddress();
33-
if (!billingAddress) {
34-
billingAddress = $.extend({}, quote.shippingAddress());
35-
quote.billingAddress(billingAddress);
36-
quote.shippingAddress().sameAsBilling = 1;
32+
saveShippingInformation: function () {
33+
var payload;
34+
35+
if (!quote.billingAddress()) {
36+
selectBillingAddressAction(quote.shippingAddress());
3737
}
38-
var payload = {
38+
39+
payload = {
3940
addressInformation: {
4041
shipping_address: quote.shippingAddress(),
41-
billing_address: billingAddress,
42+
billing_address: quote.billingAddress(),
4243
shipping_method_code: quote.shippingMethod().method_code,
4344
shipping_carrier_code: quote.shippingMethod().carrier_code
4445
}
4546
};
4647

4748
fullScreenLoader.startLoader();
49+
4850
return storage.post(
4951
resourceUrlManager.getUrlForSetShippingInformation(quote),
5052
JSON.stringify(payload)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
192192
$customerModel->setRpToken(null);
193193
$customerModel->setRpTokenCreatedAt(null);
194194
}
195-
196-
$this->customerResourceModel->save($customerModel);
195+
$customerModel->save();
197196
$this->customerRegistry->push($customerModel);
198197
$customerId = $customerModel->getId();
199198

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ public function testSave()
268268
'setRpTokenCreatedAt',
269269
'getDataModel',
270270
'setPasswordHash',
271+
'save',
271272
],
272273
[],
273274
'',
@@ -402,9 +403,8 @@ public function testSave()
402403
$customerModel->expects($this->atLeastOnce())
403404
->method('getId')
404405
->willReturn($customerId);
405-
$this->customerResourceModel->expects($this->once())
406-
->method('save')
407-
->with($customerModel);
406+
$customerModel->expects($this->once())
407+
->method('save');
408408
$this->customerRegistry->expects($this->once())
409409
->method('push')
410410
->with($customerModel);
@@ -486,6 +486,7 @@ public function testSaveWithPasswordHash()
486486
'setRpTokenCreatedAt',
487487
'getDataModel',
488488
'setPasswordHash',
489+
'save',
489490
],
490491
[],
491492
'',
@@ -579,9 +580,8 @@ public function testSaveWithPasswordHash()
579580
$customerModel->expects($this->atLeastOnce())
580581
->method('getId')
581582
->willReturn($customerId);
582-
$this->customerResourceModel->expects($this->once())
583-
->method('save')
584-
->with($customerModel);
583+
$customerModel->expects($this->once())
584+
->method('save');
585585
$this->customerRegistry->expects($this->once())
586586
->method('push')
587587
->with($customerModel);

0 commit comments

Comments
 (0)