0044678: A warning message is shown if the discount selected has no amount defined

From 4261d1b47f3e9dbb4574484315e73c7fd948fe3e Mon Sep 17 00:00:00 2001
From: Andy Armaignac <andy.armaignac@doceleguas.com>
Date: Wed, 22 Jul 2020 16:36:06 -0400
Subject: [PATCH] Fixed issue-2262: Unwanted notification message is shown
 after discount is selected

A new validation was added to check if the notifications should be shown.

Now the notifications will be shown if the showNotification field is not defined in the event or is defined with true value
---
 .../js/pointofsale/view/ticketdiscount.js     | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js
index a5126d284..cb83bc288 100644
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js
@@ -346,27 +346,32 @@ enyo.kind({
           return;
         }
         if (
-          OB.UTIL.isNullOrUndefined(args.formElementDiscountsList) ||
-          OB.UTIL.isNullOrUndefined(args.formElementDiscountsList.model)
+          OB.UTIL.isNullOrUndefined(args.inEvent.showNotification) ||
+          args.inEvent.showNotification
         ) {
-          // Mandatory infornation
-          OB.UTIL.showError(
-            'Critical discount information is missing: ' +
-              (args.formElementDiscountsList
-                ? 'Discount model'
-                : 'Discount Container')
-          );
-        } else if (
-          OB.UTIL.isNullOrUndefined(args.formElementDiscountsList.amt) ||
-          OB.UTIL.isNullOrUndefined(args.formElementDiscountsList.units)
-        ) {
-          // Without this information, the discounts could not be applied
-          OB.UTIL.showWarning(
-            'Some discount information is missing, the promotion could not be applied: ' +
-              (args.formElementDiscountsList.amt
-                ? 'Discount units'
-                : 'Discount amount')
-          );
+          if (
+            OB.UTIL.isNullOrUndefined(args.formElementDiscountsList) ||
+            OB.UTIL.isNullOrUndefined(args.formElementDiscountsList.model)
+          ) {
+            // Mandatory infornation
+            OB.UTIL.showError(
+              'Critical discount information is missing: ' +
+                (args.formElementDiscountsList
+                  ? 'Discount model'
+                  : 'Discount Container')
+            );
+          } else if (
+            OB.UTIL.isNullOrUndefined(args.formElementDiscountsList.amt) ||
+            OB.UTIL.isNullOrUndefined(args.formElementDiscountsList.units)
+          ) {
+            // Without this information, the discounts could not be applied
+            OB.UTIL.showWarning(
+              'Some discount information is missing, the promotion could not be applied: ' +
+                (args.formElementDiscountsList.amt
+                  ? 'Discount units'
+                  : 'Discount amount')
+            );
+          }
         }
         if (args.hideLineSelectionOptions) {
           args.context.$.formElementCheckSelectAll.hide();
-- 
2.25.1

From a74b990c3eb556f36a0c407a72ecabb84bcb93b9 Mon Sep 17 00:00:00 2001
From: Andy Armaignac <andy.armaignac@doceleguas.com>
Date: Wed, 22 Jul 2020 16:32:41 -0400
Subject: [PATCH] Fixed issue-2262: Unwanted notification message is shown
 after discount is selected

Added showNotification field to avoid unwanted notification when the discount is selected in the popup
---
 .../js/discountsButton.js                                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/org.openbravo.retail.discounts.category/js/discountsButton.js b/web/org.openbravo.retail.discounts.category/js/discountsButton.js
index 5d2afc8..7b9bb41 100644
--- a/web/org.openbravo.retail.discounts.category/js/discountsButton.js
+++ b/web/org.openbravo.retail.discounts.category/js/discountsButton.js
@@ -387,7 +387,8 @@ enyo.kind({
       originalText: this.originalText,
       units: this.units,
       requiresQty: this.requiresQty,
-      discountCategoryName: this.discountCategoryName
+      discountCategoryName: this.discountCategoryName,
+      showNotification: false
     });
     this.doHideThisPopup();
   },
-- 
2.25.1