Skip to content

Commit 7d62c64

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #16761: [Backport] Fix function unnecessarily called multiple time (by @gelanivishal) - #16526: [Backport : Changed password placeholder text in checkout page] (by @hitesh-wagento) - #14380: [Backport 2.1] Issue 14351: Product import doesn't change `Enable Qty Increments` field (by @simpleadm) Fixed GitHub Issues: - #15355: Function is unnecessarily called multiple time (reported by @saurabh-aureate) has been fixed in #16761 by @gelanivishal in 2.1-develop branch Related commits: 1. 7a6217c - #16378: Wrong placeholder for password field in the checkout page (reported by @mohitka) has been fixed in #16526 by @hitesh-wagento in 2.1-develop branch Related commits: 1. 86ed9df 2. b5902e9 - #14351: Product import doesn't change `Enable Qty Increments` field (reported by @simpleadm) has been fixed in #14380 by @simpleadm in 2.1-develop branch Related commits: 1. ead41d9 2. 053fea2
2 parents 16839c0 + 871f934 commit 7d62c64

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

app/code/Magento/CatalogImportExport/Model/Import/Product.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace Magento\CatalogImportExport\Model\Import;
1010

11+
use Magento\CatalogInventory\Api\Data\StockItemInterface;
1112
use Magento\Framework\App\Filesystem\DirectoryList;
1213
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
1314
use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
@@ -2549,7 +2550,10 @@ private function _setStockUseConfigFieldsValues($rowData)
25492550
{
25502551
$useConfigFields = array();
25512552
foreach ($rowData as $key => $value) {
2552-
$useConfigName = self::INVENTORY_USE_CONFIG_PREFIX . $key;
2553+
$useConfigName = $key === StockItemInterface::ENABLE_QTY_INCREMENTS
2554+
? StockItemInterface::USE_CONFIG_ENABLE_QTY_INC
2555+
: self::INVENTORY_USE_CONFIG_PREFIX . $key;
2556+
25532557
if (isset($this->defaultStockData[$key])
25542558
&& isset($this->defaultStockData[$useConfigName])
25552559
&& !empty($value)

app/code/Magento/Checkout/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,4 @@ Payment,Payment
180180
"Not yet calculated","Not yet calculated"
181181
"We received your order!","We received your order!"
182182
"Thank you for your purchase!","Thank you for your purchase!"
183+
"Password", "Password"

app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</label>
4040
<div class="control">
4141
<input class="input-text"
42-
placeholder="optional"
42+
placeholder="Password"
4343
type="password"
4444
name="password"
4545
id="customer-password"

app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
*/
1414
?>
1515

16-
<?php $block->getCurrencySymbolsData();?>
17-
18-
<form id="currency-symbols-form" action="<?php /* @escapeNotVerified */ echo $block->getFormActionUrl() ?>" method="post">
19-
<input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
16+
<form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post">
17+
<input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
2018
<fieldset class="admin__fieldset">
2119
<?php foreach ($block->getCurrencySymbolsData() as $code => $data): ?>
2220
<div class="admin__field _required">

0 commit comments

Comments
 (0)