From ead41d96302630687627b6ba84187fefffbcee25 Mon Sep 17 00:00:00 2001
From: Sergey <simpleadm@gmail.com>
Date: Sat, 24 Mar 2018 21:52:28 +0300
Subject: [PATCH 1/5] Backport of PR 14352 for Magento 2.1: Fixed use config
 option for 'Enable Qty Increments' filed in product import

---
 .../Magento/CatalogImportExport/Model/Import/Product.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 09cbb678987e7..9ad52dda32547 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2549,7 +2549,10 @@ private function _setStockUseConfigFieldsValues($rowData)
     {
         $useConfigFields = array();
         foreach ($rowData as $key => $value) {
-            $useConfigName = self::INVENTORY_USE_CONFIG_PREFIX . $key;
+            $useConfigName = $key === 'enable_qty_increments'
+                ? 'use_config_enable_qty_inc'
+                : self::INVENTORY_USE_CONFIG_PREFIX . $key;
+
             if (isset($this->defaultStockData[$key])
                 && isset($this->defaultStockData[$useConfigName])
                 && !empty($value)

From 86ed9df6955ea67631674be285f3e1abde5646ec Mon Sep 17 00:00:00 2001
From: hitesh-wagento <hitesh@wagento.com>
Date: Wed, 4 Jul 2018 14:47:44 +0530
Subject: [PATCH 2/5] [Changed password placeholder text in checkout page]

---
 .../Checkout/view/frontend/web/template/form/element/email.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
index 0d4e9444d07f0..9932ef6756e76 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
+++ b/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"

From b5902e9aa40e6e2d3efaed0124f73770c9e9fb81 Mon Sep 17 00:00:00 2001
From: hitesh-wagento <hitesh@wagento.com>
Date: Mon, 9 Jul 2018 09:32:56 +0530
Subject: [PATCH 3/5] Changed password placeholder text in checkout page

---
 app/code/Magento/Checkout/i18n/en_US.csv                        | 1 +
 .../Checkout/view/frontend/web/template/form/element/email.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 22ce43249c844..82d2ec98cba2c 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/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"
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
index 9932ef6756e76..88bcd29719d9c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
+++ b/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="password"
+                           placeholder="Password"
                            type="password"
                            name="password"
                            id="customer-password"

From 053fea21816b022dc5ed04845612594a1ce7a537 Mon Sep 17 00:00:00 2001
From: Sergey <simpleadm@gmail.com>
Date: Tue, 1 May 2018 07:07:44 +0300
Subject: [PATCH 4/5] Using constants for qty increments in product import

---
 .../Magento/CatalogImportExport/Model/Import/Product.php     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 9ad52dda32547..52e340cc45f56 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/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,8 +2550,8 @@ private function _setStockUseConfigFieldsValues($rowData)
     {
         $useConfigFields = array();
         foreach ($rowData as $key => $value) {
-            $useConfigName = $key === 'enable_qty_increments'
-                ? 'use_config_enable_qty_inc'
+            $useConfigName = $key === StockItemInterface::ENABLE_QTY_INCREMENTS
+                ? StockItemInterface::USE_CONFIG_ENABLE_QTY_INC
                 : self::INVENTORY_USE_CONFIG_PREFIX . $key;
 
             if (isset($this->defaultStockData[$key])

From 7a6217c5a6bc59f9b318c0de1d73ef3c8c3eccca Mon Sep 17 00:00:00 2001
From: Saurabh Parekh <saurabh.parekh@aureatelabs.com>
Date: Sat, 19 May 2018 13:35:23 +0530
Subject: [PATCH 5/5] Fix function unnecessarily called multiple time

---
 .../CurrencySymbol/view/adminhtml/templates/grid.phtml      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index 58d41da965d65..8cbb081d28fd2 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/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">