Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@magento-engcom-team
magento-engcom-team authored Dec 7, 2018
2 parents 8c2e178 + 6f01adb commit 3091634
Show file tree
Hide file tree
Showing 54 changed files with 690 additions and 845 deletions.
4 changes: 2 additions & 2 deletions app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
<?php endif; ?>

<?php if(!empty($fraudDetails['fraud_filters'])): ?>
<b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
</b></br>
<strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
</strong></br>
<?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
<?= $block->escapeHtml($filter['name']) ?>:
<?= $block->escapeHtml($filter['action']) ?>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ define([
return function (config, element) {
config = config || {};
jQuery(element).on('click', function () {
categorySubmit(config.url, config.ajax);
categorySubmit();
});
};
});
10 changes: 8 additions & 2 deletions app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

use Magento\Framework\Event\ObserverInterface;

/**
* Class SalesQuoteSaveAfterObserver
*/
class SalesQuoteSaveAfterObserver implements ObserverInterface
{
/**
Expand All @@ -24,15 +27,18 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
}

/**
* Assign quote to session
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
*/
public function execute(\Magento\Framework\Event\Observer $observer)
{
/* @var \Magento\Quote\Model\Quote $quote */
$quote = $observer->getEvent()->getQuote();
/* @var $quote \Magento\Quote\Model\Quote */

if ($quote->getIsCheckoutCart()) {
$this->checkoutSession->getQuoteId($quote->getId());
$this->checkoutSession->setQuoteId($quote->getId());
}
}
}
5 changes: 3 additions & 2 deletions app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ protected function setUp()

public function testSalesQuoteSaveAfter()
{
$quoteId = 7;
$observer = $this->createMock(\Magento\Framework\Event\Observer::class);
$observer->expects($this->once())->method('getEvent')->will(
$this->returnValue(new \Magento\Framework\DataObject(
['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => 7])]
['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => $quoteId])]
))
);
$this->checkoutSession->expects($this->once())->method('getQuoteId')->with(7);
$this->checkoutSession->expects($this->once())->method('setQuoteId')->with($quoteId);

$this->object->execute($observer);
}
Expand Down
20 changes: 10 additions & 10 deletions app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,43 +23,43 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>

<ul>
<li>
<b>{{trans "Reason"}}</b><br />
<strong>{{trans "Reason"}}</strong><br />
{{var reason}}
</li>
<li>
<b>{{trans "Checkout Type"}}</b><br />
<strong>{{trans "Checkout Type"}}</strong><br />
{{var checkoutType}}
</li>
<li>
<b>{{trans "Customer:"}}</b><br />
<strong>{{trans "Customer:"}}</strong><br />
<a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
</li>
<li>
<b>{{trans "Items"}}</b><br />
<strong>{{trans "Items"}}</strong><br />
{{var items|raw}}
</li>
<li>
<b>{{trans "Total:"}}</b><br />
<strong>{{trans "Total:"}}</strong><br />
{{var total}}
</li>
<li>
<b>{{trans "Billing Address:"}}</b><br />
<strong>{{trans "Billing Address:"}}</strong><br />
{{var billingAddress.format('html')|raw}}
</li>
<li>
<b>{{trans "Shipping Address:"}}</b><br />
<strong>{{trans "Shipping Address:"}}</strong><br />
{{var shippingAddress.format('html')|raw}}
</li>
<li>
<b>{{trans "Shipping Method:"}}</b><br />
<strong>{{trans "Shipping Method:"}}</strong><br />
{{var shippingMethod}}
</li>
<li>
<b>{{trans "Payment Method:"}}</b><br />
<strong>{{trans "Payment Method:"}}</strong><br />
{{var paymentMethod}}
</li>
<li>
<b>{{trans "Date & Time:"}}</b><br />
<strong>{{trans "Date & Time:"}}</strong><br />
{{var dateAndTime}}
</li>
</ul>
8 changes: 4 additions & 4 deletions app/code/Magento/Contact/view/frontend/email/submitted_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

<table class="message-details">
<tr>
<td><b>{{trans "Name"}}</b></td>
<td><strong>{{trans "Name"}}</strong></td>
<td>{{var data.name}}</td>
</tr>
<tr>
<td><b>{{trans "Email"}}</b></td>
<td><strong>{{trans "Email"}}</strong></td>
<td>{{var data.email}}</td>
</tr>
<tr>
<td><b>{{trans "Phone"}}</b></td>
<td><strong>{{trans "Phone"}}</strong></td>
<td>{{var data.telephone}}</td>
</tr>
</table>
<p><b>{{trans "Message"}}</b></p>
<p><strong>{{trans "Message"}}</strong></p>
<p>{{var data.comment}}</p>

{{template config_path="design/email/footer_template"}}
4 changes: 2 additions & 2 deletions app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
class="admin__control-text"
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
<?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
<?php endif; ?>
</td>
<?php else: ?>
Expand All @@ -56,7 +56,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
class="admin__control-text"
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
<?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
<?php endif; ?>
</td>
<?php endif; ?>
Expand Down
Loading

0 comments on commit 3091634

Please sign in to comment.