From 822450cbb0b5529db76825e7fbce9724e6bb8ce4 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Tue, 3 Jan 2017 13:32:02 +0500
Subject: [PATCH 01/15] [CI] use 3 sec timeout by default; tune switch_to_order

---
 pos_multi_session/external_tests/tests/inject.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pos_multi_session/external_tests/tests/inject.js b/pos_multi_session/external_tests/tests/inject.js
index 3d0c9ab024..8e722a9697 100644
--- a/pos_multi_session/external_tests/tests/inject.js
+++ b/pos_multi_session/external_tests/tests/inject.js
@@ -71,7 +71,11 @@ window.mstest = {
         $('.order-sequence').each(function(){
             var order_num = $.trim($(this).html()).split("\n");
             if (parseInt(order_num[2]) == order.order_num){
-                $(this).click();
+                if (!$(this).parent().hasClass('selected')){
+                    // click only on inactive tab.
+                    // Otherwise Customer Selection screen will be opened
+                    $(this).click();
+                }
                 return false;
             }
         });
@@ -117,7 +121,7 @@ window.mstest = {
         setTimeout(function(){
             callback();
             mstest.is_wait = false;
-        }, timeout || 1000);
+        }, timeout || 3000);
     },
 
 };

From 08ef97c1b1927ae045478464c42538e63b9d506a Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Tue, 3 Jan 2017 16:52:52 +0500
Subject: [PATCH 02/15] [CI] add ability to create screenshots

---
 pos_multi_session/.gitignore                        |  1 +
 pos_multi_session/external_tests/phantomtest.js     | 12 ++++++++++++
 pos_multi_session/external_tests/tests/test_sync.py |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 pos_multi_session/.gitignore

diff --git a/pos_multi_session/.gitignore b/pos_multi_session/.gitignore
new file mode 100644
index 0000000000..e33609d251
--- /dev/null
+++ b/pos_multi_session/.gitignore
@@ -0,0 +1 @@
+*.png
diff --git a/pos_multi_session/external_tests/phantomtest.js b/pos_multi_session/external_tests/phantomtest.js
index 94751b347e..b860a59342 100644
--- a/pos_multi_session/external_tests/phantomtest.js
+++ b/pos_multi_session/external_tests/phantomtest.js
@@ -19,6 +19,7 @@ Modified phantomtest.js from odoo ( https://github.com/odoo/odoo/blob/8.0/opener
 
   [{"session": "session1",
     "extra": "connection_on" | "connection_off" | "connection_slow"
+    "screenshot": screenshot_name,
     "code": "console.log('ok')",
     "ready": false, # wait before calling next command
     "timeout": 60000, # code execution timeout
@@ -28,6 +29,11 @@ Modified phantomtest.js from odoo ( https://github.com/odoo/odoo/blob/8.0/opener
 
   * to communicate between commands, variable ``share`` can be used. It's saved right after execution finish. It's not save in async code (e.g. inside setTimeout function)
 
+* screenshot:
+
+  * make screenshot before execution of the code
+  * filename is SESSION-SCREENSHOT-NUM.png
+
 */
 
 var system = require('system');
@@ -250,9 +256,15 @@ function PhantomTest() {
             sname = command.session;
             page = self.pages[sname];
             extra = command.extra;
+            screenshot = command.screenshot;
             code = command.code || 'true';
             ready = command.ready || 'true';
 
+            if (screenshot){
+                console.log('Make screenshot', screenshot);
+                page.render(sname + '-' + screenshot + '-' + i + '.png');
+            }
+
             console.log("PhantomTest.runCommands: executing: " + code);
             (function(){
                 var commandNum = i;
diff --git a/pos_multi_session/external_tests/tests/test_sync.py b/pos_multi_session/external_tests/tests/test_sync.py
index 57cc95197e..93e60d3584 100644
--- a/pos_multi_session/external_tests/tests/test_sync.py
+++ b/pos_multi_session/external_tests/tests/test_sync.py
@@ -157,6 +157,7 @@ def test_20_offline_update_order(self):
              },
             # ok
             {"session": "demo",
+             "screenshot": "test-20-final",
              "code": "console.log('ok');",
              },
         ], 120)

From 0c001bd487a26983cdd9ae8bafef3307cde501f8 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Tue, 3 Jan 2017 16:53:29 +0500
Subject: [PATCH 03/15] [DOC][CI] how to run tests manually in normal browser

---
 pos_multi_session/external_tests/README.rst | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pos_multi_session/external_tests/README.rst b/pos_multi_session/external_tests/README.rst
index 2ef57366f5..f28969730c 100644
--- a/pos_multi_session/external_tests/README.rst
+++ b/pos_multi_session/external_tests/README.rst
@@ -36,3 +36,29 @@ Odoo server
 * use database with demo data
 * use ``--db-filter`` it equal to database name
 * use ``--workers=0``
+
+Run tests in browser
+--------------------
+
+You can try repeat test in real browser, though it's not very convenient
+
+* open odoo with localhost:8069
+* open POS interface
+* copy-paste code from ``pos_multi_session/external_tests/tests/inject.js``
+* line-by-line copy-paste test js code from ``pos_multi_session/external_tests/tests/test_sync.py``, e.g.
+
+  * in admin window::
+
+        console.log('test_10_new_order');
+        mstest.remove_all_orders();
+
+  * in demo window::
+
+        mstest.remove_all_orders();
+
+  * in admin window::
+
+        mstest.fill_order();
+
+  * etc.
+

From 708d65938b7484d9cdbccf17b07f4ed4ebc15639 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Tue, 3 Jan 2017 17:46:38 +0500
Subject: [PATCH 04/15] [CI] add test_31_queue; add more debug logs

---
 .../external_tests/tests/test_sync.py         | 77 +++++++++++++++++++
 .../static/src/js/pos_multi_session.js        | 13 +++-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/pos_multi_session/external_tests/tests/test_sync.py b/pos_multi_session/external_tests/tests/test_sync.py
index 93e60d3584..efcf2af477 100644
--- a/pos_multi_session/external_tests/tests/test_sync.py
+++ b/pos_multi_session/external_tests/tests/test_sync.py
@@ -380,3 +380,80 @@ def test_30_slow(self):
              "code": "console.log('ok');",
              },
         ], 120)
+
+    def test_31_queue(self):
+        """Single POS send two update request.
+        It would raise error 'sync conflicts', if there are no queue for sending updates. For example
+        * Order has revision_ID equal to 10
+        * We send first update
+        * We send second update
+        * First request is reached the server. Server sets  revision_ID equal to 11
+        * Second request is reached the server. Server return revision_error, because in request revision_ID is 10, while server has revision_ID 11
+        """
+
+        # current postpone timer for sending updates is 1000 ms
+        # connection_slow delay response to 3000 ms
+
+        self.phantom_js_multi({
+            # use default settings for sessions (see ./common.py)
+            "admin": {},
+        }, [
+            # admin removes orders
+            {"session": "admin",
+             "code": """
+                 console.log('test_31_slow');
+                 mstest.remove_all_orders();
+             """,
+             },
+            # admin creates order
+            {"session": "admin",
+             "code": """
+                 mstest.fill_order();
+                 mstest.print_order();
+                 mstest.wait(function(){
+                 })
+             """,
+             },
+
+            # response for admin requests are delayed for 3 seconds
+            {"session": "admin",
+             "extra": "connection_slow",
+             "code": """
+                 console.log("admin requests are delayed")
+             """,
+             },
+            # admin updates order
+            {"session": "admin",
+             "code": """
+                 console.log('Admin updates Order')
+                 mstest.fill_order();
+                 console.log('Admin waits to send update request')
+                 mstest.wait(function(){
+                 }, 1500)
+             """,
+             },
+            # admin updates order again
+            {"session": "admin",
+             "code": """
+                 console.log('Admin updates Order again')
+                 mstest.fill_order();
+             """,
+             },
+            # admin waits and receives error if queue doesn't work
+            {"session": "admin",
+             "code": """
+                 mstest.wait(function(){
+                 }, 10000)
+             """,
+             "timeout": 20000,
+             },
+            # connection is on
+            {"session": "admin",
+             "extra": "connection_on",
+             },
+            # ok
+            {"session": "admin",
+             "screenshot": "test-31-final",
+             "code": "console.log('ok');",
+             },
+        ], 120)
diff --git a/pos_multi_session/static/src/js/pos_multi_session.js b/pos_multi_session/static/src/js/pos_multi_session.js
index ff686e03d5..d3da590b2a 100644
--- a/pos_multi_session/static/src/js/pos_multi_session.js
+++ b/pos_multi_session/static/src/js/pos_multi_session.js
@@ -410,9 +410,12 @@ openerp.pos_multi_session = function(instance){
         update: function(data){
             return this.send({action: 'update_order', data: data});
         },
+        _debug_send_number: 0,
         send: function(message){
+            var current_send_number = 0;
             if (this.pos.debug){
-                console.log('MS', this.pos.config.name, 'send:', JSON.stringify(message));
+                current_send_number = this._debug_send_number++;
+                console.log('MS', this.pos.config.name, 'send #' + current_send_number +' :', JSON.stringify(message));
             }
             var self = this;
             var connection_status = new $.Deferred();
@@ -424,6 +427,9 @@ openerp.pos_multi_session = function(instance){
                 });
             };
             send_it().fail(function (error, e) {
+                if (self.pos.debug){
+                    console.log('MS', self.pos.config.name, 'failed request #'+current_send_number+':', error);
+                }
                 if(error.message === 'XmlHttpRequestError ') {
                     self.client_online = false;
                     e.preventDefault();
@@ -438,6 +444,10 @@ openerp.pos_multi_session = function(instance){
                     self.request_sync_all();
                 }
             }).done(function(res){
+                if (self.pos.debug){
+                    console.log('MS', self.pos.config.name, 'response #'+current_send_number+':', JSON.stringify(res));
+                }
+
                 var server_orders_uid = [];
                 self.client_online = true;
                 if (res.action == "update_revision_ID") {
@@ -446,6 +456,7 @@ openerp.pos_multi_session = function(instance){
                 connection_status.resolve();
                 if (res.action == "revision_error") {
                     var warning_message = _t('There is a conflict during synchronization, try your action again');
+                    console.log('error', warning_message);
                     self.warning(warning_message);
                     self.request_sync_all();
                 }

From f3808d41cbb8d6e13cd0fd0607c730169dadca0f Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Tue, 3 Jan 2017 17:59:12 +0500
Subject: [PATCH 05/15] [CI] try to use trusty on travis to fix error with PIL

  File "/home/travis/odoo-8.0/openerp/addons/base/res/res_partner.py", line 325, in _get_default_image
    image = tools.image_colorize(image)
  File "/home/travis/odoo-8.0/openerp/tools/image.py", line 186, in image_colorize
    image.paste(color)
  File "/home/travis/.local/lib/python2.7/site-packages/PIL/Image.py", line 1319, in paste
    "cannot determine region size; use 4-item box"
ParseError: "cannot determine region size; use 4-item box" while parsing /home/travis/odoo-8.0/addons/auth_signup/auth_signup_data.xml:6, near
<record id="default_template_user" model="res.users">
            <field name="name">Template User</field>
            <field name="login">portaltemplate</field>
            <field name="active" eval="False"/>
            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
            <field name="groups_id" eval="[(6, 0,  [ref('base.group_portal')])]"/>
            <!-- allow signuped users to have a alias -->
            <field name="alias_name">_usertemplate</field>
        </record>
2017-01-03 12:51:45,475 5491 INFO openerp_template openerp.service.server: Initiating shutdown
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a5fe02e362..1060d08968 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 python:
   - "2.7"
   
+dist: trusty
 sudo: false
 cache: pip
 

From 2212cbe8660a134020fbbbe3b75af68eecf787c2 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Wed, 4 Jan 2017 10:58:35 +0500
Subject: [PATCH 06/15] [CI] * don't raise error "revision_error"  in test_30
 (#208)

* improve debug logs
* check for revision_error in other tests
* add session name in log "runCommands: executing"
* print warning text in logs on showing warning_message
---
 pos_multi_session/external_tests/phantomtest.js      | 2 +-
 pos_multi_session/external_tests/tests/inject.js     | 6 +++++-
 pos_multi_session/external_tests/tests/test_sync.py  | 9 +++++++--
 pos_multi_session/static/src/js/pos_multi_session.js | 4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pos_multi_session/external_tests/phantomtest.js b/pos_multi_session/external_tests/phantomtest.js
index b860a59342..37d54421aa 100644
--- a/pos_multi_session/external_tests/phantomtest.js
+++ b/pos_multi_session/external_tests/phantomtest.js
@@ -265,7 +265,7 @@ function PhantomTest() {
                 page.render(sname + '-' + screenshot + '-' + i + '.png');
             }
 
-            console.log("PhantomTest.runCommands: executing: " + code);
+            console.log("PhantomTest.runCommands: executing as "+sname+ ": " + code);
             (function(){
                 var commandNum = i;
                 timer = setTimeout(function () {
diff --git a/pos_multi_session/external_tests/tests/inject.js b/pos_multi_session/external_tests/tests/inject.js
index 8e722a9697..4808fbf60c 100644
--- a/pos_multi_session/external_tests/tests/inject.js
+++ b/pos_multi_session/external_tests/tests/inject.js
@@ -123,5 +123,9 @@ window.mstest = {
             mstest.is_wait = false;
         }, timeout || 3000);
     },
-
+    check_revision_error: function(){
+        warning_message = 'There is a conflict during synchronization, try your action again';
+        if ($('.modal .in').text() == warning_message)
+            console.log('error', warning_message);
+    },
 };
diff --git a/pos_multi_session/external_tests/tests/test_sync.py b/pos_multi_session/external_tests/tests/test_sync.py
index efcf2af477..f7f93637df 100644
--- a/pos_multi_session/external_tests/tests/test_sync.py
+++ b/pos_multi_session/external_tests/tests/test_sync.py
@@ -144,6 +144,9 @@ def test_20_offline_update_order(self):
              "code": """
                  mstest.fill_order();
                  share.order = mstest.get_order();
+                 mstest.wait(function(){
+                     mstest.check_revision_error();
+                 }, 5000)
              """,
              },
             # check sync on demo
@@ -151,7 +154,7 @@ def test_20_offline_update_order(self):
              "code": """
              mstest.wait(function(){
                 mstest.find_order(share.order);
-            }, 20000)
+            }, 10000)
              """,
              "timeout": 25000,
              },
@@ -172,7 +175,7 @@ def test_21_offline_remove_order(self):
             # admin removes orders
             {"session": "admin",
              "code": """
-                 console.log('test_20_offline');
+                 console.log('test_21_offline_remove_order');
                  mstest.remove_all_orders();
              """,
              },
@@ -234,6 +237,7 @@ def test_21_offline_remove_order(self):
             # demo creates new order (to start reconnection process)
             {"session": "demo",
              "code": """
+                console.log('demo creates new order (to start reconnection process)')
                 mstest.new_order();
                 mstest.fill_order();
                 mstest.wait(function(){
@@ -443,6 +447,7 @@ def test_31_queue(self):
             {"session": "admin",
              "code": """
                  mstest.wait(function(){
+                     mstest.check_revision_error();
                  }, 10000)
              """,
              "timeout": 20000,
diff --git a/pos_multi_session/static/src/js/pos_multi_session.js b/pos_multi_session/static/src/js/pos_multi_session.js
index d3da590b2a..1acaef5572 100644
--- a/pos_multi_session/static/src/js/pos_multi_session.js
+++ b/pos_multi_session/static/src/js/pos_multi_session.js
@@ -428,7 +428,7 @@ openerp.pos_multi_session = function(instance){
             };
             send_it().fail(function (error, e) {
                 if (self.pos.debug){
-                    console.log('MS', self.pos.config.name, 'failed request #'+current_send_number+':', error);
+                    console.log('MS', self.pos.config.name, 'failed request #'+current_send_number+':', error.message);
                 }
                 if(error.message === 'XmlHttpRequestError ') {
                     self.client_online = false;
@@ -456,7 +456,6 @@ openerp.pos_multi_session = function(instance){
                 connection_status.resolve();
                 if (res.action == "revision_error") {
                     var warning_message = _t('There is a conflict during synchronization, try your action again');
-                    console.log('error', warning_message);
                     self.warning(warning_message);
                     self.request_sync_all();
                 }
@@ -499,6 +498,7 @@ openerp.pos_multi_session = function(instance){
             self.send_offline_orders();
         },
         warning: function(warning_message){
+            console.info('warning', warning_message);
             var self = this;
             new instance.web.Dialog(this, {
                 title: _t("Warning"),

From af2cbcc06676ca71187d01ecf1ac1093e2a9d7e0 Mon Sep 17 00:00:00 2001
From: Dinar <gabbasov@it-projects.info>
Date: Wed, 1 Feb 2017 18:03:34 +0500
Subject: [PATCH 07/15] [ADD] added new common module pos_longpolling for POS
 (#213)

---
 pos_longpolling/README.rst                    | 29 +++++++
 pos_longpolling/__init__.py                   |  2 +
 pos_longpolling/__manifest__.py               | 34 ++++++++
 pos_longpolling/doc/changelog.rst             |  4 +
 pos_longpolling/doc/index.rst                 | 25 ++++++
 pos_longpolling/models/__init__.py            |  2 +
 .../models/pos_longpolling_models.py          | 15 ++++
 .../static/src/js/pos_longpolling.js          | 87 +++++++++++++++++++
 .../views/pos_longpolling_template.xml        | 10 +++
 9 files changed, 208 insertions(+)
 create mode 100644 pos_longpolling/README.rst
 create mode 100644 pos_longpolling/__init__.py
 create mode 100644 pos_longpolling/__manifest__.py
 create mode 100644 pos_longpolling/doc/changelog.rst
 create mode 100644 pos_longpolling/doc/index.rst
 create mode 100644 pos_longpolling/models/__init__.py
 create mode 100644 pos_longpolling/models/pos_longpolling_models.py
 create mode 100644 pos_longpolling/static/src/js/pos_longpolling.js
 create mode 100644 pos_longpolling/views/pos_longpolling_template.xml

diff --git a/pos_longpolling/README.rst b/pos_longpolling/README.rst
new file mode 100644
index 0000000000..d7213ef4a3
--- /dev/null
+++ b/pos_longpolling/README.rst
@@ -0,0 +1,29 @@
+=================
+ POS Longpolling
+=================
+
+Technical module implement instant updates in POS
+
+Credits
+=======
+
+Contributors
+------------
+* gabbasov@it-projects.info
+
+Sponsors
+--------
+* `IT-Projects LLC <https://it-projects.info>`__
+
+Further information
+===================
+
+Demo: http://runbot.it-projects.info/demo/pos-addons/10.0
+
+HTML Description: https://apps.odoo.com/apps/modules/10.0/pos_longpolling/
+
+Usage instructions: `<doc/index.rst>`__
+
+Changelog: `<doc/changelog.rst>`__
+
+Tested on Odoo 10.0 6a7c05112bf0c07ffa7dadfe76be08f3121fd4c8
diff --git a/pos_longpolling/__init__.py b/pos_longpolling/__init__.py
new file mode 100644
index 0000000000..a0fdc10fe1
--- /dev/null
+++ b/pos_longpolling/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import models
diff --git a/pos_longpolling/__manifest__.py b/pos_longpolling/__manifest__.py
new file mode 100644
index 0000000000..ecfefde8f5
--- /dev/null
+++ b/pos_longpolling/__manifest__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+{
+    "name": """POS Longpolling""",
+    "summary": """Technical module implement instant updates in POS""",
+    "category": "Point of Sale",
+    "images": [],
+    "version": "1.0.0",
+    "application": False,
+
+    "author": "IT-Projects LLC, Dinar Gabbasov",
+    "support": "apps@it-projects.info",
+    "website": "https://twitter.com/gabbasov_dinar",
+    "license": "LGPL-3",
+    # "price": 0.00,
+    # "currency": "EUR",
+
+    "depends": [
+        "bus",
+        "point_of_sale",
+    ],
+    "external_dependencies": {"python": [], "bin": []},
+    "data": [
+        "views/pos_longpolling_template.xml",
+    ],
+    'qweb': [],
+    "demo": [],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+
+    "auto_install": False,
+    "installable": True,
+}
diff --git a/pos_longpolling/doc/changelog.rst b/pos_longpolling/doc/changelog.rst
new file mode 100644
index 0000000000..9ee2b48b8e
--- /dev/null
+++ b/pos_longpolling/doc/changelog.rst
@@ -0,0 +1,4 @@
+`1.0.0`
+-------
+
+- Init version
diff --git a/pos_longpolling/doc/index.rst b/pos_longpolling/doc/index.rst
new file mode 100644
index 0000000000..251d360eb7
--- /dev/null
+++ b/pos_longpolling/doc/index.rst
@@ -0,0 +1,25 @@
+=================
+ POS Longpolling
+=================
+
+Longpolling
+===========
+
+Check following resources about activating longpolling:
+
+* Official doc: https://www.odoo.com/documentation/8.0/setup/deploy.html#builtin-server
+* Non-official doc: https://odoo-development.readthedocs.io/en/latest/admin/longpolling.html
+
+In short, you need to start server with non-zero ``workers`` parameter:::
+
+    openerp-server --workers=2 ...
+
+and configure nginx: ::
+
+    location /longpolling {
+        proxy_pass http://127.0.0.1:8072;
+    }
+    location / {
+        proxy_pass http://127.0.0.1:8069;
+    }
+
diff --git a/pos_longpolling/models/__init__.py b/pos_longpolling/models/__init__.py
new file mode 100644
index 0000000000..b8c8f25918
--- /dev/null
+++ b/pos_longpolling/models/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import pos_longpolling_models
diff --git a/pos_longpolling/models/pos_longpolling_models.py b/pos_longpolling/models/pos_longpolling_models.py
new file mode 100644
index 0000000000..11fd1a04a5
--- /dev/null
+++ b/pos_longpolling/models/pos_longpolling_models.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from odoo import api, models
+
+
+class PosConfig(models.Model):
+    _inherit = 'pos.config'
+
+    @api.multi
+    def _send_to_channel(self, channel_name, message):
+        notifications = []
+        for ps in self.env['pos.session'].search([('state', '!=', 'closed'), ('id', 'in', self.ids)]):
+            channel = '["%s","%s","%s"]' % (self._cr.dbname, channel_name, ps.config_id.id)
+            notifications.append([channel, message])
+        self.env['bus.bus'].sendmany(notifications)
+        return 1
diff --git a/pos_longpolling/static/src/js/pos_longpolling.js b/pos_longpolling/static/src/js/pos_longpolling.js
new file mode 100644
index 0000000000..aff4f95522
--- /dev/null
+++ b/pos_longpolling/static/src/js/pos_longpolling.js
@@ -0,0 +1,87 @@
+odoo.define('pos_longpolling', function(require){
+    var exports = {};
+
+    var session = require('web.session');
+    var core = require('web.core');
+    var models = require('point_of_sale.models');
+    var bus = require('bus.bus');
+    var chrome = require('point_of_sale.chrome');
+
+    var _t = core._t;
+
+    // prevent bus to be started by chat_manager.js
+    bus.bus.activated = true; // fake value to ignore start_polling call
+
+    var PosModelSuper = models.PosModel;
+    models.PosModel = models.PosModel.extend({
+        initialize: function(){
+            var self = this;
+            PosModelSuper.prototype.initialize.apply(this, arguments);
+            this.channels = {};
+            this.lonpolling_activated = false;
+            this.bus = bus.bus;
+            this.ready.then(function () {
+                self.start_longpolling();
+            });
+        },
+        start_longpolling: function(){
+            var self = this;
+            this.bus.last = this.db.load('bus_last', 0);
+            this.bus.on("notification", this, this.on_notification);
+            this.bus.stop_polling();
+            _.each(self.channels, function(value, key){
+                self.init_channel(key);
+            });
+            this.bus.start_polling();
+            this.lonpolling_activated = true;
+        },
+        add_channel: function(channel_name, callback) {
+            this.channels[channel_name] = callback;
+            if (this.lonpolling_activated) {
+                this.init_channel(channel_name)
+            }
+        },
+        get_full_channel_name: function(channel_name){
+            return JSON.stringify([session.db,channel_name,String(this.config.id)]);
+        },
+        init_channel: function(channel_name){
+            var channel = this.get_full_channel_name(channel_name);
+            this.bus.add_channel(channel);
+        },
+        remove_channel: function(channel_name) {
+            if (channel_name in this.channels) {
+                delete this.channels[channel_name];
+                var channel = this.get_full_channel_name(channel_name);
+                this.bus.delete_channel(channel);
+            }
+        },
+        on_notification: function(notification) {
+            for (var i = 0; i < notification.length; i++) {
+                var channel = notification[i][0];
+                var message = notification[i][1];
+                this.on_notification_do(channel, message);
+            }
+            this.db.save('bus_last', this.bus.last);
+        },
+        on_notification_do: function (channel, message) {
+            var self = this;
+            var channel = JSON.parse(channel);
+            if(Array.isArray(channel) && (channel[1] in self.channels)){
+                try{
+                    var callback = self.channels[channel[1]];
+                    if (callback) {
+                        if (self.debug){
+                            console.log('POS LONGPOLLING', self.config.name, channel[1], JSON.stringify(message));
+                        }
+                        callback(message);
+                    }
+                }catch(err){
+                    this.chrome.gui.show_popup('error',{
+                        'title': _t('Error'),
+                        'body': err,
+                    });
+                }
+            }
+        }
+    });
+});
diff --git a/pos_longpolling/views/pos_longpolling_template.xml b/pos_longpolling/views/pos_longpolling_template.xml
new file mode 100644
index 0000000000..a4d3b3b1f2
--- /dev/null
+++ b/pos_longpolling/views/pos_longpolling_template.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="assets_backend" name="pos_longpolling assets" inherit_id="point_of_sale.assets">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/pos_longpolling/static/src/js/pos_longpolling.js"></script>
+            </xpath>
+        </template>
+    </data>
+</odoo>

From a5d0e247fb024598a51b7656fbde66663956c107 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <yelizariev@it-projects.info>
Date: Fri, 3 Feb 2017 14:17:41 +0500
Subject: [PATCH 08/15] [FIX] pos_longpolling: fix domain to check closed
 session

[IMP] add logs
[REF] _get_full_channel_name in python
[IMP] add_channel -- allow to pass thisArg
---
 pos_longpolling/models/pos_longpolling_models.py | 16 +++++++++++++---
 pos_longpolling/static/src/js/pos_longpolling.js |  7 +++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pos_longpolling/models/pos_longpolling_models.py b/pos_longpolling/models/pos_longpolling_models.py
index 11fd1a04a5..ddae040199 100644
--- a/pos_longpolling/models/pos_longpolling_models.py
+++ b/pos_longpolling/models/pos_longpolling_models.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
+import logging
 from odoo import api, models
 
+_logger = logging.getLogger(__name__)
+
 
 class PosConfig(models.Model):
     _inherit = 'pos.config'
@@ -8,8 +11,15 @@ class PosConfig(models.Model):
     @api.multi
     def _send_to_channel(self, channel_name, message):
         notifications = []
-        for ps in self.env['pos.session'].search([('state', '!=', 'closed'), ('id', 'in', self.ids)]):
-            channel = '["%s","%s","%s"]' % (self._cr.dbname, channel_name, ps.config_id.id)
+        for ps in self.env['pos.session'].search([('state', '!=', 'closed'), ('config_id', 'in', self.ids)]):
+            channel = ps.config_id._get_full_channel_name(channel_name)
             notifications.append([channel, message])
-        self.env['bus.bus'].sendmany(notifications)
+        if notifications:
+            self.env['bus.bus'].sendmany(notifications)
+        _logger.debug('POS notifications for %s: %s', self.ids, notifications)
         return 1
+
+    @api.multi
+    def _get_full_channel_name(self, channel_name):
+        self.ensure_one()
+        return '["%s","%s","%s"]' % (self._cr.dbname, channel_name, self.id)
diff --git a/pos_longpolling/static/src/js/pos_longpolling.js b/pos_longpolling/static/src/js/pos_longpolling.js
index aff4f95522..d8dca26ad9 100644
--- a/pos_longpolling/static/src/js/pos_longpolling.js
+++ b/pos_longpolling/static/src/js/pos_longpolling.js
@@ -35,10 +35,13 @@ odoo.define('pos_longpolling', function(require){
             this.bus.start_polling();
             this.lonpolling_activated = true;
         },
-        add_channel: function(channel_name, callback) {
+        add_channel: function(channel_name, callback, thisArg) {
+            if (thisArg){
+                callback = _.bind(callback, thisArg);
+            }
             this.channels[channel_name] = callback;
             if (this.lonpolling_activated) {
-                this.init_channel(channel_name)
+                this.init_channel(channel_name);
             }
         },
         get_full_channel_name: function(channel_name){

From 3396bc13e49418be6de0abe47ac08d22f11292e1 Mon Sep 17 00:00:00 2001
From: GabbasovDinar <gabbasov@it-projects.info>
Date: Wed, 8 Feb 2017 13:04:37 +0500
Subject: [PATCH 09/15] [BACKPORT] fixes porting errors in 10.0 to 8.0

---
 pos_longpolling/README.rst                    |  6 ++--
 .../{__manifest__.py => __openerp__.py}       |  2 +-
 .../models/pos_longpolling_models.py          |  2 +-
 .../static/src/js/pos_longpolling.js          | 34 ++++++++-----------
 .../views/pos_longpolling_template.xml        |  6 ++--
 5 files changed, 23 insertions(+), 27 deletions(-)
 rename pos_longpolling/{__manifest__.py => __openerp__.py} (96%)

diff --git a/pos_longpolling/README.rst b/pos_longpolling/README.rst
index d7213ef4a3..16347231b4 100644
--- a/pos_longpolling/README.rst
+++ b/pos_longpolling/README.rst
@@ -18,12 +18,12 @@ Sponsors
 Further information
 ===================
 
-Demo: http://runbot.it-projects.info/demo/pos-addons/10.0
+Demo: http://runbot.it-projects.info/demo/pos-addons/8.0
 
-HTML Description: https://apps.odoo.com/apps/modules/10.0/pos_longpolling/
+HTML Description: https://apps.odoo.com/apps/modules/8.0/pos_longpolling/
 
 Usage instructions: `<doc/index.rst>`__
 
 Changelog: `<doc/changelog.rst>`__
 
-Tested on Odoo 10.0 6a7c05112bf0c07ffa7dadfe76be08f3121fd4c8
+Tested on Odoo 8.0 8ce1e5134037dfe6cfbd756813e9baa31a221958
diff --git a/pos_longpolling/__manifest__.py b/pos_longpolling/__openerp__.py
similarity index 96%
rename from pos_longpolling/__manifest__.py
rename to pos_longpolling/__openerp__.py
index ecfefde8f5..23652fec2b 100644
--- a/pos_longpolling/__manifest__.py
+++ b/pos_longpolling/__openerp__.py
@@ -10,7 +10,7 @@
     "author": "IT-Projects LLC, Dinar Gabbasov",
     "support": "apps@it-projects.info",
     "website": "https://twitter.com/gabbasov_dinar",
-    "license": "LGPL-3",
+    "license": "GPL-3",
     # "price": 0.00,
     # "currency": "EUR",
 
diff --git a/pos_longpolling/models/pos_longpolling_models.py b/pos_longpolling/models/pos_longpolling_models.py
index ddae040199..5808f97432 100644
--- a/pos_longpolling/models/pos_longpolling_models.py
+++ b/pos_longpolling/models/pos_longpolling_models.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
-from odoo import api, models
+from openerp import api, models
 
 _logger = logging.getLogger(__name__)
 
diff --git a/pos_longpolling/static/src/js/pos_longpolling.js b/pos_longpolling/static/src/js/pos_longpolling.js
index d8dca26ad9..8fe877e730 100644
--- a/pos_longpolling/static/src/js/pos_longpolling.js
+++ b/pos_longpolling/static/src/js/pos_longpolling.js
@@ -1,25 +1,18 @@
-odoo.define('pos_longpolling', function(require){
-    var exports = {};
-
-    var session = require('web.session');
-    var core = require('web.core');
-    var models = require('point_of_sale.models');
-    var bus = require('bus.bus');
-    var chrome = require('point_of_sale.chrome');
-
-    var _t = core._t;
+openerp.pos_longpolling = function(instance){
+    var module = instance.point_of_sale;
+    var _t = instance.web._t;
 
     // prevent bus to be started by chat_manager.js
-    bus.bus.activated = true; // fake value to ignore start_polling call
+    openerp.bus.bus.activated = true; // fake value to ignore start_polling call
 
-    var PosModelSuper = models.PosModel;
-    models.PosModel = models.PosModel.extend({
+    var PosModelSuper = module.PosModel;
+    module.PosModel = module.PosModel.extend({
         initialize: function(){
             var self = this;
             PosModelSuper.prototype.initialize.apply(this, arguments);
             this.channels = {};
             this.lonpolling_activated = false;
-            this.bus = bus.bus;
+            this.bus = openerp.bus.bus;
             this.ready.then(function () {
                 self.start_longpolling();
             });
@@ -45,7 +38,7 @@ odoo.define('pos_longpolling', function(require){
             }
         },
         get_full_channel_name: function(channel_name){
-            return JSON.stringify([session.db,channel_name,String(this.config.id)]);
+            return JSON.stringify([openerp.session.db,channel_name,String(this.config.id)]);
         },
         init_channel: function(channel_name){
             var channel = this.get_full_channel_name(channel_name);
@@ -59,6 +52,9 @@ odoo.define('pos_longpolling', function(require){
             }
         },
         on_notification: function(notification) {
+            if (typeof notification[0][0] === 'string') {
+                notification = [notification];
+            }
             for (var i = 0; i < notification.length; i++) {
                 var channel = notification[i][0];
                 var message = notification[i][1];
@@ -79,12 +75,12 @@ odoo.define('pos_longpolling', function(require){
                         callback(message);
                     }
                 }catch(err){
-                    this.chrome.gui.show_popup('error',{
-                        'title': _t('Error'),
-                        'body': err,
+                    self.pos_widget.screen_selector.show_popup('error',{
+                        message: _t('Error'),
+                        comment: err,
                     });
                 }
             }
         }
     });
-});
+};
diff --git a/pos_longpolling/views/pos_longpolling_template.xml b/pos_longpolling/views/pos_longpolling_template.xml
index a4d3b3b1f2..03503b3dc1 100644
--- a/pos_longpolling/views/pos_longpolling_template.xml
+++ b/pos_longpolling/views/pos_longpolling_template.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<openerp>
     <data>
-        <template id="assets_backend" name="pos_longpolling assets" inherit_id="point_of_sale.assets">
+        <template id="assets_backend" name="pos_longpolling assets" inherit_id="point_of_sale.assets_backend">
             <xpath expr="." position="inside">
                 <script type="text/javascript" src="/pos_longpolling/static/src/js/pos_longpolling.js"></script>
             </xpath>
         </template>
     </data>
-</odoo>
+</openerp>

From bb4002e8cd752ef6df3d5c3d96b2b819cab3f36f Mon Sep 17 00:00:00 2001
From: Dinar <gabbasov@it-projects.info>
Date: Tue, 28 Feb 2017 12:46:45 +0500
Subject: [PATCH 10/15] [ADD] longpolling connection status for pos_longpolling
 (#237)

* Added longpolling connection status

* Fixes travis errors

* Update changelog.rst

* Update changelog.rst

* Update __openerp__.py
---
 pos_longpolling/__init__.py                   |  1 +
 pos_longpolling/__openerp__.py                |  7 +-
 pos_longpolling/controllers/__init__.py       |  2 +
 .../controllers/pos_longpolling_controller.py | 16 ++++
 pos_longpolling/doc/changelog.rst             |  5 ++
 .../models/pos_longpolling_models.py          | 15 +++-
 .../static/src/js/pos_longpolling.js          | 78 +++++++++++++++++++
 .../src/xml/pos_longpolling_connection.xml    | 10 +++
 .../views/pos_longpolling_view.xml            | 20 +++++
 9 files changed, 148 insertions(+), 6 deletions(-)
 create mode 100644 pos_longpolling/controllers/__init__.py
 create mode 100644 pos_longpolling/controllers/pos_longpolling_controller.py
 create mode 100644 pos_longpolling/static/src/xml/pos_longpolling_connection.xml
 create mode 100644 pos_longpolling/views/pos_longpolling_view.xml

diff --git a/pos_longpolling/__init__.py b/pos_longpolling/__init__.py
index a0fdc10fe1..3b38916015 100644
--- a/pos_longpolling/__init__.py
+++ b/pos_longpolling/__init__.py
@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
 from . import models
+from . import controllers
diff --git a/pos_longpolling/__openerp__.py b/pos_longpolling/__openerp__.py
index 23652fec2b..513d71b1f9 100644
--- a/pos_longpolling/__openerp__.py
+++ b/pos_longpolling/__openerp__.py
@@ -4,7 +4,7 @@
     "summary": """Technical module implement instant updates in POS""",
     "category": "Point of Sale",
     "images": [],
-    "version": "1.0.0",
+    "version": "1.1.0",
     "application": False,
 
     "author": "IT-Projects LLC, Dinar Gabbasov",
@@ -21,8 +21,11 @@
     "external_dependencies": {"python": [], "bin": []},
     "data": [
         "views/pos_longpolling_template.xml",
+        "views/pos_longpolling_view.xml",
+    ],
+    "qweb": [
+        "static/src/xml/pos_longpolling_connection.xml",
     ],
-    'qweb': [],
     "demo": [],
 
     "post_load": None,
diff --git a/pos_longpolling/controllers/__init__.py b/pos_longpolling/controllers/__init__.py
new file mode 100644
index 0000000000..b5c365de86
--- /dev/null
+++ b/pos_longpolling/controllers/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import pos_longpolling_controller
diff --git a/pos_longpolling/controllers/pos_longpolling_controller.py b/pos_longpolling/controllers/pos_longpolling_controller.py
new file mode 100644
index 0000000000..5825d7b0f6
--- /dev/null
+++ b/pos_longpolling/controllers/pos_longpolling_controller.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+import logging
+
+import openerp
+from openerp.http import request
+from openerp.addons.bus.bus import Controller as bus_controller
+
+_logger = logging.getLogger(__name__)
+
+
+class Controller(bus_controller):
+    @openerp.http.route('/pos_longpolling/update', type="json", auth="public")
+    def update_connection(self, pos_id, message):
+        channel_name = "pos.longpolling"
+        res = request.env["pos.config"].browse(int(pos_id))._send_to_channel(channel_name, message)
+        return res
diff --git a/pos_longpolling/doc/changelog.rst b/pos_longpolling/doc/changelog.rst
index 9ee2b48b8e..40a82fa284 100644
--- a/pos_longpolling/doc/changelog.rst
+++ b/pos_longpolling/doc/changelog.rst
@@ -1,3 +1,8 @@
+`1.1.0`
+-------
+
+- **NEW:** longpolling connection status in POS interface
+
 `1.0.0`
 -------
 
diff --git a/pos_longpolling/models/pos_longpolling_models.py b/pos_longpolling/models/pos_longpolling_models.py
index 5808f97432..86790768f8 100644
--- a/pos_longpolling/models/pos_longpolling_models.py
+++ b/pos_longpolling/models/pos_longpolling_models.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
-from openerp import api, models
+from openerp import api, models, fields
 
 _logger = logging.getLogger(__name__)
 
@@ -8,12 +8,19 @@
 class PosConfig(models.Model):
     _inherit = 'pos.config'
 
+    query_timeout = fields.Float(string='Query timeout', default=0.0833)
+    response_timeout = fields.Float(string='Response timeout', default=0.01666)
+
     @api.multi
     def _send_to_channel(self, channel_name, message):
         notifications = []
-        for ps in self.env['pos.session'].search([('state', '!=', 'closed'), ('config_id', 'in', self.ids)]):
-            channel = ps.config_id._get_full_channel_name(channel_name)
-            notifications.append([channel, message])
+        if channel_name == "pos.longpolling":
+            channel = self._get_full_channel_name(channel_name)
+            notifications.append([channel, "PONG"])
+        else:
+            for ps in self.env['pos.session'].search([('state', '!=', 'closed'), ('config_id', 'in', self.ids)]):
+                channel = ps.config_id._get_full_channel_name(channel_name)
+                notifications.append([channel, message])
         if notifications:
             self.env['bus.bus'].sendmany(notifications)
         _logger.debug('POS notifications for %s: %s', self.ids, notifications)
diff --git a/pos_longpolling/static/src/js/pos_longpolling.js b/pos_longpolling/static/src/js/pos_longpolling.js
index 8fe877e730..d997789765 100644
--- a/pos_longpolling/static/src/js/pos_longpolling.js
+++ b/pos_longpolling/static/src/js/pos_longpolling.js
@@ -13,6 +13,10 @@ openerp.pos_longpolling = function(instance){
             this.channels = {};
             this.lonpolling_activated = false;
             this.bus = openerp.bus.bus;
+            this.longpolling_connection = new module.LongpollingConnection(this);
+            var channel_name = "pos.longpolling";
+            var callback = this.longpolling_connection.update_status;
+            this.add_channel(channel_name, callback, this.longpolling_connection);
             this.ready.then(function () {
                 self.start_longpolling();
             });
@@ -27,6 +31,7 @@ openerp.pos_longpolling = function(instance){
             });
             this.bus.start_polling();
             this.lonpolling_activated = true;
+            this.longpolling_connection.send();
         },
         add_channel: function(channel_name, callback, thisArg) {
             if (thisArg){
@@ -67,6 +72,7 @@ openerp.pos_longpolling = function(instance){
             var channel = JSON.parse(channel);
             if(Array.isArray(channel) && (channel[1] in self.channels)){
                 try{
+                    self.longpolling_connection.update_status();
                     var callback = self.channels[channel[1]];
                     if (callback) {
                         if (self.debug){
@@ -83,4 +89,76 @@ openerp.pos_longpolling = function(instance){
             }
         }
     });
+
+    module.LongpollingConnection = Backbone.Model.extend({
+        initialize: function(pos) {
+            this.pos = pos;
+            this.timer = false;
+            this.status = false;
+        },
+        set_status: function(status) {
+            this.status = status;
+            this.trigger("change:poll_connection", status);
+            this.start_timer(this.pos.config.query_timeout, 'query');
+        },
+        update_status: function(message) {
+            var self = this;
+            if (this.pos.debug) {
+                console.log("This message from server. Message: ", message);
+            }
+            self.stop_timer();
+            self.set_status(true);
+        },
+        stop_timer: function(){
+            var self = this;
+            if (this.timer) {
+                clearTimeout(this.timer);
+                this.timer = false;
+            }
+        },
+        start_timer: function(time, type){
+            var time = Math.round(time * 3600.0);
+            var self = this;
+            this.stop_timer();
+            this.timer = setTimeout(function() {
+                if (type == "query") {
+                    self.send();
+                } else if (type == "response") {
+                    self.set_status(false);
+                }
+            }, time*1000);
+        },
+        send: function() {
+            var self = this;
+            openerp.session.rpc("/pos_longpolling/update", {message: "PING", pos_id: self.pos.config.id}).then(function(){
+                self.start_timer(self.pos.config.response_timeout, "response");
+            }, function(error, e){
+                e.preventDefault();
+                self.set_status(false);
+            });
+        },
+    });
+
+    module.StatusWidget.include({
+        set_poll_status: function(status) {
+            var element = this.$('.js_poll_connected');
+            if (status) {
+                element.removeClass('oe_red');
+                element.addClass('oe_green');
+            } else {
+                element.removeClass('oe_green');
+                element.addClass('oe_red');
+            }
+        }
+    });
+
+    module.SynchNotificationWidget.include({
+        start: function(){
+            this._super();
+            var self = this;
+            this.pos.longpolling_connection.on("change:poll_connection", function(status){
+                self.set_poll_status(status);
+            });
+        },
+    });
 };
diff --git a/pos_longpolling/static/src/xml/pos_longpolling_connection.xml b/pos_longpolling/static/src/xml/pos_longpolling_connection.xml
new file mode 100644
index 0000000000..374ce979ce
--- /dev/null
+++ b/pos_longpolling/static/src/xml/pos_longpolling_connection.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-extend="SynchNotificationWidget">
+        <t t-jquery=".js_msg" t-operation="after">
+            <div class="js_poll_connected oe_icon oe_red">
+                <i class='fa fa-fw fa-signal'></i>
+            </div>
+        </t>
+    </t>
+</templates>
diff --git a/pos_longpolling/views/pos_longpolling_view.xml b/pos_longpolling/views/pos_longpolling_view.xml
new file mode 100644
index 0000000000..56694c80c3
--- /dev/null
+++ b/pos_longpolling/views/pos_longpolling_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_pos_config_form">
+            <field name="name">pos.config.form.view.inherit</field>
+            <field name="model">pos.config</field>
+            <field name="inherit_id" ref="point_of_sale.view_pos_config_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@string='Features']" position="after">
+                    <group string="Longpolling">
+                        <group>
+                            <field name="query_timeout"  widget="float_time"/>
+                            <field name="response_timeout"  widget="float_time"/>
+                        </group>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

From 29e8d2e66c579cf19387e8b417d62e16aa09fa38 Mon Sep 17 00:00:00 2001
From: GabbasovDinar <gabbasov@it-projects.info>
Date: Tue, 28 Feb 2017 18:22:32 +0500
Subject: [PATCH 11/15] [FIX] Fixes poll status error

---
 pos_longpolling/static/src/js/pos_longpolling.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pos_longpolling/static/src/js/pos_longpolling.js b/pos_longpolling/static/src/js/pos_longpolling.js
index d997789765..c62f676ff5 100644
--- a/pos_longpolling/static/src/js/pos_longpolling.js
+++ b/pos_longpolling/static/src/js/pos_longpolling.js
@@ -97,6 +97,9 @@ openerp.pos_longpolling = function(instance){
             this.status = false;
         },
         set_status: function(status) {
+            if (this.status == status) {
+                return;
+            }
             this.status = status;
             this.trigger("change:poll_connection", status);
             this.start_timer(this.pos.config.query_timeout, 'query');

From 84071159114f0858dc754de22b6b75b07831d6e2 Mon Sep 17 00:00:00 2001
From: Dinar <gabbasov@it-projects.info>
Date: Wed, 1 Mar 2017 19:11:14 +0500
Subject: [PATCH 12/15] [FIX] 8.0-pos_multi_session: fix order sync error when
 removed, compitability with pos_longpolling (#239)

* [BACKPORT] Error fixes using pos_longpolling

* [FIX] Fixes error is sync order when is removed

* [FIX] Fixes queue errors

* [FIX] fixes errors. Use pos_longpolling
---
 pos_multi_session/__init__.py                 |   2 +-
 pos_multi_session/__openerp__.py              |  52 +++--
 .../controllers/pos_multi_session.py          |   5 -
 .../external_tests/tests/test_sync.py         |   4 +-
 pos_multi_session/models/__init__.py          |   2 +
 .../{ => models}/pos_multi_session_models.py  |  15 +-
 .../static/src/css/pos_multi_session.css      | 184 +++++++++++++++++-
 .../static/src/js/pos_multi_session.js        | 177 ++++++++---------
 .../static/src/xml/pos_multi_session.xml      |  17 ++
 pos_multi_session/{ => views}/views.xml       |   0
 10 files changed, 331 insertions(+), 127 deletions(-)
 create mode 100644 pos_multi_session/models/__init__.py
 rename pos_multi_session/{ => models}/pos_multi_session_models.py (91%)
 rename pos_multi_session/{ => views}/views.xml (100%)

diff --git a/pos_multi_session/__init__.py b/pos_multi_session/__init__.py
index 7ef565b51d..3b38916015 100644
--- a/pos_multi_session/__init__.py
+++ b/pos_multi_session/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-from . import pos_multi_session_models
+from . import models
 from . import controllers
diff --git a/pos_multi_session/__openerp__.py b/pos_multi_session/__openerp__.py
index 6c7d8f9863..479e2acace 100644
--- a/pos_multi_session/__openerp__.py
+++ b/pos_multi_session/__openerp__.py
@@ -1,25 +1,39 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "Sync POS orders across multiple sessions",
-    'version': '2.0.1',
-    'summary': """Use multiple POS for handling orders""",
-    'author': 'IT-Projects LLC, Ivan Yelizariev',
-    'license': 'GPL-3',
-    'category': 'Point Of Sale',
-    'images': ['images/pos-multi-session.png'],
-    'website': 'https://yelizariev.github.io',
-    'price': 160.00,
-    'currency': 'EUR',
-    'depends': ['pos_disable_payment', 'bus'],
-    'data': [
-        'security/ir.model.access.csv',
-        'views.xml',
+    "name": """Sync POS orders across multiple sessions""",
+    "summary": """Use multiple POS for handling orders""",
+    "category": "Point Of Sale",
+    "images": ["images/pos-multi-session.png"],
+    "version": "2.0.1",
+    "application": False,
+
+    "author": "IT-Projects LLC, Ivan Yelizariev",
+    "support": "apps@it-projects.info",
+    "website": "https://yelizariev.github.io",
+    "license": "GPL-3",
+    "price": 160.00,
+    "currency": "EUR",
+
+    "depends": [
+        "pos_disable_payment",
+        "pos_longpolling",
     ],
-    'qweb': [
-        'static/src/xml/pos_multi_session.xml',
+    "external_dependencies": {"python": [], "bin": []},
+    "data": [
+        "security/ir.model.access.csv",
+        "views/views.xml",
     ],
-    'demo': [
-        'demo/demo.xml',
+    "qweb": [
+        "static/src/xml/pos_multi_session.xml",
     ],
-    'installable': True,
+    "demo": [
+        "demo/demo.xml",
+    ],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+
+    "auto_install": False,
+    "installable": True,
 }
diff --git a/pos_multi_session/controllers/pos_multi_session.py b/pos_multi_session/controllers/pos_multi_session.py
index f5283f1a80..d5a42ae496 100644
--- a/pos_multi_session/controllers/pos_multi_session.py
+++ b/pos_multi_session/controllers/pos_multi_session.py
@@ -13,11 +13,6 @@
 
 class Controller(bus_controller):
 
-    def _poll(self, dbname, channels, last, options):
-        if request.session.uid:
-            channels.append((request.db, 'pos.multi_session', request.uid))
-        return super(Controller, self)._poll(dbname, channels, last, options)
-
     @openerp.http.route('/pos_multi_session/update', type="json", auth="public")
     def multi_session_update(self, multi_session_id, message):
         phantomtest = request.httprequest.headers.get('phantomtest')
diff --git a/pos_multi_session/external_tests/tests/test_sync.py b/pos_multi_session/external_tests/tests/test_sync.py
index f7f93637df..26a70293ea 100644
--- a/pos_multi_session/external_tests/tests/test_sync.py
+++ b/pos_multi_session/external_tests/tests/test_sync.py
@@ -362,9 +362,9 @@ def test_30_slow(self):
                      synced_order = mstest.get_order();
                      mstest.check_inclusion(share.admin_order, synced_order);
 
-                 }, 10000)
+                 }, 20000)
              """,
-             "timeout": 20000,
+             "timeout": 30000,
              },
             # demo compares order with his initial order
             {"session": "demo",
diff --git a/pos_multi_session/models/__init__.py b/pos_multi_session/models/__init__.py
new file mode 100644
index 0000000000..1d9b05ffaa
--- /dev/null
+++ b/pos_multi_session/models/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import pos_multi_session_models
diff --git a/pos_multi_session/pos_multi_session_models.py b/pos_multi_session/models/pos_multi_session_models.py
similarity index 91%
rename from pos_multi_session/pos_multi_session_models.py
rename to pos_multi_session/models/pos_multi_session_models.py
index 9bcb273d0b..78172b2d3f 100644
--- a/pos_multi_session/pos_multi_session_models.py
+++ b/pos_multi_session/models/pos_multi_session_models.py
@@ -114,20 +114,19 @@ def remove_order(self, message):
     def broadcast_message(self, message):
         self.ensure_one()
         notifications = []
-        for ps in self.env['pos.session'].search([('state', '!=', 'closed'), ('config_id.multi_session_id', '=', self.id)]):
-            if ps.user_id.id != self.env.user.id:
-                message_ID = ps.config_id.multi_session_message_ID
-                message_ID += 1
-                ps.config_id.multi_session_message_ID = message_ID
-                message['data']['message_ID'] = message_ID
-                notifications.append([(self._cr.dbname, 'pos.multi_session', ps.user_id.id), message])
+        channel_name = "pos.multi_session"
+        for ps in self.env['pos.session'].search([('user_id', '!=', self.env.user.id), ('state', '!=', 'closed'), ('config_id.multi_session_id', '=', self.id)]):
+            message_ID = ps.config_id.multi_session_message_ID
+            message_ID += 1
+            ps.config_id.multi_session_message_ID = message_ID
+            message['data']['message_ID'] = message_ID
+            ps.config_id._send_to_channel(channel_name, message)
 
         if self.env.context.get('phantomtest') == 'slowConnection':
             _logger.info('Delayed notifications from %s: %s', self.env.user.id, notifications)
             # commit to update values on DB
             self.env.cr.commit()
             time.sleep(3)
-        self.env['bus.bus'].sendmany(notifications)
         return 1
 
 
diff --git a/pos_multi_session/static/src/css/pos_multi_session.css b/pos_multi_session/static/src/css/pos_multi_session.css
index 2fb159eb2e..439cac919d 100644
--- a/pos_multi_session/static/src/css/pos_multi_session.css
+++ b/pos_multi_session/static/src/css/pos_multi_session.css
@@ -18,4 +18,186 @@
 }
 .pos .order-button.selected .ms_info{
 	color:black;
-}
\ No newline at end of file
+}
+
+/*preloader style */
+#floatingCirclesG{
+	position:relative;
+    top: 25%;
+	width:122px;
+	height:122px;
+	margin:auto;
+	transform:scale(0.5);
+		-o-transform:scale(0.5);
+		-ms-transform:scale(0.5);
+		-webkit-transform:scale(0.5);
+		-moz-transform:scale(0.5);
+}
+
+.f_circleG{
+	position:absolute;
+	background-color:rgb(255,255,255);
+	height:18px;
+	width:18px;
+	border-radius:11px;
+		-o-border-radius:11px;
+		-ms-border-radius:11px;
+		-webkit-border-radius:11px;
+		-moz-border-radius:11px;
+	animation-name:f_fadeG;
+		-o-animation-name:f_fadeG;
+		-ms-animation-name:f_fadeG;
+		-webkit-animation-name:f_fadeG;
+		-moz-animation-name:f_fadeG;
+	animation-duration:0.932s;
+		-o-animation-duration:0.932s;
+		-ms-animation-duration:0.932s;
+		-webkit-animation-duration:0.932s;
+		-moz-animation-duration:0.932s;
+	animation-iteration-count:infinite;
+		-o-animation-iteration-count:infinite;
+		-ms-animation-iteration-count:infinite;
+		-webkit-animation-iteration-count:infinite;
+		-moz-animation-iteration-count:infinite;
+	animation-direction:normal;
+		-o-animation-direction:normal;
+		-ms-animation-direction:normal;
+		-webkit-animation-direction:normal;
+		-moz-animation-direction:normal;
+}
+
+#frotateG_01{
+	left:0;
+	top:49px;
+	animation-delay:0.3495s;
+		-o-animation-delay:0.3495s;
+		-ms-animation-delay:0.3495s;
+		-webkit-animation-delay:0.3495s;
+		-moz-animation-delay:0.3495s;
+}
+
+#frotateG_02{
+	left:14px;
+	top:14px;
+	animation-delay:0.466s;
+		-o-animation-delay:0.466s;
+		-ms-animation-delay:0.466s;
+		-webkit-animation-delay:0.466s;
+		-moz-animation-delay:0.466s;
+}
+
+#frotateG_03{
+	left:49px;
+	top:0;
+	animation-delay:0.5825s;
+		-o-animation-delay:0.5825s;
+		-ms-animation-delay:0.5825s;
+		-webkit-animation-delay:0.5825s;
+		-moz-animation-delay:0.5825s;
+}
+
+#frotateG_04{
+	right:14px;
+	top:14px;
+	animation-delay:0.699s;
+		-o-animation-delay:0.699s;
+		-ms-animation-delay:0.699s;
+		-webkit-animation-delay:0.699s;
+		-moz-animation-delay:0.699s;
+}
+
+#frotateG_05{
+	right:0;
+	top:49px;
+	animation-delay:0.8155s;
+		-o-animation-delay:0.8155s;
+		-ms-animation-delay:0.8155s;
+		-webkit-animation-delay:0.8155s;
+		-moz-animation-delay:0.8155s;
+}
+
+#frotateG_06{
+	right:14px;
+	bottom:14px;
+	animation-delay:0.932s;
+		-o-animation-delay:0.932s;
+		-ms-animation-delay:0.932s;
+		-webkit-animation-delay:0.932s;
+		-moz-animation-delay:0.932s;
+}
+
+#frotateG_07{
+	left:49px;
+	bottom:0;
+	animation-delay:1.0485s;
+		-o-animation-delay:1.0485s;
+		-ms-animation-delay:1.0485s;
+		-webkit-animation-delay:1.0485s;
+		-moz-animation-delay:1.0485s;
+}
+
+#frotateG_08{
+	left:14px;
+	bottom:14px;
+	animation-delay:1.165s;
+		-o-animation-delay:1.165s;
+		-ms-animation-delay:1.165s;
+		-webkit-animation-delay:1.165s;
+		-moz-animation-delay:1.165s;
+}
+
+
+
+@keyframes f_fadeG{
+	0%{
+		background-color:rgb(0,0,0);
+	}
+
+	100%{
+		background-color:rgb(255,255,255);
+	}
+}
+
+@-o-keyframes f_fadeG{
+	0%{
+		background-color:rgb(0,0,0);
+	}
+
+	100%{
+		background-color:rgb(255,255,255);
+	}
+}
+
+@-ms-keyframes f_fadeG{
+	0%{
+		background-color:rgb(0,0,0);
+	}
+
+	100%{
+		background-color:rgb(255,255,255);
+	}
+}
+
+@-webkit-keyframes f_fadeG{
+	0%{
+		background-color:rgb(0,0,0);
+	}
+
+	100%{
+		background-color:rgb(255,255,255);
+	}
+}
+
+@-moz-keyframes f_fadeG{
+	0%{
+		background-color:rgb(0,0,0);
+	}
+
+	100%{
+		background-color:rgb(255,255,255);
+	}
+}
+.popup-preload {
+	background-color: transparent!important;
+	box-shadow: 0px 10px 20px transparent!important;
+}
diff --git a/pos_multi_session/static/src/js/pos_multi_session.js b/pos_multi_session/static/src/js/pos_multi_session.js
index 1acaef5572..abdc6115fd 100644
--- a/pos_multi_session/static/src/js/pos_multi_session.js
+++ b/pos_multi_session/static/src/js/pos_multi_session.js
@@ -41,6 +41,17 @@ openerp.pos_multi_session = function(instance){
                 }
                 order.ms_remove_order();
             });
+            this.multi_session = new module.MultiSession(this);
+            var channel_name = "pos.multi_session";
+            var callback = this.ms_on_update;
+            this.add_channel(channel_name, callback, this);
+
+
+        },
+        init_multi_session: function(){
+            if (this.config.multi_session_id){
+                this.multi_session.request_sync_all();
+            }
         },
         ms_my_info: function(){
             return {
@@ -221,17 +232,6 @@ openerp.pos_multi_session = function(instance){
             }, function(err,event){ event.preventDefault(); def.reject(); });
         return def;
     },
-        load_server_data: function () {
-            res = PosModelSuper.prototype.load_server_data.apply(this, arguments);
-            var self = this;
-            return res.then(function () {
-                if (self.config.multi_session_id) {
-                    self.multi_session = new module.MultiSession(self);
-                    self.multi_session.start();
-                    self.multi_session.request_sync_all();
-                }
-            });
-        },
     });
 
     module.OrderButtonWidget = module.OrderButtonWidget.extend({
@@ -305,7 +305,7 @@ openerp.pos_multi_session = function(instance){
                 function(){
                     self.ms_update_timeout = false;
                     self.do_ms_update();
-                }, 1000);
+                }, 0);
         },
         ms_remove_order: function(){
             if (!this.ms_check())
@@ -323,32 +323,31 @@ openerp.pos_multi_session = function(instance){
         },
         do_ms_update: function(){
             var self = this;
-            var data = this.export_as_JSON();
-            this.pos.multi_session.update(data).fail(function(error){
-                if (error == 'offline') {
-                    if (self.order_on_server) {
-                        self.order_on_server = true;
-                    } else {
-                        self.order_on_server = false;
-                    }
-                }
-            }).done(function(res){
-                self.order_on_server = true;
-                if (res) {
-                    var server_revision_ID = res.revision_ID;
-                    var order_ID = res.order_ID;
-                    if (self.sequence_number != order_ID) {
-                        self.sequence_number = order_ID;
-                        // sequence number replace
-                        self.pos.pos_session.order_ID = order_ID;
-                        // rerender order
-                        self.trigger('change');
-                    }
-                    if (server_revision_ID && server_revision_ID > self.revision_ID) {
-                        self.revision_ID = server_revision_ID;
+            if (this.enquied)
+                return;
+            var f = function(){
+                self.enquied=false;
+                var data = self.export_as_JSON();
+                return self.pos.multi_session.update(data).done(function(res){
+                    self.order_on_server = true;
+                    if (res) {
+                        var server_revision_ID = res.revision_ID;
+                        var order_ID = res.order_ID;
+                        if (self.sequence_number != order_ID) {
+                            self.sequence_number = order_ID;
+                            // sequence number replace
+                            self.pos.pos_session.order_ID = order_ID;
+                            // rerender order
+                            self.trigger('change');
+                        }
+                        if (server_revision_ID && server_revision_ID > self.revision_ID) {
+                            self.revision_ID = server_revision_ID;
+                        }
                     }
-                }
-            });
+                })
+            };
+            this.enquied = true;
+            this.pos.multi_session.enque(f)
         }
     });
     var OrderlineSuper = module.Orderline;
@@ -386,23 +385,34 @@ openerp.pos_multi_session = function(instance){
 
     module.MultiSession = Backbone.Model.extend({
         initialize: function(pos){
+            var self = this;
             this.pos = pos;
-            this.show_warning_message = true;
             this.client_online = true;
             this.order_ID = null;
-        },
-        start: function(){
-            var self = this;
-
-            this.bus = instance.bus.bus;
-            this.bus.last = this.pos.db.load('bus_last', 0);
-            this.bus.on("notification", this, this.on_notification);
-            this.bus.start_polling();
-
+            this.update_queue = $.when();
+            this.func_queue = [];
+            this.pos.longpolling_connection.on("change:poll_connection", function(status){
+                if (status) {
+                    if (self.offline_sync_all_timer) {
+                        clearInterval(self.offline_sync_all_timer);
+                        self.offline_sync_all_timer = false;
+                    }
+                    self.request_sync_all().done(function(){
+                        var element = $(".modal-popup-preload");
+                        if (!element.hasClass("oe_hidden")) {
+                            element.addClass("oe_hidden");
+                        }
+                    });
+                } else {
+                    var warning_message = _t("No connection to the server. You can only create new orders. It is forbidden to modify existing orders.");
+                    self.warning(warning_message);
+                    self.start_offline_sync_timer();
+                }
+            });
         },
         request_sync_all: function(){
             var data = {};
-            this.send({'action': 'sync_all', data: data});
+            return this.send({'action': 'sync_all', data: data});
         },
         remove_order: function(data){
             this.send({action: 'remove_order', data: data});
@@ -410,6 +420,20 @@ openerp.pos_multi_session = function(instance){
         update: function(data){
             return this.send({action: 'update_order', data: data});
         },
+        enque: function(func){
+            var self = this;
+            this.func_queue.push(func);
+            this.update_queue = this.update_queue.then(function() {
+                if (self.func_queue[0]) {
+                    var next = $.Deferred();
+                    var func1 = self.func_queue.shift();
+                    func1().always(function () {
+                        next.resolve()
+                    });
+                    return next;
+                }
+            })
+        },
         _debug_send_number: 0,
         send: function(message){
             var current_send_number = 0;
@@ -418,7 +442,6 @@ openerp.pos_multi_session = function(instance){
                 console.log('MS', this.pos.config.name, 'send #' + current_send_number +' :', JSON.stringify(message));
             }
             var self = this;
-            var connection_status = new $.Deferred();
             message.data.pos_id = this.pos.config.id;
             var send_it = function () {
                 return openerp.session.rpc("/pos_multi_session/update", {
@@ -426,20 +449,14 @@ openerp.pos_multi_session = function(instance){
                     message: message
                 });
             };
-            send_it().fail(function (error, e) {
+            return send_it().fail(function (error, e) {
                 if (self.pos.debug){
                     console.log('MS', self.pos.config.name, 'failed request #'+current_send_number+':', error.message);
                 }
                 if(error.message === 'XmlHttpRequestError ') {
                     self.client_online = false;
                     e.preventDefault();
-                    connection_status.reject('offline');
-                    if (self.show_warning_message) {
-                        var warning_message = _t("No connection to the server. You can only create new orders. It is forbidden to modify existing orders.");
-                        self.warning(warning_message);
-                        self.start_offline_sync_timer();
-                        self.show_warning_message = false;
-                    }
+                    self.pos.longpolling_connection.set_status(false);
                 } else {
                     self.request_sync_all();
                 }
@@ -447,13 +464,10 @@ openerp.pos_multi_session = function(instance){
                 if (self.pos.debug){
                     console.log('MS', self.pos.config.name, 'response #'+current_send_number+':', JSON.stringify(res));
                 }
+                self.pos.longpolling_connection.set_status(true);
 
                 var server_orders_uid = [];
                 self.client_online = true;
-                if (res.action == "update_revision_ID") {
-                    connection_status.resolve(res);
-                }
-                connection_status.resolve();
                 if (res.action == "revision_error") {
                     var warning_message = _t('There is a conflict during synchronization, try your action again');
                     self.warning(warning_message);
@@ -468,13 +482,7 @@ openerp.pos_multi_session = function(instance){
                     self.pos.pos_session.sequence_number = res.order_ID;
                     self.destroy_removed_orders(server_orders_uid);
                 }
-                if (self.offline_sync_all_timer) {
-                    clearInterval(self.offline_sync_all_timer);
-                    self.offline_sync_all_timer = false;
-                }
-                self.show_warning_message = true;
             });
-            return connection_status;
         },
         destroy_removed_orders: function(server_orders_uid) {
             var self = this;
@@ -509,7 +517,7 @@ openerp.pos_multi_session = function(instance){
             var self = this;
             var orders = this.pos.get("orders");
             orders.each(function(item) {
-                if (item.order_on_server === false) {
+                if (!item.order_on_server && item.get('orderLines').length > 0) {
                     item.ms_update();
                 }
             });
@@ -520,29 +528,16 @@ openerp.pos_multi_session = function(instance){
                 self.request_sync_all();
             }, 5000);
         },
-        on_notification: function(notification) {
-            var self = this;
-            if (typeof notification[0][0] === 'string') {
-                notification = [notification];
-            }
-            for (var i = 0; i < notification.length; i++) {
-                var channel = notification[i][0];
-                var message = notification[i][1];
-                this.on_notification_do(channel, message);
-            }
+    });
+    module.PreloadPopupWidget = module.PopUpWidget.extend({
+        template:'PreloadPopupWidget',
+    });
+    module.PosWidget.include({
+        build_widgets: function() {
+            this._super();
+            this.preload_popup = new module.PreloadPopupWidget(this, {});
+            this.preload_popup.appendTo(this.$el);
+            this.screen_selector.popup_set['preload'] = this.preload_popup;
         },
-        on_notification_do: function (channel, message) {
-            if(Array.isArray(channel) && channel[1] === 'pos.multi_session'){
-                try{
-                    this.pos.ms_on_update(message);
-                }catch(err){
-                    this.pos.pos_widget.screen_selector.show_popup('error',{
-                        message: _t('Error'),
-                        comment: err,
-                    });
-                }
-            }
-            this.pos.db.save('bus_last', this.bus.last);
-        }
     });
 };
diff --git a/pos_multi_session/static/src/xml/pos_multi_session.xml b/pos_multi_session/static/src/xml/pos_multi_session.xml
index 09edb9791e..545bd94e79 100644
--- a/pos_multi_session/static/src/xml/pos_multi_session.xml
+++ b/pos_multi_session/static/src/xml/pos_multi_session.xml
@@ -28,4 +28,21 @@
         </t>
     </t>
 
+    <t t-name="PreloadPopupWidget">
+        <div class="modal-dialog modal-popup-preload">
+            <div class="popup popup-preload">
+                <div id="floatingCirclesG">
+                    <div class="f_circleG" id="frotateG_01"></div>
+                    <div class="f_circleG" id="frotateG_02"></div>
+                    <div class="f_circleG" id="frotateG_03"></div>
+                    <div class="f_circleG" id="frotateG_04"></div>
+                    <div class="f_circleG" id="frotateG_05"></div>
+                    <div class="f_circleG" id="frotateG_06"></div>
+                    <div class="f_circleG" id="frotateG_07"></div>
+                    <div class="f_circleG" id="frotateG_08"></div>
+                </div>
+            </div>
+        </div>
+    </t>
+
 </templates>
diff --git a/pos_multi_session/views.xml b/pos_multi_session/views/views.xml
similarity index 100%
rename from pos_multi_session/views.xml
rename to pos_multi_session/views/views.xml

From 5e2a2750000bf3b96052e5b93185ff753f0079d3 Mon Sep 17 00:00:00 2001
From: Dinar <gabbasov@it-projects.info>
Date: Fri, 3 Mar 2017 13:26:08 +0500
Subject: [PATCH 13/15] [FIX] Fixes restart timer error

---
 pos_longpolling/static/src/js/pos_longpolling.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pos_longpolling/static/src/js/pos_longpolling.js b/pos_longpolling/static/src/js/pos_longpolling.js
index c62f676ff5..f2ae462dcb 100644
--- a/pos_longpolling/static/src/js/pos_longpolling.js
+++ b/pos_longpolling/static/src/js/pos_longpolling.js
@@ -97,12 +97,12 @@ openerp.pos_longpolling = function(instance){
             this.status = false;
         },
         set_status: function(status) {
+            this.start_timer(this.pos.config.query_timeout, 'query');
             if (this.status == status) {
                 return;
             }
             this.status = status;
             this.trigger("change:poll_connection", status);
-            this.start_timer(this.pos.config.query_timeout, 'query');
         },
         update_status: function(message) {
             var self = this;

From 9316f728d758d350e8f2725ef9b2a23da953993b Mon Sep 17 00:00:00 2001
From: ILMIR <karamov@it-projects.info>
Date: Fri, 3 Mar 2017 18:10:35 +0500
Subject: [PATCH 14/15] [ADD] new version for the pos_multi_session module
 (#245)

* New version for the pos_multi_session module

* Update changelog.rst
---
 pos_multi_session/__openerp__.py    | 2 +-
 pos_multi_session/doc/changelog.rst | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pos_multi_session/__openerp__.py b/pos_multi_session/__openerp__.py
index 479e2acace..65455833ca 100644
--- a/pos_multi_session/__openerp__.py
+++ b/pos_multi_session/__openerp__.py
@@ -4,7 +4,7 @@
     "summary": """Use multiple POS for handling orders""",
     "category": "Point Of Sale",
     "images": ["images/pos-multi-session.png"],
-    "version": "2.0.1",
+    "version": "3.0.0",
     "application": False,
 
     "author": "IT-Projects LLC, Ivan Yelizariev",
diff --git a/pos_multi_session/doc/changelog.rst b/pos_multi_session/doc/changelog.rst
index 4b6f8a8748..3e296cf4de 100644
--- a/pos_multi_session/doc/changelog.rst
+++ b/pos_multi_session/doc/changelog.rst
@@ -3,6 +3,14 @@
 Updates
 =========
 
+`3.0.0`
+-------
+
+- FIX: Added a queue for request sending that allows to fix the syncronization error on slow or lost  connection
+- NEW: Added connection status with server to POS interface
+- NEW: Create new orders even if the connection with server temporarily has been lost
+
+
 `2.0.1`
 -------
 

From 7f3dbb1f37ccf94e94328449310f002e4a64d416 Mon Sep 17 00:00:00 2001
From: Dinar <gabbasov@it-projects.info>
Date: Tue, 7 Mar 2017 20:59:33 +0500
Subject: [PATCH 15/15] [FIX] longpolling channel error [ADD] help message for
 query_timeout and response_timeout fields - pos_lingpolling v8.0 (#253)

* [FIX] Fixes channel error, update changelog

* [ADD] Add help for timeout fields
---
 pos_longpolling/__openerp__.py                    |  2 +-
 pos_longpolling/doc/changelog.rst                 |  5 +++++
 pos_longpolling/models/pos_longpolling_models.py  | 15 +++++++++++++--
 pos_longpolling/static/src/js/pos_longpolling.js  |  4 +++-
 .../static/src/xml/pos_longpolling_connection.xml |  2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pos_longpolling/__openerp__.py b/pos_longpolling/__openerp__.py
index 513d71b1f9..862514562a 100644
--- a/pos_longpolling/__openerp__.py
+++ b/pos_longpolling/__openerp__.py
@@ -4,7 +4,7 @@
     "summary": """Technical module implement instant updates in POS""",
     "category": "Point of Sale",
     "images": [],
-    "version": "1.1.0",
+    "version": "1.1.1",
     "application": False,
 
     "author": "IT-Projects LLC, Dinar Gabbasov",
diff --git a/pos_longpolling/doc/changelog.rst b/pos_longpolling/doc/changelog.rst
index 40a82fa284..368d4f680f 100644
--- a/pos_longpolling/doc/changelog.rst
+++ b/pos_longpolling/doc/changelog.rst
@@ -1,3 +1,8 @@
+`1.1.1`
+-------
+
+- **FIX:** longpolling channel
+
 `1.1.0`
 -------
 
diff --git a/pos_longpolling/models/pos_longpolling_models.py b/pos_longpolling/models/pos_longpolling_models.py
index 86790768f8..98dbe5cee3 100644
--- a/pos_longpolling/models/pos_longpolling_models.py
+++ b/pos_longpolling/models/pos_longpolling_models.py
@@ -8,8 +8,19 @@
 class PosConfig(models.Model):
     _inherit = 'pos.config'
 
-    query_timeout = fields.Float(string='Query timeout', default=0.0833)
-    response_timeout = fields.Float(string='Response timeout', default=0.01666)
+    # 5/60 = 0.0833 = 5 min - default value
+    query_timeout = fields.Float(string='Query timeout', default=0.0833,
+                                 help="Waiting period for any message from poll "
+                                      "(if we have not received a message at this period, "
+                                      "poll will send message ('PING') to check the connection)")
+
+    # 1/60 = 0.01666 = 1 min  - default value
+    response_timeout = fields.Float(string='Response timeout', default=0.01666,
+                                    help="Waiting period for response message (i.e. once message from "
+                                         "poll has been sent, it will be waiting for response message ('PONG') "
+                                         "at this period and if the message has not been received, the icon turns "
+                                         "color to red. Once the connection is restored, the icon changes its color "
+                                         "back to green)")
 
     @api.multi
     def _send_to_channel(self, channel_name, message):
diff --git a/pos_longpolling/static/src/js/pos_longpolling.js b/pos_longpolling/static/src/js/pos_longpolling.js
index f2ae462dcb..58280c3447 100644
--- a/pos_longpolling/static/src/js/pos_longpolling.js
+++ b/pos_longpolling/static/src/js/pos_longpolling.js
@@ -69,7 +69,9 @@ openerp.pos_longpolling = function(instance){
         },
         on_notification_do: function (channel, message) {
             var self = this;
-            var channel = JSON.parse(channel);
+            if (_.isString(channel)) {
+                var channel = JSON.parse(channel);
+            }
             if(Array.isArray(channel) && (channel[1] in self.channels)){
                 try{
                     self.longpolling_connection.update_status();
diff --git a/pos_longpolling/static/src/xml/pos_longpolling_connection.xml b/pos_longpolling/static/src/xml/pos_longpolling_connection.xml
index 374ce979ce..6f708d5803 100644
--- a/pos_longpolling/static/src/xml/pos_longpolling_connection.xml
+++ b/pos_longpolling/static/src/xml/pos_longpolling_connection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
     <t t-extend="SynchNotificationWidget">
-        <t t-jquery=".js_msg" t-operation="after">
+        <t t-jquery=".js_synch" t-operation="append">
             <div class="js_poll_connected oe_icon oe_red">
                 <i class='fa fa-fw fa-signal'></i>
             </div>