From 79795f1f94d76d940fce7a4471478d2b8268962b Mon Sep 17 00:00:00 2001 From: Prakash M Date: Thu, 10 Dec 2020 19:34:39 +0530 Subject: [PATCH] Fixed BUG-45475: Fixed js error when doing "done" on open tickets * Also fixes done button getting disabled when prepayment error message is closed in PayOpenTicket --- web/org.openbravo.retail.posterminal/js/data/dataordersave.js | 4 +++- web/org.openbravo.retail.posterminal/js/hookPreOrderSave.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js index b20f906d5..9e5614155 100644 --- a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js +++ b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js @@ -1010,7 +1010,9 @@ var handleError = function() { hasError = true; - completeMultiOrder(); + _.each(closedReceipts, function(receipt) { + completeMultiOrder(); + }); }; if (args && args.cancellation && args.cancellation === true) { diff --git a/web/org.openbravo.retail.posterminal/js/hookPreOrderSave.js b/web/org.openbravo.retail.posterminal/js/hookPreOrderSave.js index ef657e1f6..6f6a34b32 100644 --- a/web/org.openbravo.retail.posterminal/js/hookPreOrderSave.js +++ b/web/org.openbravo.retail.posterminal/js/hookPreOrderSave.js @@ -73,7 +73,7 @@ symbolAtTheRight ) ]); - OB.MobileApp.view.openedPopup.$.bodyContent.$.scrollArea + OB.MobileApp.view.openedPopup.$.body.$.scrollArea .createComponent({ content: msg }) -- 2.20.1