0045736: Approval not displayed in SCO when discount out of range is applied

From aa859aad4d619cc7ce9da4318ae5a070afadc78f Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Thu, 28 Jan 2021 12:19:00 -0500
Subject: [PATCH] Fixed BUG-45736: Added approval for discount matrix before
 navigate to selfcheckout

---
 .../js/hookRoleDiscounts.js                   | 214 ++++++++++--------
 1 file changed, 119 insertions(+), 95 deletions(-)

diff --git a/web/org.openbravo.retail.discounts.discountmatrixmanagement/js/hookRoleDiscounts.js b/web/org.openbravo.retail.discounts.discountmatrixmanagement/js/hookRoleDiscounts.js
index f1695b8..5e28462 100644
--- a/web/org.openbravo.retail.discounts.discountmatrixmanagement/js/hookRoleDiscounts.js
+++ b/web/org.openbravo.retail.discounts.discountmatrixmanagement/js/hookRoleDiscounts.js
@@ -67,6 +67,105 @@ function OBDMM_RoleDiscounts(roleId) {
   };
 }
 
+function executeDiscountMatrixValidation(args, callbacks, navigationCallback) {
+  OB.info('console', 'OBDMM Approval Discounts Hook Executing ...');
+  // Load discounts ranges for user role
+  var roleDiscounts = new OBDMM_RoleDiscounts(
+    OB.MobileApp.model.get('context').role.id
+  );
+  roleDiscounts.load(function(success) {
+    var order = args.context,
+      message = '',
+      checkApproval = false,
+      lines = order.get('order').get('lines');
+    // Iterate order lines for check discounts
+    lines.each(function(line) {
+      var promotions = line.get('promotions'),
+        priceList = line.get('priceList'),
+        price = line.get('price'),
+        actualPrice = priceList,
+        discountAmount = 0;
+      line.set('obdmmApprovalRequired', false);
+      if (line.get('qty') < 0) {
+        //Negative line. Should not be checked.
+        return;
+      }
+      // Check Price Override
+      if (price !== null) {
+        if (price < priceList) {
+          actualPrice = price;
+          discountAmount = priceList - price;
+        } else {
+          priceList = price;
+          actualPrice = price;
+        }
+      }
+      if (promotions && promotions.length > 0) {
+        // Check valid promotions type
+        var checkDiscount = false;
+        promotions.forEach(function(promotion) {
+          if (promotion.percentage !== undefined) {
+            discountAmount += (actualPrice * promotion.percentage) / 100;
+          } else {
+            if (!promotion.qtyOffer && promotion.qtyOffer === 0) {
+              promotion.qtyOffer = line.get('qty');
+            }
+            if (!promotion.hidden) {
+              discountAmount += OB.DEC.div(promotion.amt, promotion.qtyOffer);
+            }
+          }
+          if (
+            OB.Model.Discounts.discountRules[promotion.discountType].isManual
+          ) {
+            checkDiscount = true;
+          }
+        });
+        if (!checkDiscount) {
+          // Only check discount if line have applicable discounts type
+          discountAmount = 0;
+        }
+      }
+      var discount = OB.Utilities.Number.roundJSNumber(
+        100 - ((priceList - discountAmount) * 100) / priceList,
+        2
+      );
+      if (discount > 0) {
+        var needApproval = roleDiscounts.checkDiscount(
+          discount > 100 ? 100 : discount
+        );
+        if (needApproval) {
+          checkApproval = true;
+          line.set('obdmmApprovalRequired', true);
+          message +=
+            OB.I18N.getLabel('OBMOBC_Character')[1] +
+            ' ' +
+            line.get('product').get('_identifier') +
+            ', ' +
+            OB.I18N.getLabel('OBDMM_label_discount') +
+            ': ' +
+            discount.toFixed(2) +
+            '% <br/>';
+        }
+      }
+    });
+
+    if (checkApproval) {
+      // Approval required
+      OB.info('console', 'OBDMM Approval required');
+
+      args.approvals.push({
+        approval: 'OBDMM_approval.discounts',
+        message: 'OBDMM_approval.discounts',
+        params: [
+          "<div style='font-size:16px;padding-left:0.5em'>" + message + '</div>'
+        ]
+      });
+    }
+    // Continue normal process
+    OB.UTIL.HookManager.callbackExecutor(args, callbacks);
+  });
+}
+
 /**
  * Hook on Check Payment Approval
  */
@@ -94,105 +193,30 @@ function OBDMM_RoleDiscounts(roleId) {
       OB.UTIL.HookManager.callbackExecutor(args, callbacks);
       return;
     }
-    OB.info('console', 'OBDMM Approval Discounts Hook Executing ...');
-    // Load discounts ranges for user role
-    var roleDiscounts = new OBDMM_RoleDiscounts(
-      OB.MobileApp.model.get('context').role.id
-    );
-    roleDiscounts.load(function(success) {
-      var order = args.context,
-        message = '',
-        checkApproval = false,
-        lines = order.get('order').get('lines');
-      // Iterate order lines for check discounts
-      lines.each(function(line) {
-        var promotions = line.get('promotions'),
-          priceList = line.get('priceList'),
-          price = line.get('price'),
-          actualPrice = priceList,
-          discountAmount = 0;
-        line.set('obdmmApprovalRequired', false);
-        if (line.get('qty') < 0) {
-          //Negative line. Should not be checked.
-          return;
-        }
-        // Check Price Override
-        if (price !== null) {
-          if (price < priceList) {
-            actualPrice = price;
-            discountAmount = priceList - price;
-          } else {
-            priceList = price;
-            actualPrice = price;
-          }
-        }
-        if (promotions && promotions.length > 0) {
-          // Check valid promotions type
-          var checkDiscount = false;
-          promotions.forEach(function(promotion) {
-            if (promotion.percentage !== undefined) {
-              discountAmount += (actualPrice * promotion.percentage) / 100;
-            } else {
-              if (!promotion.qtyOffer && promotion.qtyOffer === 0) {
-                promotion.qtyOffer = line.get('qty');
-              }
-              if (!promotion.hidden) {
-                discountAmount += OB.DEC.div(promotion.amt, promotion.qtyOffer);
-              }
-            }
-            if (
-              OB.Model.Discounts.discountRules[promotion.discountType].isManual
-            ) {
-              checkDiscount = true;
+    executeDiscountMatrixValidation(args, callbacks);
+    return;
+  });
+
+  OB.UTIL.HookManager.registerHook('OBMOBC_PreWindowOpen', function(
+    args,
+    callbacks
+  ) {
+    if (args.context.route === 'retail.selfcheckout') {
+      args.approvals = [];
+      executeDiscountMatrixValidation(args, callbacks, function() {
+        OB.UTIL.Approval.requestApproval(
+          OB.MobileApp.view.$.containerWindow.getRoot().model,
+          args.approvals,
+          function(approved, supervisor, approvalType) {
+            if (!approved) {
+              args.cancellation = true;
             }
-          });
-          if (!checkDiscount) {
-            // Only check discount if line have applicable discounts type
-            discountAmount = 0;
+            OB.UTIL.HookManager.callbackExecutor(args, callbacks);
           }
-        }
-        var discount = OB.Utilities.Number.roundJSNumber(
-          100 - ((priceList - discountAmount) * 100) / priceList,
-          2
         );
-        if (discount > 0) {
-          var needApproval = roleDiscounts.checkDiscount(
-            discount > 100 ? 100 : discount
-          );
-          if (needApproval) {
-            checkApproval = true;
-            line.set('obdmmApprovalRequired', true);
-            message +=
-              OB.I18N.getLabel('OBMOBC_Character')[1] +
-              ' ' +
-              line.get('product').get('_identifier') +
-              ', ' +
-              OB.I18N.getLabel('OBDMM_label_discount') +
-              ': ' +
-              discount.toFixed(2) +
-              '% <br/>';
-          }
-        }
       });
-
-      if (checkApproval) {
-        // Approval required
-        OB.info('console', 'OBDMM Approval required');
-
-        args.approvals.push({
-          approval: 'OBDMM_approval.discounts',
-          message: 'OBDMM_approval.discounts',
-          params: [
-            "<div style='font-size:16px;padding-left:0.5em'>" +
-              message +
-              '</div>'
-          ]
-        });
-      }
-      // Continue normal process
+    } else {
       OB.UTIL.HookManager.callbackExecutor(args, callbacks);
-    });
-
-    return;
+    }
   });
 })();
-- 
2.25.1