Merge remote-tracking branch 'origin/MAGETWO-59489' into NORD-FIXES

Author: RuslanKostiv1

app/code/Magento/Customer/Model/EmailNotification.php

@@ -60,6 +60,13 @@ class EmailNotification implements EmailNotificationInterface
         self::NEW_ACCOUNT_EMAIL_CONFIRMATION => self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
     ];
 
+    /**
+     * Map of templates. Use for backward compatibility
+     */
+    const TEMPLATE_MAP = [
+        self::XML_PATH_FORGOT_EMAIL_TEMPLATE => self::XML_PATH_RESET_PASSWORD_TEMPLATE
+    ];
+
     /**#@-*/
 
     /**
@@ -241,11 +248,10 @@ private function sendEmailTemplate(
         $storeId = null,
         $email = null
     ) {
-        $templateId = $this->scopeConfig->getValue($template, 'store', $storeId);
+        $templateId = $this->getTemplateId($template, 'store', $storeId);
         if ($email === null) {
             $email = $customer->getEmail();
         }
-
         $transport = $this->transportBuilder->setTemplateIdentifier($templateId)
             ->setTemplateOptions(['area' => 'frontend', 'store' => $storeId])
             ->setTemplateVars($templateParams)
@@ -378,4 +384,23 @@ public function newAccount(
             $storeId
         );
     }
+
+    /**
+     * Get templateId include considering template map
+     *
+     * @param string $template
+     * @param string $scopeType
+     * @param string $storeId
+     * @return string
+     */
+    private function getTemplateId($template, $scopeType, $storeId)
+    {
+        if (array_key_exists($template, self::TEMPLATE_MAP)) {
+            $templateId = $this->scopeConfig->getValue(self::TEMPLATE_MAP[$template], $scopeType, $storeId);
+            if ($templateId) {
+                return $templateId;
+            }
+        }
+        return $this->scopeConfig->getValue($template, $scopeType, $storeId);
+    }
 }

app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php

@@ -545,7 +545,7 @@ public function testPasswordResetConfirmation()
 
         $this->scopeConfigMock->expects($this->at(0))
             ->method('getValue')
-            ->with(EmailNotification::XML_PATH_FORGOT_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $customerStoreId)
+            ->with(EmailNotification::XML_PATH_RESET_PASSWORD_TEMPLATE, ScopeInterface::SCOPE_STORE, $customerStoreId)
             ->willReturn($templateIdentifier);
         $this->scopeConfigMock->expects($this->at(1))
             ->method('getValue')