Skip to content

Commit 3660812

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #15344: FIXED - appended payment code to ID field to make it unique (by @rakesh-gangani) - #15534: #15255 unlock customer after password reset (by @andreagaspardo) - #15604: [Backport] Removed unused translation for comment tag (by @rogyar) - #15870: chore: prefer woff and woff2 (by @DanielRuf) Fixed GitHub Issues: - #13692: In payment step of checkout I cannot unselect #billing-save-in-address-book checkbox in non-first payment method (reported by @NeosKnowledgeBasePluswerk) has been fixed in #15344 by @rakesh-gangani in 2.2-develop branch Related commits: 1. 97a1ece - #15255: Customer who exceeded max login failures not able to login even after reset password (reported by @tizzyguy87) has been fixed in #15534 by @andreagaspardo in 2.2-develop branch Related commits: 1. 18bbf21
2 parents 2b1bf75 + 174dc06 commit 3660812

File tree

31 files changed

+18
-806
lines changed

31 files changed

+18
-806
lines changed

‎app/code/Magento/Analytics/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
1818
"Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
1919
terms and conditions</a>.]]></comment>
20-
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
20+
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
2121
<label>Advanced Reporting Service</label>
2222
<source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
2323
<backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
2424
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
2525
<config_path>analytics/subscription/enabled</config_path>
2626
</field>
27-
<field id="collection_time" translate="label comment" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
27+
<field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
2828
<label>Time of day to send data</label>
2929
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
3030
<backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>

‎app/code/Magento/Catalog/etc/adminhtml/system.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
</group>
3737
<group id="recently_products" translate="label" type="text" sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="0">
3838
<label>Recently Viewed/Compared Products</label>
39-
<field id="recently_viewed_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
39+
<field id="recently_viewed_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
4040
<label>Lifetime of products in Recently Viewed Widget</label>
4141
</field>
42-
<field id="recently_compared_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
42+
<field id="recently_compared_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
4343
<label>Lifetime of products in Recently Compared Widget</label>
4444
</field>
4545
<field id="synchronize_with_backend" translate="label" type="select" showInDefault="1" canRestore="1">
@@ -83,7 +83,7 @@
8383
<backend_model>Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode</backend_model>
8484
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
8585
</field>
86-
<field id="default_sort_by" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
86+
<field id="default_sort_by" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
8787
<label>Product Listing Sort by</label>
8888
<source_model>Magento\Catalog\Model\Config\Source\ListSort</source_model>
8989
</field>

‎app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<!--/ko-->
1818
<!-- ko if: (isCustomerLoggedIn && customerHasAddresses) -->
1919
<div class="choice field">
20-
<input type="checkbox" class="checkbox" id="billing-save-in-address-book" data-bind="checked: saveInAddressBook" />
21-
<label class="label" for="billing-save-in-address-book">
20+
<input type="checkbox" class="checkbox" data-bind="checked: saveInAddressBook, attr: {id: 'billing-save-in-address-book-' + getCode($parent)}" />
21+
<label class="label" data-bind="attr: {for: 'billing-save-in-address-book-' + getCode($parent)}" >
2222
<span data-bind="i18n: 'Save in address book'"></span>
2323
</label>
2424
</div>

‎app/code/Magento/Customer/Model/AccountManagement.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ public function resetPassword($email, $resetToken, $newPassword)
610610
$customerSecure->setRpToken(null);
611611
$customerSecure->setRpTokenCreatedAt(null);
612612
$customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
613+
$this->getAuthentication()->unlock($customer->getId());
613614
$this->sessionManager->destroy();
614615
$this->destroyCustomerSessions($customer->getId());
615616
$this->customerRepository->save($customer);

‎app/code/Magento/Swatches/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<system>
1010
<section id="catalog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
1111
<group id="frontend" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
12-
<field id="swatches_per_product" translate="label comment" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
12+
<field id="swatches_per_product" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
1313
<label>Swatches per Product</label>
1414
</field>
15-
<field id="show_swatches_in_product_list" translate="label comment" type="select" sortOrder="310" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
15+
<field id="show_swatches_in_product_list" translate="label" type="select" sortOrder="310" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
1616
<label>Show Swatches in Product List</label>
1717
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1818
</field>

‎app/code/Magento/Ups/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<label>Live Account</label>
107107
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
108108
</field>
109-
<field id="unit_of_measure" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
109+
<field id="unit_of_measure" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
110110
<label>Weight Unit</label>
111111
<source_model>Magento\Ups\Model\Config\Source\Unitofmeasure</source_model>
112112
</field>

‎dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,15 +1000,13 @@ fieldset[disabled] .pager .action-next {
10001000
}
10011001
@font-face {
10021002
font-family: 'icons-blank-theme';
1003-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
1004-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg#icons-blank-theme') format('svg');
1003+
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
10051004
font-weight: normal;
10061005
font-style: normal;
10071006
}
10081007
@font-face {
10091008
font-family: 'icons-blank-theme';
1010-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
1011-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype');
1009+
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
10121010
font-weight: normal;
10131011
font-style: normal;
10141012
}

‎lib/web/css/docs/source/_typography.less

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,12 +947,8 @@
947947
// ) {
948948
// @font-face {
949949
// font-family: @family-name;
950-
// src: url('@{font-path}.eot');
951-
// src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
952-
// url('@{font-path}.woff2') format('woff2'),
953-
// url('@{font-path}.woff') format('woff'),
954-
// url('@{font-path}.ttf') format('truetype'),
955-
// url('@{font-path}.svg#@{family-name}') format('svg');
950+
// src: url('@{font-path}.woff2') format('woff2'),
951+
// url('@{font-path}.woff') format('woff');
956952
// font-weight: @font-weight;
957953
// font-style: @font-style;
958954
// }

‎lib/web/css/source/lib/_typography.less

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
) {
1616
@font-face {
1717
font-family: @family-name;
18-
src: url('@{font-path}.eot');
19-
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
20-
url('@{font-path}.woff2') format('woff2'),
21-
url('@{font-path}.woff') format('woff'),
22-
url('@{font-path}.ttf') format('truetype'),
23-
url('@{font-path}.svg#@{family-name}') format('svg');
18+
src: url('@{font-path}.woff2') format('woff2'),
19+
url('@{font-path}.woff') format('woff');
2420
font-weight: @font-weight;
2521
font-style: @font-style;
2622
}

0 commit comments

Comments
 (0)