🌈 pos_longpolling refactoring

itpp-labs · Nov 7, 2019 · 87debdc · 87debdc
1 parent 427392b
commit 87debdc
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 43 deletions.
diff --git a/pos_debt_notebook_sync/static/src/js/sync.js b/pos_debt_notebook_sync/static/src/js/sync.js
@@ -4,7 +4,6 @@
 odoo.define('pos_debt_sync', function(require){
 
     var models = require('point_of_sale.models');
-    var longpolling = require('pos_longpolling.connection');
 
     var PosModelSuper = models.PosModel;
     models.PosModel = models.PosModel.extend({

diff --git a/pos_invoice_pay/static/src/js/main.js b/pos_invoice_pay/static/src/js/main.js
@@ -12,7 +12,6 @@ var PosDb = require('point_of_sale.DB');
 var utils = require('web.utils');
 var screens = require('point_of_sale.screens');
 var rpc = require('web.rpc');
-var longpolling = require('pos_longpolling.connection');
 var chrome = require('point_of_sale.chrome');
 
 var QWeb = core.qweb;

diff --git a/pos_longpolling/__manifest__.py b/pos_longpolling/__manifest__.py
@@ -3,7 +3,7 @@
     "summary": """Technical module to implement instant updates in POS""",
     "category": "Point of Sale",
     "images": [],
-    "version": "12.0.2.2.0",
+    "version": "12.0.2.3.0",
     "application": False,
 
     "author": "IT-Projects LLC, Dinar Gabbasov",

diff --git a/pos_longpolling/doc/changelog.rst b/pos_longpolling/doc/changelog.rst
@@ -1,3 +1,8 @@
+`2.3.0`
+-------
+
+- **IMP:** File refactoring. Changes after Pull request https://github.com/odoo/odoo/pull/28092 to Odoo was merged
+
 `2.2.0`
 -------
 

diff --git a/...gpolling/static/src/js/longpolling_bus.js → ...ngpolling/static/src/js/LongpollingBus.js b/...gpolling/static/src/js/longpolling_bus.js → ...ngpolling/static/src/js/LongpollingBus.js
@@ -1,4 +1,4 @@
-odoo.define('pos_longpolling.bus_longpolling', function(require){
+odoo.define('pos_longpolling.LongpollingBus', function(require){
     "use strict";
 
     var LongpollingBus = require('bus.Longpolling');

diff --git a/pos_longpolling/static/src/js/models.js → ...polling/static/src/js/LongpollingModel.js b/pos_longpolling/static/src/js/models.js → ...polling/static/src/js/LongpollingModel.js
@@ -1,4 +1,4 @@
-odoo.define('pos_longpolling.model', function(require){
+odoo.define('pos_longpolling.LongpollingModel', function(require){
     "use strict";
 
     var Backbone = window.Backbone;

diff --git a/pos_longpolling/static/src/js/longpolling.js → ...ongpolling/static/src/js/PosConnection.js b/pos_longpolling/static/src/js/longpolling.js → ...ongpolling/static/src/js/PosConnection.js
@@ -1,8 +1,8 @@
-odoo.define('pos_longpolling.connection', function(require){
+odoo.define('pos_longpolling.PosConnection', function(require){
     "use strict";
 
-    var LongpollingModel = require('pos_longpolling.model');
-    var bus_longpolling = require('pos_longpolling.bus_longpolling');
+    var LongpollingModel = require('pos_longpolling.LongpollingModel');
+    var bus_longpolling = require('pos_longpolling.LongpollingBus');
     var core = require('web.core');
     var SyncBusService = require('pos_longpolling.SyncBusService');
     var crash_manager = require('web.crash_manager');

diff --git a/...polling/static/src/js/sync_bus_service.js → ...ngpolling/static/src/js/SyncBusService.js b/...polling/static/src/js/sync_bus_service.js → ...ngpolling/static/src/js/SyncBusService.js
diff --git a/pos_longpolling/static/src/js/widgets.js → pos_longpolling/static/src/js/chrome.js b/pos_longpolling/static/src/js/widgets.js → pos_longpolling/static/src/js/chrome.js
@@ -1,4 +1,4 @@
-odoo.define('pos_longpolling.widgets', function(require){
+odoo.define('pos_longpolling.chrome', function(require){
     "use strict";
 
     var core = require('web.core');

diff --git a/pos_longpolling/static/src/js/crosstab_bus.js b/pos_longpolling/static/src/js/crosstab_bus.js
diff --git a/pos_longpolling/static/src/js/pos.js b/pos_longpolling/static/src/js/pos.js
@@ -2,7 +2,7 @@ odoo.define('pos_longpolling.pos', function(require){
     "use strict";
 
     var models = require('point_of_sale.models');
-    var PosConnection = require('pos_longpolling.connection');
+    var PosConnection = require('pos_longpolling.PosConnection');
 
     var PosModelSuper = models.PosModel;
     models.PosModel = models.PosModel.extend({

diff --git a/pos_longpolling/views/pos_longpolling_template.xml b/pos_longpolling/views/pos_longpolling_template.xml
@@ -2,13 +2,12 @@
 <odoo>
     <template id="point_of_sale_assets" name="pos_longpolling assets" inherit_id="point_of_sale.assets">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_longpolling/static/src/js/longpolling.js"></script>
-            <script type="text/javascript" src="/pos_longpolling/static/src/js/longpolling_bus.js"></script>
-            <script type="text/javascript" src="/pos_longpolling/static/src/js/crosstab_bus.js"></script>
-            <script type="text/javascript" src="/pos_longpolling/static/src/js/models.js"></script>
+            <script type="text/javascript" src="/pos_longpolling/static/src/js/chrome.js"></script>
+            <script type="text/javascript" src="/pos_longpolling/static/src/js/LongpollingBus.js"></script>
+            <script type="text/javascript" src="/pos_longpolling/static/src/js/LongpollingModel.js"></script>
+            <script type="text/javascript" src="/pos_longpolling/static/src/js/SyncBusService.js"></script>
+            <script type="text/javascript" src="/pos_longpolling/static/src/js/PosConnection.js"></script>
             <script type="text/javascript" src="/pos_longpolling/static/src/js/pos.js"></script>
-            <script type="text/javascript" src="/pos_longpolling/static/src/js/widgets.js"></script>
-            <script type="text/javascript" src="/pos_longpolling/static/src/js/sync_bus_service.js"></script>
         </xpath>
     </template>
 

diff --git a/pos_multi_session/static/src/js/pos_multi_session.js b/pos_multi_session/static/src/js/pos_multi_session.js
@@ -15,7 +15,6 @@ odoo.define('pos_multi_session', function(require){
     var screens = require('point_of_sale.screens');
     var models = require('point_of_sale.models');
     var chrome = require('point_of_sale.chrome');
-    var longpolling = require('pos_longpolling.connection');
     var rpc = require('web.rpc');
     var gui = require('point_of_sale.gui');
     var posDB = require('point_of_sale.DB');

diff --git a/pos_orders_history/static/src/js/models.js b/pos_orders_history/static/src/js/models.js
@@ -6,8 +6,6 @@ odoo.define('pos_orders_history.models', function (require) {
     "use strict";
     var models = require('point_of_sale.models');
     var rpc = require('web.rpc');
-    var longpolling = require('pos_longpolling.connection');
-
 
     var _super_pos_model = models.PosModel.prototype;
     models.PosModel = models.PosModel.extend({

diff --git a/pos_orders_history_reprint/static/src/js/models.js b/pos_orders_history_reprint/static/src/js/models.js
@@ -5,7 +5,6 @@ odoo.define('pos_orders_history_reprint.models', function (require) {
     "use strict";
     var models = require('pos_orders_history.models');
     var rpc = require('web.rpc');
-    var longpolling = require('pos_longpolling.connection');
 
     var _super_pos_model = models.PosModel.prototype;
     models.PosModel = models.PosModel.extend({
-Original file line number
+Diff line change
@@ -1,3 +1,8 @@
+    `2.3.0`
+    -------
+    - **IMP:** File refactoring. Changes after Pull request https://github.com/odoo/odoo/pull/28092 to Odoo was merged
     `2.2.0`
     -------
@@ Expand Down @@