🔃 [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

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

@@ -8,6 +8,7 @@
 
 namespace Magento\CatalogImportExport\Model\Import;
 
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
@@ -2549,7 +2550,10 @@ private function _setStockUseConfigFieldsValues($rowData)
  {
  $useConfigFields = array();
  foreach ($rowData as $key => $value) {
- $useConfigName = self::INVENTORY_USE_CONFIG_PREFIX . $key;
+ $useConfigName = $key === StockItemInterface::ENABLE_QTY_INCREMENTS
+ ? StockItemInterface::USE_CONFIG_ENABLE_QTY_INC
+ : self::INVENTORY_USE_CONFIG_PREFIX . $key;
+
  if (isset($this->defaultStockData[$key])
  && isset($this->defaultStockData[$useConfigName])
  && !empty($value)

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

@@ -180,3 +180,4 @@ Payment,Payment
 "Not yet calculated","Not yet calculated"
 "We received your order!","We received your order!"
 "Thank you for your purchase!","Thank you for your purchase!"
+"Password", "Password"

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

@@ -39,7 +39,7 @@
  </label>
  <div class="control">
  <input class="input-text"
- placeholder="optional"
+ placeholder="Password"
  type="password"
  name="password"
  id="customer-password"

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

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