0035957: [RR17Q2] On session restart is possible to create a Gift Card with NULL identifier

# HG changeset patch
# User Rafael Queralta <rafaelcuba81@gmail.com>
# Date 1545936485 18000
#      Thu Dec 27 13:48:05 2018 -0500
# Node ID b335dc381adf4133d78c8597a2c67137aba293d2
# Parent  97583bb04d26def2deb66ed5c096a26213bbe73f
Fixed issue 35957: [RR17Q2] On session restart is possible to create a Gift Card
with NULL identifier

- Removed lines without mandatory filds filled

diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
@@ -51,6 +51,7 @@
     // Shows a modal window with the orders pending to be paid
     var orderlist = this.get('orderList'),
         model = this,
+        reCalculateReceipt = false,
         criteria = {
         'hasbeenpaid': 'N'
         };
@@ -97,15 +98,6 @@
         ordersNotPaid.remove(orderToRemove);
       });
 
-      //removing Orders lines without mandatory fields filled
-      OB.UTIL.HookManager.executeHooks('OBPOS_CheckReceiptMandatoryFields', {
-        orders: ordersNotPaid.models
-      }, function (args) {
-        _.each(args.removeOrderList, function (orderToRemove) {
-          ordersNotPaid.remove(orderToRemove);
-        });
-      });
-
       OB.UTIL.HookManager.executeHooks('OBPOS_PreLoadUnpaidOrdersHook', {
         ordersNotPaid: ordersNotPaid,
         model: model
@@ -122,7 +114,16 @@
             // At this point it is sure that there exists at least one order
             // Function to continue of there is some error
             currentOrder = args.ordersNotPaid.models[0];
+            //removing Orders lines without mandatory fields filled
+            OB.UTIL.HookManager.executeHooks('OBPOS_CheckReceiptMandatoryFields', {
+              orders: currentOrder
+            }, function (args) {
+              reCalculateReceipt = args.reCalculateReceipt;
+            });
             orderlist.load(currentOrder);
+            if (reCalculateReceipt) {
+              OB.MobileApp.model.receipt.calculateGrossAndSave();
+            }
             loadOrderStr = OB.I18N.getLabel('OBPOS_Order') + currentOrder.get('documentNo') + OB.I18N.getLabel('OBPOS_Loaded');
             OB.UTIL.showAlert.display(loadOrderStr, OB.I18N.getLabel('OBPOS_Info'));
           }

# HG changeset patch
# User Rafael Queralta <rafaelcuba81@gmail.com>
# Date 1545936339 18000
#      Thu Dec 27 13:45:39 2018 -0500
# Node ID 420932cf11d806b3f55d3455cd7db0f0d8177802
# Parent  d09cac70c16aa08d275c30c28bdd5571ad96e422
Fixed issue 35957: [RR17Q2] On session restart is possible to create a Gift Card
with NULL identifier

- Removed lines without mandatory filds filled

diff --git a/web/org.openbravo.retail.giftcards/js/hooks/checkGiftCardMandatoryFields.js b/web/org.openbravo.retail.giftcards/js/hooks/checkGiftCardMandatoryFields.js
--- a/web/org.openbravo.retail.giftcards/js/hooks/checkGiftCardMandatoryFields.js
+++ b/web/org.openbravo.retail.giftcards/js/hooks/checkGiftCardMandatoryFields.js
@@ -11,21 +11,14 @@
 
 (function () {
   OB.UTIL.HookManager.registerHook('OBPOS_CheckReceiptMandatoryFields', function (args, callbacks) {
-    var orders = args.orders;
-    var removeOrderList = _.filter(orders, function (order) {
-      var isGiftCardProduct = false;
-      _.each(order.get('lines').models, function (l) {
-        if (l.get('product').get('gcnvGiftcardtype') === 'G' && _.isUndefined(l.get('giftcardid'))) {
-          isGiftCardProduct = true;
-          return;
-        }
-      });
-      if (isGiftCardProduct) {
-        return true;
+    var linesToRemove = [];
+    _.each(args.orders.get('lines').models, function (l) {
+      if (l.get('product').get('gcnvGiftcardtype') === 'G' && _.isUndefined(l.get('giftcardid'))) {
+        linesToRemove.push(l);
       }
     });
-    args.removeOrderList = removeOrderList;
+    args.orders.deleteLinesFromOrder(linesToRemove);
+    args.reCalculateReceipt = linesToRemove.length > 0 ? true : false;
     OB.UTIL.HookManager.callbackExecutor(args, callbacks);
-    return;
   });
 }());
\ No newline at end of file