Skip to content

Commit b808af1

Browse files
author
Yuri Kovsher
committed
Merge remote-tracking branch 'main-ce/develop' into S60PR
2 parents 1382b03 + 488cd04 commit b808af1

File tree

256 files changed

+1185
-388
lines changed

Some content is hidden

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

256 files changed

+1185
-388
lines changed

‎app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ define(
4848
var self = this;
4949
if (this.validateHandler() && additionalValidators.validate()) {
5050
this.isPlaceOrderActionAllowed(false);
51-
$.when(setPaymentInformationAction()).done(function() {
51+
$.when(setPaymentInformationAction(this.messageContainer)).done(function() {
5252
self.placeOrderHandler();
5353
}).fail(function() {
5454
self.isPlaceOrderActionAllowed(true);

‎app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
</label>
1616
</div>
1717
<div class="payment-method-content">
18+
<!-- ko foreach: getRegion('messages') -->
19+
<!-- ko template: getTemplate() --><!-- /ko -->
20+
<!--/ko-->
1821
<div class="payment-method-billing-address">
1922
<!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
2023
<!-- ko template: getTemplate() --><!-- /ko -->

‎app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/braintree-paypal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ define(
103103
}
104104
});
105105
} else {
106-
messageList.addErrorMessage({'message': 'Can not initialize PayPal (Braintree)'});
106+
this.messageContainer.addErrorMessage({'message': $t('Can not initialize PayPal (Braintree)')});
107107
}
108108
},
109109
isValid: function () {

‎app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ define(
103103
clientToken: this.clientToken
104104
});
105105
} else {
106-
messageList.addErrorMessage({'message': 'Can not initialize PayPal (Braintree)'});
106+
this.messageContainer.addErrorMessage({'message': $t('Can not initialize PayPal (Braintree)')});
107107
}
108108

109109
return this;
@@ -116,7 +116,7 @@ define(
116116
var self = this,
117117
cardInfo = null;
118118

119-
messageList.clear();
119+
this.messageContainer.clear();
120120
this.quoteBaseGrandTotals = quote.totals().base_grand_total;
121121

122122
this.isPaymentProcessing = $.Deferred();
@@ -194,9 +194,9 @@ define(
194194
this.paymentMethodNonce('');
195195

196196
if (_.isObject(error)) {
197-
messageList.addErrorMessage(error);
197+
this.messageContainer.addErrorMessage(error);
198198
} else {
199-
messageList.addErrorMessage({
199+
this.messageContainer.addErrorMessage({
200200
message: error
201201
});
202202
}

‎app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
</div>
1818

1919
<div class="payment-method-content">
20+
<!-- ko foreach: getRegion('messages') -->
21+
<!-- ko template: getTemplate() --><!-- /ko -->
22+
<!--/ko-->
2023
<fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
2124
<div data-bind="afterRender: initPayPalContainer.bind($data)"></div>
2225
</fieldset>

‎app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</div>
2323

2424
<div class="payment-method-content">
25+
<!-- ko foreach: getRegion('messages') -->
26+
<!-- ko template: getTemplate() --><!-- /ko -->
27+
<!--/ko-->
2528
<div class="payment-method-billing-address">
2629
<!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
2730
<!-- ko template: getTemplate() --><!-- /ko -->

‎app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
"mixins":["magnifier/magnify"],
2121
"magnifierOpts": {
2222
"enabled": <?php /* @escapeNotVerified */ echo $block->getVar("magnifier:enabled"); ?>,
23-
"eventType": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:action"); ?>",
23+
"eventType": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:eventType"); ?>",
2424
"width": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:width"); ?>",
2525
"height": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:height"); ?>",
2626
"top": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:top"); ?>",
2727
"left": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:left"); ?>"
2828
},
2929
"data": <?php /* @escapeNotVerified */ echo $block->getGalleryImagesJson(); ?>,
3030
"options": {
31-
"nav": "<?php /* @escapeNotVerified */ echo $block->getVar("gallery:navigation"); ?>",
31+
"nav": "<?php /* @escapeNotVerified */ echo $block->getVar("gallery:nav"); ?>",
3232
"loop": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:loop"); ?>,
3333
"keyboard": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:keyboard"); ?>,
3434
"arrows": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:arrows"); ?>,
35-
"showCaption": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:show_caption"); ?>,
35+
"showCaption": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:showCaption"); ?>,
3636
"width": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
3737
"thumbwidth": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'width'); ?>,
3838
"thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')

‎app/code/Magento/Checkout/Block/Adminhtml/CartTab.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* Class CartTab
1515
*
1616
* @package Magento\Checkout\Block\Adminhtml
17+
* @codeCoverageIgnore
1718
*/
1819
class CartTab extends TabWrapper
1920
{

‎app/code/Magento/Checkout/Block/Cart.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
3535
* @param \Magento\Checkout\Helper\Cart $cartHelper
3636
* @param \Magento\Framework\App\Http\Context $httpContext
3737
* @param array $data
38+
* @codeCoverageIgnore
3839
*/
3940
public function __construct(
4041
\Magento\Framework\View\Element\Template\Context $context,
@@ -55,6 +56,7 @@ public function __construct(
5556
/**
5657
* Prepare Quote Item Product URLs
5758
*
59+
* @codeCoverageIgnore
5860
* @return void
5961
*/
6062
protected function _construct()
@@ -106,6 +108,7 @@ public function prepareItemUrls()
106108
}
107109

108110
/**
111+
* @codeCoverageIgnore
109112
* @return bool
110113
*/
111114
public function hasError()
@@ -114,6 +117,7 @@ public function hasError()
114117
}
115118

116119
/**
120+
* @codeCoverageIgnore
117121
* @return int
118122
*/
119123
public function getItemsSummaryQty()
@@ -122,6 +126,7 @@ public function getItemsSummaryQty()
122126
}
123127

124128
/**
129+
* @codeCoverageIgnore
125130
* @return bool
126131
*/
127132
public function isWishlistActive()
@@ -140,6 +145,7 @@ public function isWishlistActive()
140145
}
141146

142147
/**
148+
* @codeCoverageIgnore
143149
* @return string
144150
*/
145151
public function getCheckoutUrl()
@@ -165,6 +171,7 @@ public function getContinueShoppingUrl()
165171

166172
/**
167173
* @return bool
174+
* @codeCoverageIgnore
168175
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
169176
*/
170177
public function getIsVirtual()
@@ -218,6 +225,7 @@ public function getItems()
218225
}
219226

220227
/**
228+
* @codeCoverageIgnore
221229
* @return int
222230
*/
223231
public function getItemsCount()

‎app/code/Magento/Checkout/Block/Cart/AbstractCart.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class AbstractCart extends \Magento\Framework\View\Element\Template
4949
* @param \Magento\Customer\Model\Session $customerSession
5050
* @param \Magento\Checkout\Model\Session $checkoutSession
5151
* @param array $data
52+
* @codeCoverageIgnore
5253
*/
5354
public function __construct(
5455
\Magento\Framework\View\Element\Template\Context $context,
@@ -114,6 +115,7 @@ public function getQuote()
114115
* Get all cart items
115116
*
116117
* @return array
118+
* @codeCoverageIgnore
117119
*/
118120
public function getItems()
119121
{
@@ -134,6 +136,7 @@ public function getItemHtml(\Magento\Quote\Model\Quote\Item $item)
134136

135137
/**
136138
* @return array
139+
* @codeCoverageIgnore
137140
*/
138141
public function getTotals()
139142
{

0 commit comments

Comments
 (0)