Skip to content

Commit 3091634

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #19473: Fix issue 19472 - Advance Pricing - Customer Group Price , Select box and Text box alignment issue (by @speedy008) - #19462: remove condition from invoice cancel (by @omaxmo) - #19437: [Forwardport] Issue #19205 Fixed: Bundle Product Option with input type is checkbox and add to cart with 3 values only 2 values added to cart. (by @maheshWebkul721) - #19428: fix: remove unused params in categorySubmit invocation (by @DanielRuf) - #19425: Fix: SalesQuoteSaveAfterObserver fails to update the checkout session quote id when applicable (by @dmytro-ch) - #19421: style: change b to strong (a11y) (by @DanielRuf) - #19412: remove lib-url-check() function from lib docs LESS (by @Karlasa) - #19405: Fix issue 19399 - Add product customization option collapsible design issue (by @speedy008) - #18380: fix(Webapi Xml Renderer - 18361): removed the not needed ampersand re… (by @nickshatilo) - #19329: chore: remove old CSS fixes for IE (by @DanielRuf) - #19331: chore: remove old code for IE9 (by @DanielRuf) - #19310: Framework Escaper - remove direct Object Manager usage (by @maciejslawik) - #18620: 18615 updates structure for last_trans_id to match structures for amazon and klarna. (by @iancassidyweb) - #18648: Write intercepted mapping to generated/metadata during compilation (by @pmclain) Fixed GitHub Issues: - #19472: Advance Pricing - Customer Group Price , Select box and Text box alignment issue (reported by @speedy008) has been fixed in #19473 by @speedy008 in 2.3-develop branch Related commits: 1. c429462 2. 22daf66 3. 1e919a5 - #18509: Can't cancelled invoice if invoice state == STATE_PAID (reported by @omaxmo) has been fixed in #19462 by @omaxmo in 2.3-develop branch Related commits: 1. e3a8af6 - #19205: Bundle Product Option with input type is checkbox and add to cart with 3 values only 2 values added to cart (reported by @sneha-panchal) has been fixed in #19437 by @maheshWebkul721 in 2.3-develop branch Related commits: 1. 4bf63da 2. 98ae6ae - #19424: \Magento\Checkout\Observer\SalesQuoteSaveAfterObserver fails to update the checkout session quote id when applicable (reported by @dhayakawa) has been fixed in #19425 by @dmytro-ch in 2.3-develop branch Related commits: 1. 4d3347c - #19399: Add product customization option collapsible design issue (reported by @speedy008) has been fixed in #19405 by @speedy008 in 2.3-develop branch Related commits: 1. c429462 2. 7ef0c2c - #18361: Customer last name is encoded twice in the XML interface (reported by @nickshatilo) has been fixed in #18380 by @nickshatilo in 2.3-develop branch Related commits: 1. b4181a0 2. 491e918 - #18615: Field restriction incompatibilities between klarna_core_order and sales_order_payment last_trans_id (reported by @iancassidyweb) has been fixed in #18620 by @iancassidyweb in 2.3-develop branch Related commits: 1. 3f9784e - #17680: [2.2.3+][CE/EE][Performance] Interception Cache compilation useless (reported by @IgorVitol) has been fixed in #18648 by @pmclain in 2.3-develop branch Related commits: 1. 86a30b6 2. 3219169 3. a901ad3 4. 7dae4c1 5. cbf828a 6. 4c495f2 7. 1862d2c 8. 2f5b730 9. 9135654 10. 5db83d3 11. 40c58fc 12. be71e3b 13. b80d92d 14. 33435b7
2 parents 8c2e178 + 6f01adb commit 3091634

File tree

54 files changed

+690
-845
lines changed

Some content is hidden

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

54 files changed

+690
-845
lines changed

‎app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
4444
<?php endif; ?>
4545

4646
<?php if(!empty($fraudDetails['fraud_filters'])): ?>
47-
<b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
48-
</b></br>
47+
<strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
48+
</strong></br>
4949
<?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
5050
<?= $block->escapeHtml($filter['name']) ?>:
5151
<?= $block->escapeHtml($filter['action']) ?>

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ define([
8282
return function (config, element) {
8383
config = config || {};
8484
jQuery(element).on('click', function () {
85-
categorySubmit(config.url, config.ajax);
85+
categorySubmit();
8686
});
8787
};
8888
});

‎app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use Magento\Framework\Event\ObserverInterface;
99

10+
/**
11+
* Class SalesQuoteSaveAfterObserver
12+
*/
1013
class SalesQuoteSaveAfterObserver implements ObserverInterface
1114
{
1215
/**
@@ -24,15 +27,18 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
2427
}
2528

2629
/**
30+
* Assign quote to session
31+
*
2732
* @param \Magento\Framework\Event\Observer $observer
2833
* @return void
2934
*/
3035
public function execute(\Magento\Framework\Event\Observer $observer)
3136
{
37+
/* @var \Magento\Quote\Model\Quote $quote */
3238
$quote = $observer->getEvent()->getQuote();
33-
/* @var $quote \Magento\Quote\Model\Quote */
39+
3440
if ($quote->getIsCheckoutCart()) {
35-
$this->checkoutSession->getQuoteId($quote->getId());
41+
$this->checkoutSession->setQuoteId($quote->getId());
3642
}
3743
}
3844
}

‎app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ protected function setUp()
3030

3131
public function testSalesQuoteSaveAfter()
3232
{
33+
$quoteId = 7;
3334
$observer = $this->createMock(\Magento\Framework\Event\Observer::class);
3435
$observer->expects($this->once())->method('getEvent')->will(
3536
$this->returnValue(new \Magento\Framework\DataObject(
36-
['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => 7])]
37+
['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => $quoteId])]
3738
))
3839
);
39-
$this->checkoutSession->expects($this->once())->method('getQuoteId')->with(7);
40+
$this->checkoutSession->expects($this->once())->method('setQuoteId')->with($quoteId);
4041

4142
$this->object->execute($observer);
4243
}

‎app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,43 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
2323

2424
<ul>
2525
<li>
26-
<b>{{trans "Reason"}}</b><br />
26+
<strong>{{trans "Reason"}}</strong><br />
2727
{{var reason}}
2828
</li>
2929
<li>
30-
<b>{{trans "Checkout Type"}}</b><br />
30+
<strong>{{trans "Checkout Type"}}</strong><br />
3131
{{var checkoutType}}
3232
</li>
3333
<li>
34-
<b>{{trans "Customer:"}}</b><br />
34+
<strong>{{trans "Customer:"}}</strong><br />
3535
<a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
3636
</li>
3737
<li>
38-
<b>{{trans "Items"}}</b><br />
38+
<strong>{{trans "Items"}}</strong><br />
3939
{{var items|raw}}
4040
</li>
4141
<li>
42-
<b>{{trans "Total:"}}</b><br />
42+
<strong>{{trans "Total:"}}</strong><br />
4343
{{var total}}
4444
</li>
4545
<li>
46-
<b>{{trans "Billing Address:"}}</b><br />
46+
<strong>{{trans "Billing Address:"}}</strong><br />
4747
{{var billingAddress.format('html')|raw}}
4848
</li>
4949
<li>
50-
<b>{{trans "Shipping Address:"}}</b><br />
50+
<strong>{{trans "Shipping Address:"}}</strong><br />
5151
{{var shippingAddress.format('html')|raw}}
5252
</li>
5353
<li>
54-
<b>{{trans "Shipping Method:"}}</b><br />
54+
<strong>{{trans "Shipping Method:"}}</strong><br />
5555
{{var shippingMethod}}
5656
</li>
5757
<li>
58-
<b>{{trans "Payment Method:"}}</b><br />
58+
<strong>{{trans "Payment Method:"}}</strong><br />
5959
{{var paymentMethod}}
6060
</li>
6161
<li>
62-
<b>{{trans "Date & Time:"}}</b><br />
62+
<strong>{{trans "Date & Time:"}}</strong><br />
6363
{{var dateAndTime}}
6464
</li>
6565
</ul>

‎app/code/Magento/Contact/view/frontend/email/submitted_form.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
<table class="message-details">
1818
<tr>
19-
<td><b>{{trans "Name"}}</b></td>
19+
<td><strong>{{trans "Name"}}</strong></td>
2020
<td>{{var data.name}}</td>
2121
</tr>
2222
<tr>
23-
<td><b>{{trans "Email"}}</b></td>
23+
<td><strong>{{trans "Email"}}</strong></td>
2424
<td>{{var data.email}}</td>
2525
</tr>
2626
<tr>
27-
<td><b>{{trans "Phone"}}</b></td>
27+
<td><strong>{{trans "Phone"}}</strong></td>
2828
<td>{{var data.telephone}}</td>
2929
</tr>
3030
</table>
31-
<p><b>{{trans "Message"}}</b></p>
31+
<p><strong>{{trans "Message"}}</strong></p>
3232
<p>{{var data.comment}}</p>
3333

3434
{{template config_path="design/email/footer_template"}}

‎app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
4545
class="admin__control-text"
4646
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
4747
<?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
48-
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
48+
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
4949
<?php endif; ?>
5050
</td>
5151
<?php else: ?>
@@ -56,7 +56,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
5656
class="admin__control-text"
5757
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
5858
<?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
59-
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
59+
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
6060
<?php endif; ?>
6161
</td>
6262
<?php endif; ?>

0 commit comments

Comments
 (0)