Skip to content

Commit 9f3f237

Browse files
yelahin-serhiyyelahin-serhiy
committed
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-96599
2 parents aed152f + 6478d2b commit 9f3f237

File tree

97 files changed

+1657
-880
lines changed

Some content is hidden

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

97 files changed

+1657
-880
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/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
<testCaseId value="MAGETWO-94176"/>
1919
<group value="backup"/>
2020
<skip>
21-
<issueId value="MQE-1187"/>
22-
<issueId value="DEVOPS-3512"/>
21+
<issueId value="MC-5807"/>
2322
</skip>
2423
</annotations>
2524

‎app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php

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

99
use Magento\Framework\Exception\InputException;
1010

11+
/**
12+
* Option management model for product attribute.
13+
*/
1114
class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
1215
{
1316
/**
@@ -25,7 +28,7 @@ public function __construct(
2528
}
2629

2730
/**
28-
* {@inheritdoc}
31+
* @inheritdoc
2932
*/
3033
public function getItems($attributeCode)
3134
{
@@ -36,7 +39,7 @@ public function getItems($attributeCode)
3639
}
3740

3841
/**
39-
* {@inheritdoc}
42+
* @inheritdoc
4043
*/
4144
public function add($attributeCode, $option)
4245
{
@@ -47,7 +50,7 @@ public function add($attributeCode, $option)
4750
/** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
4851
$attributeOption = $attributeOption->getLabel();
4952
});
50-
if (in_array($option->getLabel(), $currentOptions)) {
53+
if (in_array($option->getLabel(), $currentOptions, true)) {
5154
return false;
5255
}
5356
}
@@ -59,7 +62,7 @@ public function add($attributeCode, $option)
5962
}
6063

6164
/**
62-
* {@inheritdoc}
65+
* @inheritdoc
6366
*/
6467
public function delete($attributeCode, $optionId)
6568
{

‎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/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<description value="Admin should be able to add image to WYSIWYG content of Block"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-84376"/>
19-
<skip>
20-
<issueId value="MQE-1187" />
21-
</skip>
2219
</annotations>
2320
<before>
2421
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-69988"/>
1919
<group value="сonfigurable_product"/>
20-
<skip>
21-
<issueId value="MAGETWO-96658"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData entity="ApiCategory" stepKey="createCategory"/>

‎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"}}

0 commit comments

Comments
 (0)