From b6ffa788f7720f28d6a015a36b4281e93e3aa2d1 Mon Sep 17 00:00:00 2001
From: Sergey Nosov <snosov@ebay.com>
Date: Wed, 30 Sep 2015 19:07:47 +0300
Subject: [PATCH] SUPEE-6995: Issue with saving promotions

- merged solution from MAGETWO-40712 (049180e, 2e2c729)
---
 .../adminhtml/templates/promo/salesrulejs.phtml     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml b/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
index d0f66c68c86a3..f1bfd8498cca3 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
+++ b/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
@@ -67,7 +67,12 @@ function generateCouponCodes(idPrefix, generateUrl, grid) {
 
     var params = Form.serializeElements(elements, true);
     params.form_key = FORM_KEY;
-    $('messages').update();
+    if ($$('#'+idPrefix + 'information_fieldset .messages')) {
+        $$('#'+idPrefix + 'information_fieldset .messages')[0].update();
+    }
+    if ($('messages')) {
+        $('messages').update();
+    }
     var couponCodesGrid = eval(grid);
     new Ajax.Request(generateUrl, {
         parameters :params,
@@ -81,7 +86,11 @@ function generateCouponCodes(idPrefix, generateUrl, grid) {
                 couponCodesGrid.reload();
             }
             if (response && response.messages) {
-                $('messages').update(response.messages);
+                if ($$('#'+idPrefix + 'information_fieldset .messages')) {
+                    $$('#'+idPrefix + 'information_fieldset .messages')[0].update(response.messages);
+                } else if ($('messages')) {
+                    $('messages').update(response.messages);
+                }
             }
             if (response && response.error) {
                 alert(response.error);