From 43db1a784d8c3ed3e077ad1e3365b7b6afd3e3e4 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Sat, 27 Jun 2015 14:51:38 +0200 Subject: [PATCH 1/4] [ADD] new module pos_check_session_state to avoid PoS users use closed sessions; --- pos_check_session_state/__init__.py | 21 ++++++ pos_check_session_state/__openerp__.py | 68 +++++++++++++++++ pos_check_session_state/i18n/fr.po | 31 ++++++++ .../static/src/img/icon.png | Bin 0 -> 4232 bytes .../static/src/js/pos_check_session_state.js | 69 ++++++++++++++++++ .../src/xml/pos_check_session_state.xml | 35 +++++++++ 6 files changed, 224 insertions(+) create mode 100644 pos_check_session_state/__init__.py create mode 100644 pos_check_session_state/__openerp__.py create mode 100644 pos_check_session_state/i18n/fr.po create mode 100644 pos_check_session_state/static/src/img/icon.png create mode 100644 pos_check_session_state/static/src/js/pos_check_session_state.js create mode 100644 pos_check_session_state/static/src/xml/pos_check_session_state.xml diff --git a/pos_check_session_state/__init__.py b/pos_check_session_state/__init__.py new file mode 100644 index 00000000..743db2e9 --- /dev/null +++ b/pos_check_session_state/__init__.py @@ -0,0 +1,21 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Point Of Sale - Check Session State module for OpenERP +# Copyright (C) 2015 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## diff --git a/pos_check_session_state/__openerp__.py b/pos_check_session_state/__openerp__.py new file mode 100644 index 00000000..01fdee37 --- /dev/null +++ b/pos_check_session_state/__openerp__.py @@ -0,0 +1,68 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Point Of Sale - Check Session State module for OpenERP +# Copyright (C) 2015 GRAP (http://www.grap.coop) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + 'name': 'Point Of Sale - Check Session State', + 'summary': 'Check if the session state is still opened', + 'version': '0.1', + 'category': 'Point Of Sale', + 'description': """ +Check if the session state is still opened +========================================== + +Context: +-------- +In Point Of Sale module, the front-end works offline, so all datas are +loaded at the beginning. +At the end of the session, if user do not close the window, it will be +possible to create new pos order on a closed session, generating errors. + +Functionality: +-------------- + * This module prevent the possility to create a pos order via the front + end PoS UI, when session is closed. + * The session state is checked every 10 seconds. If the state of the + session is not opened, a blocking pop up is displayed, and user has to + reload the current page. + +Copyright, Authors and Licence: +------------------------------- + * Copyright: 2015, GRAP: Groupement Régional Alimentaire de Proximité; + * Author: + * Sylvain LE GAL (https://twitter.com/legalsylvain); + * Licence: AGPL-3 (http://www.gnu.org/licenses/);""", + 'author': "GRAP,Odoo Community Association (OCA)", + 'website': 'http://www.grap.coop', + 'license': 'AGPL-3', + 'depends': [ + 'point_of_sale', + ], + 'qweb': [ + 'static/src/xml/pos_check_session_state.xml', + ], + 'js': [ + 'static/src/js/pos_check_session_state.js', + ], + 'css': [ + 'static/src/css/pos_check_session_state.css', + ], +} diff --git a/pos_check_session_state/i18n/fr.po b/pos_check_session_state/i18n/fr.po new file mode 100644 index 00000000..f55a6f39 --- /dev/null +++ b/pos_check_session_state/i18n/fr.po @@ -0,0 +1,31 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * pos_check_session_state +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-06-27 12:47+0000\n" +"PO-Revision-Date: 2015-06-27 12:47+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: pos_check_session_state +#. openerp-web +#: code:addons/pos_check_session_state/static/src/xml/pos_check_session_state.xml:29 +#, python-format +msgid "Please close the current Point Of Sale Window and open it again to use a correct session." +msgstr "Veuillez fermer la fenêtre courante du point de vente et en ouvrir une autre, afin d'utiliser une session correcte." + +#. module: pos_check_session_state +#. openerp-web +#: code:addons/pos_check_session_state/static/src/xml/pos_check_session_state.xml:28 +#, python-format +msgid "Sorry, the session you're working on is now closing or closed." +msgstr "Désolé, la session sur laquelle vous travaillez est désormais en cours de clôture, ou clôturée." + diff --git a/pos_check_session_state/static/src/img/icon.png b/pos_check_session_state/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a9e1244dae8e6ba3a6375b61161f431e07413158 GIT binary patch literal 4232 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. +******************************************************************************/ + +openerp.pos_check_session_state = function (instance) { + module = instance.point_of_sale; + + /* + Define : New ErrorClosedSessionPopupWidget Widget. + This pop up will be shown if the current pos.session of the PoS is not + in an 'open' state; + The check will be down each 10 seconds; + */ + module.ErrorClosedSessionPopupWidget = module.ErrorPopupWidget.extend({ + template:'ErrorClosedSessionPopupWidget', + + check_session_frequency: 2000, + session_name: '', + + init: function(parent, options) { + var self = this; + this._super(parent,options); + this.intervalID = setInterval(function() { + var loaded = self.pos.fetch('pos.session', ['name','state'], [['id', '=', self.pos.get('pos_session').id]]) + .then(function(sessions){ +// if (sessions[0]['state'] != 'opened') { + if (true){ + self.session_name = sessions[0]['name']; + self.renderElement(); + self.pos_widget.screen_selector.show_popup('error-closed-session'); + clearInterval(self.intervalID); + } + }) + }, this.check_session_frequency); + }, + }); + + /* + Overload : PosWidget to include ErrorClosedSessionPopupWidget inside. + */ + module.PosWidget = module.PosWidget.extend({ + build_widgets: function(){ + this._super(); + this.error_closed_session_popup = new module.ErrorClosedSessionPopupWidget(this, {}); + this.error_closed_session_popup.appendTo($('.point-of-sale')); + this.screen_selector.popup_set['error-closed-session'] = this.error_closed_session_popup; + + // Hide the popup because all pop up are displayed at the + // beginning by default + this.error_closed_session_popup.hide(); + }, + }); + +}; diff --git a/pos_check_session_state/static/src/xml/pos_check_session_state.xml b/pos_check_session_state/static/src/xml/pos_check_session_state.xml new file mode 100644 index 00000000..f784531c --- /dev/null +++ b/pos_check_session_state/static/src/xml/pos_check_session_state.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + +
+
+

+ +

+

+ Sorry, the session you're working on is now closing or closed.
+ Please close the current Point Of Sale Window and open it again to use a correct session.

+
+
+ + + From 0e08df7f62de478ee70c00a677b4e1fdaddbf6b0 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Sat, 27 Jun 2015 14:54:49 +0200 Subject: [PATCH 2/4] [FIX] remove test values; --- .../static/src/js/pos_check_session_state.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pos_check_session_state/static/src/js/pos_check_session_state.js b/pos_check_session_state/static/src/js/pos_check_session_state.js index ff6fe8a2..19c18ba4 100644 --- a/pos_check_session_state/static/src/js/pos_check_session_state.js +++ b/pos_check_session_state/static/src/js/pos_check_session_state.js @@ -29,7 +29,7 @@ openerp.pos_check_session_state = function (instance) { module.ErrorClosedSessionPopupWidget = module.ErrorPopupWidget.extend({ template:'ErrorClosedSessionPopupWidget', - check_session_frequency: 2000, + check_session_frequency: 10000, session_name: '', init: function(parent, options) { @@ -38,8 +38,7 @@ openerp.pos_check_session_state = function (instance) { this.intervalID = setInterval(function() { var loaded = self.pos.fetch('pos.session', ['name','state'], [['id', '=', self.pos.get('pos_session').id]]) .then(function(sessions){ -// if (sessions[0]['state'] != 'opened') { - if (true){ + if (sessions[0]['state'] != 'opened') { self.session_name = sessions[0]['name']; self.renderElement(); self.pos_widget.screen_selector.show_popup('error-closed-session'); From 32fe4dc5175279bbd948a8946fdb3e9185602fff Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Tue, 15 Sep 2015 21:43:50 +0200 Subject: [PATCH 3/4] [IMP] make silent error if server is down, because PoS should work offline; --- .../static/src/js/pos_check_session_state.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pos_check_session_state/static/src/js/pos_check_session_state.js b/pos_check_session_state/static/src/js/pos_check_session_state.js index 19c18ba4..c484438f 100644 --- a/pos_check_session_state/static/src/js/pos_check_session_state.js +++ b/pos_check_session_state/static/src/js/pos_check_session_state.js @@ -39,12 +39,17 @@ openerp.pos_check_session_state = function (instance) { var loaded = self.pos.fetch('pos.session', ['name','state'], [['id', '=', self.pos.get('pos_session').id]]) .then(function(sessions){ if (sessions[0]['state'] != 'opened') { + // warn user if current session is not opened self.session_name = sessions[0]['name']; self.renderElement(); self.pos_widget.screen_selector.show_popup('error-closed-session'); clearInterval(self.intervalID); } }) + .fail(function(error, event){ + // Prevent error if server is unreachable + event.preventDefault(); + }); }, this.check_session_frequency); }, }); From 56b5401fb6a584e4214eb1eabf459915e2864e72 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Tue, 15 Sep 2015 21:44:12 +0200 Subject: [PATCH 4/4] [REF] change frequency of the check from 10 sec to 60 sec; --- .../static/src/js/pos_check_session_state.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pos_check_session_state/static/src/js/pos_check_session_state.js b/pos_check_session_state/static/src/js/pos_check_session_state.js index c484438f..84031031 100644 --- a/pos_check_session_state/static/src/js/pos_check_session_state.js +++ b/pos_check_session_state/static/src/js/pos_check_session_state.js @@ -24,12 +24,12 @@ openerp.pos_check_session_state = function (instance) { Define : New ErrorClosedSessionPopupWidget Widget. This pop up will be shown if the current pos.session of the PoS is not in an 'open' state; - The check will be down each 10 seconds; + The check will be down each 60 seconds; */ module.ErrorClosedSessionPopupWidget = module.ErrorPopupWidget.extend({ template:'ErrorClosedSessionPopupWidget', - check_session_frequency: 10000, + check_session_frequency: 60000, session_name: '', init: function(parent, options) {