From 572c9907f51b87bfcb60a3f972ec50668bb5c11c Mon Sep 17 00:00:00 2001 From: Raul Ovalle Date: Sat, 10 Aug 2019 13:40:36 -0400 Subject: [PATCH] :ambulance: Function 'disconnect' not working in expected way --- pos_keyboard/__manifest__.py | 2 +- pos_keyboard/doc/changelog.rst | 5 +++++ pos_keyboard/static/src/js/pos.js | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pos_keyboard/__manifest__.py b/pos_keyboard/__manifest__.py index f1b1681..f399b94 100644 --- a/pos_keyboard/__manifest__.py +++ b/pos_keyboard/__manifest__.py @@ -11,7 +11,7 @@ "category": "Point Of Sale", # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version={ODOO_BRANCH}", "images": ['images/keyboard.png'], - "version": "12.0.1.1.3", + "version": "12.0.1.1.4", "application": False, "author": "IT-Projects LLC, Ivan Yelizariev", diff --git a/pos_keyboard/doc/changelog.rst b/pos_keyboard/doc/changelog.rst index d4dcfe4..3959793 100644 --- a/pos_keyboard/doc/changelog.rst +++ b/pos_keyboard/doc/changelog.rst @@ -1,3 +1,8 @@ +`1.1.4` +------- + +**Fix:** Incompatibility with some modules led to the action duplicating + `1.1.3` ------- diff --git a/pos_keyboard/static/src/js/pos.js b/pos_keyboard/static/src/js/pos.js index c1c5506..f9f4629 100644 --- a/pos_keyboard/static/src/js/pos.js +++ b/pos_keyboard/static/src/js/pos.js @@ -2,6 +2,7 @@ Copyright 2016 ufaks Copyright 2016 Ivan Yelizariev Copyright 2019 Kolushov Alexandr + Copyright 2019 ssaid License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). */ odoo.define('pos_keyboard.pos', function (require) { "use strict"; @@ -134,6 +135,7 @@ odoo.define('pos_keyboard.pos', function (require) { val: undefined }; this.action_callback = undefined; + this.active = false; }, save_callback: function(){ @@ -159,6 +161,9 @@ odoo.define('pos_keyboard.pos', function (require) { // calling the callback when needed. connect: function(){ var self = this; + if (self.active) { + return; + } // --- additional keyboard ---// // KeyCode: + or - (Keypad '+') var KC_PLU = 107; @@ -258,11 +263,13 @@ odoo.define('pos_keyboard.pos', function (require) { }, 50); } }); + self.active = true; }, // stops catching keyboard events disconnect: function(){ $('body').off('keyup', ''); + self.active = false; } });