From dcdee5b4293e44d2d77690cdadb5b669af2bc9ec Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 7 Dec 2011 11:01:21 +0100 Subject: [PATCH 01/23] [fix] search problem bzr revid: nicolas.vanhoren@openerp.com-20111207100121-xsybjs8bw2p66c48 --- addons/point_of_sale/static/src/js/pos.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 05adcaf458a..14019eee62a 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1103,7 +1103,7 @@ openerp.point_of_sale = function(db) { s = $(this).val().toLowerCase(); if (s) { m = products.filter( function(p) { - return p.name.toLowerCase().indexOf(s); + return p.name.toLowerCase().indexOf(s) != -1; }); $('.search-clear').fadeIn(); } else { From e6252ff604ff53ba4e1dc3e1356a1d66303b5734 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 9 Dec 2011 14:47:37 +0100 Subject: [PATCH 02/23] [imp] refactored Pos bzr revid: nicolas.vanhoren@openerp.com-20111209134737-um3fo7qwcwb9wdpo --- addons/point_of_sale/static/src/js/pos.js | 36 +++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 14019eee62a..dc484ad5690 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -49,8 +49,8 @@ openerp.point_of_sale = function(db) { /* Gets all the necessary data from the OpenERP web client (session, shop data etc.) */ - var Pos = (function() { - function Pos(session) { + var Pos = db.web.Class.extend({ + init: function(session) { this.build_tree = _.bind(this.build_tree, this); this.session = session; $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']), @@ -58,11 +58,10 @@ openerp.point_of_sale = function(db) { this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name']), this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type'])) .then(this.build_tree); - } - - Pos.prototype.ready = $.Deferred(); - Pos.prototype.store = new Store; - Pos.prototype.fetch = function(osvModel, fields, domain) { + }, + ready: $.Deferred(), + store: new Store, + fetch: function(osvModel, fields, domain) { var dataSetSearch; var self = this; var callback = function(result) { @@ -70,14 +69,14 @@ openerp.point_of_sale = function(db) { }; dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain); return dataSetSearch.read_slice(fields, 0).then(callback); - }; - Pos.prototype.push = function(osvModel, record, callback, errorCallback) { + }, + push: function(osvModel, record, callback, errorCallback) { var dataSet; dataSet = new db.web.DataSet(this, osvModel, null); return dataSet.create(record, callback, errorCallback); - }; - Pos.prototype.categories = {}; - Pos.prototype.build_tree = function() { + }, + categories: {}, + build_tree: function() { var c, id, _i, _len, _ref, _ref2; _ref = this.store.get('pos.category'); for (_i = 0, _len = _ref.length; _i < _len; _i++) { @@ -124,14 +123,14 @@ openerp.point_of_sale = function(db) { }).call(this) }; return this.ready.resolve(); - }; - Pos.prototype.build_ancestors = function(parent) { + }, + build_ancestors: function(parent) { if (parent != null) { this.current_category.ancestors.unshift(parent); return this.build_ancestors(this.categories[parent].parent); } - }; - Pos.prototype.build_subtree = function(category) { + }, + build_subtree: function(category) { var c, _i, _len, _ref, _results; _ref = category.children; _results = []; @@ -141,9 +140,8 @@ openerp.point_of_sale = function(db) { _results.push(this.build_subtree(this.categories[c])); } return _results; - }; - return Pos; - })(); + } + }); /* global variable */ var pos; From e7d3b6133918483c52910def38295f47f751280d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 9 Dec 2011 15:22:11 +0100 Subject: [PATCH 03/23] [imp] improved storage bzr revid: nicolas.vanhoren@openerp.com-20111209142211-dgt8s2exjr8pj7ai --- addons/point_of_sale/static/src/js/pos.js | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index dc484ad5690..4af1d8d524b 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -30,22 +30,21 @@ openerp.point_of_sale = function(db) { Local store access. Read once from localStorage upon construction and persist on every change. There should only be one store active at any given time to ensure data consistency. */ - var Store = (function() { - function Store() { - var store; - store = localStorage['pos']; - this.data = (store && JSON.parse(store)) || {}; - } - - Store.prototype.get = function(key) { + var Store = db.web.Class.extend({ + init: function() { + this.data = {}; + }, + get: function(key) { + if (this.data[key] === undefined) { + this.data[key] = JSON.parse(localStorage['oe_pos_' + key]); + } return this.data[key]; - }; - Store.prototype.set = function(key, value) { + }, + set: function(key, value) { this.data[key] = value; - return localStorage['pos'] = JSON.stringify(this.data); - }; - return Store; - })(); + localStorage['oe_pos_' + key] = JSON.stringify(value); + }, + }); /* Gets all the necessary data from the OpenERP web client (session, shop data etc.) */ @@ -60,7 +59,7 @@ openerp.point_of_sale = function(db) { .then(this.build_tree); }, ready: $.Deferred(), - store: new Store, + store: new Store(), fetch: function(osvModel, fields, domain) { var dataSetSearch; var self = this; From e903fc7761146e93e53ac9bfdde909ceeab9389c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 12 Dec 2011 17:00:01 +0100 Subject: [PATCH 04/23] [imp] added disconnected feature bzr revid: nicolas.vanhoren@openerp.com-20111212160001-vglc3zqz10hlter5 --- addons/point_of_sale/static/src/js/pos.js | 76 ++++++++++++++++++----- 1 file changed, 59 insertions(+), 17 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 4af1d8d524b..39408d1122b 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -34,9 +34,13 @@ openerp.point_of_sale = function(db) { init: function() { this.data = {}; }, - get: function(key) { + get: function(key, _default) { if (this.data[key] === undefined) { - this.data[key] = JSON.parse(localStorage['oe_pos_' + key]); + var stored = localStorage['oe_pos_' + key]; + if (stored) + this.data[key] = JSON.parse(stored); + else + return _default; } return this.data[key]; }, @@ -48,8 +52,12 @@ openerp.point_of_sale = function(db) { /* Gets all the necessary data from the OpenERP web client (session, shop data etc.) */ - var Pos = db.web.Class.extend({ - init: function(session) { + var Pos = Backbone.Model.extend({ + initialize: function(session, attributes) { + Backbone.Model.prototype.initialize.call(this, attributes); + this.store = new Store(); + this.ready = $.Deferred(); + this.flush_mutex = new $.Mutex(); this.build_tree = _.bind(this.build_tree, this); this.session = session; $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']), @@ -58,21 +66,56 @@ openerp.point_of_sale = function(db) { this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type'])) .then(this.build_tree); }, - ready: $.Deferred(), - store: new Store(), + get: function(attribute) { + if (attribute === 'pending_operations') { + return this.store.get('pending_operations', []); + } + return Backbone.Model.prototype.get.call(this, attribute); + }, + set: function(attributes, options) { + _.each(attributes, _.bind(function (value, attribute) { + if (attribute === 'pending_operations') { + this.store.set('pending_operations', value); + } + }, this)); + return Backbone.Model.prototype.set.call(this, attributes, options); + }, fetch: function(osvModel, fields, domain) { var dataSetSearch; var self = this; - var callback = function(result) { - return self.store.set(osvModel, result); - }; dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain); - return dataSetSearch.read_slice(fields, 0).then(callback); + return dataSetSearch.read_slice(fields, 0).then(function(result) { + return self.store.set(osvModel, result); + }); }, - push: function(osvModel, record, callback, errorCallback) { - var dataSet; - dataSet = new db.web.DataSet(this, osvModel, null); - return dataSet.create(record, callback, errorCallback); + push: function(osvModel, record) { + var ops = this.get('pending_operations'); + ops.push({model: osvModel, record: record}); + this.set({pending_operations: ops}); + return this.flush(); + }, + flush: function() { + return this.flush_mutex.exec(_.bind(function() { + return this._int_flush(); + }, this)); + }, + _int_flush : function() { + var ops = this.get('pending_operations'); + if (ops.length === 0) + return $.when(); + var op = ops[0]; + var dataSet = new db.web.DataSet(this, op.model, null); + /* we prevent the default error handler and assume errors + * are a normal use case, except we stop the current iteration + */ + return dataSet.create(op.record).fail(function(unused, event) { + event.preventDefault(); + }).pipe(_.bind(function() { + console.debug('saved 1 record'); + var ops2 = this.get('pending_operations'); + this.set({'pending_operations': _.without(ops2, op)}); + return this._int_flush(); + }, this), function() {return $.when()}); }, categories: {}, build_tree: function() { @@ -828,12 +871,11 @@ openerp.point_of_sale = function(db) { validateCurrentOrder: function() { var callback, currentOrder; currentOrder = this.shop.get('selectedOrder'); - callback = _.bind(function() { + pos.push('pos.order', currentOrder.exportAsJSON()).then(_.bind(function() { return currentOrder.set({ validated: true }); - }, this); - pos.push('pos.order', currentOrder.exportAsJSON(), callback); + }, this)); }, bindPaymentLineEvents: function() { this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines'); From ff182cf4885331864f5046ba8e216257c2fba8b4 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 12 Dec 2011 17:05:58 +0100 Subject: [PATCH 05/23] [imp] disables the payment button during asynch events bzr revid: nicolas.vanhoren@openerp.com-20111212160558-4mm45tdsiao08fqf --- addons/point_of_sale/static/src/js/pos.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 39408d1122b..5022601063e 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -871,7 +871,9 @@ openerp.point_of_sale = function(db) { validateCurrentOrder: function() { var callback, currentOrder; currentOrder = this.shop.get('selectedOrder'); + $('button#validate-order', this.$element).attr('disabled', 'disabled'); pos.push('pos.order', currentOrder.exportAsJSON()).then(_.bind(function() { + $('button#validate-order', this.$element).removeAttr('disabled'); return currentOrder.set({ validated: true }); From 6bbc8b1e31acc4a64b6fe27b51d3dfd2a9556b57 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 12 Dec 2011 17:12:18 +0100 Subject: [PATCH 06/23] [imp] renammed "Back" into "Close" bzr revid: nicolas.vanhoren@openerp.com-20111212161218-9dfsm336yg25qsxw --- addons/point_of_sale/static/src/xml/pos.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 74ff2229729..d8647aaccc9 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -25,7 +25,7 @@
- +
From b9224210c3d509e69120315e2354c314721bfa26 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 12 Dec 2011 17:42:12 +0100 Subject: [PATCH 07/23] [imp] added startup code for synchronisation icon bzr revid: nicolas.vanhoren@openerp.com-20111212164212-3jsfl1fltk6blq93 --- addons/point_of_sale/static/src/js/pos.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 5022601063e..79cba643647 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1167,14 +1167,18 @@ openerp.point_of_sale = function(db) { template: "PointOfSale", start: function() { var self = this; - this.$element.find("#loggedas button").click(function() { - self.stop(); - }); if (pos) throw "It is not possible to instantiate multiple instances "+ "of the point of sale at the same time."; pos = new Pos(this.session); + + pos.bind('change:pending_operations', this.changed_pending_operations, this); + this.changed_pending_operations(); + + this.$element.find("#loggedas button").click(function() { + self.try_close(); + }); this.$element.find('#steps').buttonset(); @@ -1185,6 +1189,17 @@ openerp.point_of_sale = function(db) { pos.app = new App(self.$element); }); }, + changed_pending_operations: function () { + var operations = pos.get('pending_operations'); + var number = operations.length; + + }, + try_close: function() { + this.close(); + }, + close: function() { + this.stop(); + }, stop: function() { $('.oe_footer').show(); $('.oe_toggle_secondary_menu').show(); From 0941028b447165accf5c59a1a0bf3e4d305af138 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 13 Dec 2011 14:45:34 +0100 Subject: [PATCH 08/23] [imp] added notifications when there is pending operations bzr revid: nicolas.vanhoren@openerp.com-20111213134534-xiyd0h096pei1k70 --- addons/point_of_sale/static/src/css/pos.css | 9 ++++++++ addons/point_of_sale/static/src/js/pos.js | 23 ++++++++++++++++++++- addons/point_of_sale/static/src/xml/pos.xml | 8 +++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 24eb704b7dc..2ff5fbf9dd3 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -478,3 +478,12 @@ .point-of-sale .pos-receipt-container { font-size: 0.75em; } + +.point-of-sale .oe_pos_synch-notification-button { + color: white; + border: 1px solid black; + border-radius: 3px; + padding: 2px 3px 2px 3px; + background-color: #D92A2A; +} + diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 79cba643647..423399b9c07 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1161,6 +1161,23 @@ openerp.point_of_sale = function(db) { }; return App; })(); + + db.point_of_sale.SynchNotification = db.web.Widget.extend({ + template: "pos-synch-notification", + init: function() { + this._super.apply(this, arguments); + this.nbr_pending = 0; + }, + render_element: function() { + this._super.apply(this, arguments); + $('.oe_pos_synch-notification-button', this.$element).click(this.on_synch); + }, + on_change_nbr_pending: function(nbr_pending) { + this.nbr_pending = nbr_pending; + this.render_element(); + }, + on_synch: function() {} + }); db.web.client_actions.add('pos.ui', 'db.point_of_sale.PointOfSale'); db.point_of_sale.PointOfSale = db.web.Widget.extend({ @@ -1173,6 +1190,10 @@ openerp.point_of_sale = function(db) { "of the point of sale at the same time."; pos = new Pos(this.session); + this.synch_notification = new db.point_of_sale.SynchNotification(this); + this.synch_notification.replace($('.oe_pos_synch-notification', this.$element)); + this.synch_notification.on_synch.add(_.bind(pos.flush, pos)); + pos.bind('change:pending_operations', this.changed_pending_operations, this); this.changed_pending_operations(); @@ -1192,7 +1213,7 @@ openerp.point_of_sale = function(db) { changed_pending_operations: function () { var operations = pos.get('pending_operations'); var number = operations.length; - + this.synch_notification.on_change_nbr_pending(number); }, try_close: function() { this.close(); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index d8647aaccc9..61a5af2a17b 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -25,6 +25,7 @@
+
@@ -122,6 +123,13 @@ + + + + pending orders + + +
    From b5d844d2e68b5707e8eda930cc4c8f1f3a9a1ba7 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 13 Dec 2011 15:07:32 +0100 Subject: [PATCH 09/23] [imp] added warning when we try to exit the pos with pending changes bzr revid: nicolas.vanhoren@openerp.com-20111213140732-kfu92k7wb6rcp9ie --- addons/point_of_sale/static/src/css/pos.css | 4 +++ addons/point_of_sale/static/src/js/pos.js | 33 ++++++++++++++++++--- addons/point_of_sale/static/src/xml/pos.xml | 3 ++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 2ff5fbf9dd3..d93f29f740f 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -487,3 +487,7 @@ background-color: #D92A2A; } +.point-of-sale .oe_pos-close-warning { + height: 500px; +} + diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 423399b9c07..21ff6de3ec2 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -25,6 +25,7 @@ openerp.point_of_sale = function(db) { return QWeb.render(template, ctx); }; }; + var _t = db.web._t; /* Local store access. Read once from localStorage upon construction and persist on every change. @@ -1211,12 +1212,36 @@ openerp.point_of_sale = function(db) { }); }, changed_pending_operations: function () { - var operations = pos.get('pending_operations'); - var number = operations.length; - this.synch_notification.on_change_nbr_pending(number); + this.synch_notification.on_change_nbr_pending(pos.get('pending_operations').length); }, try_close: function() { - this.close(); + pos.flush().then(_.bind(function() { + var close = _.bind(this.close, this); + if (pos.get('pending_operations').length > 0) { + var confirm = false; + $(QWeb.render('pos-close-warning')).dialog({ + resizable: false, + height:160, + modal: true, + title: "Warning", + buttons: { + "Yes": function() { + confirm = true; + $( this ).dialog( "close" ); + }, + "No": function() { + $( this ).dialog( "close" ); + } + }, + close: function() { + if (confirm) + close(); + } + }); + } else { + close(); + } + }, this)); }, close: function() { this.stop(); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 61a5af2a17b..8b82bafd648 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -130,6 +130,9 @@ + +
    There are pending operations that could not be saved into the database, are you sure you want to exit?
    +
      From 3485feae6cec6f28785d988fc70fc698cf3bf797 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 13 Dec 2011 15:14:17 +0100 Subject: [PATCH 10/23] [fix] problem with order widget bzr revid: nicolas.vanhoren@openerp.com-20111213141417-muyn1yjodvjvu7eb --- addons/point_of_sale/static/src/css/pos.css | 4 ---- addons/point_of_sale/static/src/js/pos.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index d93f29f740f..2ff5fbf9dd3 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -487,7 +487,3 @@ background-color: #D92A2A; } -.point-of-sale .oe_pos-close-warning { - height: 500px; -} - diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 21ff6de3ec2..098cea69700 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -658,7 +658,7 @@ openerp.point_of_sale = function(db) { Shopping carts. */ var OrderlineWidget = db.web.Widget.extend({ - tagName: 'tr', + tag_name: 'tr', template_fct: qweb_template('pos-orderline-template'), init: function(parent, options) { this._super(parent); From ed2b1ce175827be535bd8a5614a50929f0663eab Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 13 Dec 2011 15:31:35 +0100 Subject: [PATCH 11/23] [fix] problem with order lines, was changing selection bzr revid: nicolas.vanhoren@openerp.com-20111213143135-1ue0wg2puwduchps --- addons/point_of_sale/static/src/js/pos.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 098cea69700..6b01dfc0c9a 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -703,13 +703,12 @@ openerp.point_of_sale = function(db) { changeSelectedOrder: function() { this.currentOrderLines.unbind(); this.bindOrderLineEvents(); - return this.render_element(); + this.render_element(); }, bindOrderLineEvents: function() { this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines'); this.currentOrderLines.bind('add', this.addLine, this); - this.currentOrderLines.bind('change', this.render_element, this); - return this.currentOrderLines.bind('remove', this.render, this); + this.currentOrderLines.bind('remove', this.render_element, this); }, addLine: function(newLine) { var line = new OrderlineWidget(null, { @@ -718,7 +717,7 @@ openerp.point_of_sale = function(db) { numpadState: this.numpadState }); line.appendTo(this.$element); - return this.updateSummary(); + this.updateSummary(); }, render_element: function() { this.$element.empty(); @@ -730,7 +729,7 @@ openerp.point_of_sale = function(db) { }); line.appendTo(this.$element); }, this)); - return this.updateSummary(); + this.updateSummary(); }, updateSummary: function() { var currentOrder, tax, total, totalTaxExcluded; @@ -740,7 +739,7 @@ openerp.point_of_sale = function(db) { tax = currentOrder.getTax(); $('#subtotal').html(totalTaxExcluded.toFixed(2)).hide().fadeIn(); $('#tax').html(tax.toFixed(2)).hide().fadeIn(); - return $('#total').html(total.toFixed(2)).hide().fadeIn(); + $('#total').html(total.toFixed(2)).hide().fadeIn(); }, }); /* From c4b7697fde88925a7a05e78d64fc6c565def10af Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 13 Dec 2011 15:58:18 +0100 Subject: [PATCH 12/23] [imp] added possibility to remove an order line bzr revid: nicolas.vanhoren@openerp.com-20111213145818-0yw0g4xi7aioe39y --- addons/point_of_sale/static/src/js/pos.js | 53 +++++++++++------------ 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 6b01dfc0c9a..f2301feb028 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -251,26 +251,28 @@ openerp.point_of_sale = function(db) { To add more of the same product, just update the quantity accordingly. The Order also contains payment information. */ - var Orderline = (function() { - __extends(Orderline, Backbone.Model); - function Orderline() { - Orderline.__super__.constructor.apply(this, arguments); - } - - Orderline.prototype.defaults = { + var Orderline = Backbone.Model.extend({ + defaults: { quantity: 1, list_price: 0, discount: 0 - }; - Orderline.prototype.incrementQuantity = function() { + }, + initialize: function(attributes) { + Backbone.Model.prototype.initialize.apply(this, arguments); + this.bind('change:quantity', function(unused, qty) { + if (qty == 0) + this.trigger('killme'); + }, this); + }, + incrementQuantity: function() { return this.set({ quantity: (this.get('quantity')) + 1 }); - }; - Orderline.prototype.getTotal = function() { + }, + getTotal: function() { return (this.get('quantity')) * (this.get('list_price')) * (1 - (this.get('discount')) / 100); - }; - Orderline.prototype.exportAsJSON = function() { + }, + exportAsJSON: function() { var result; result = { qty: this.get('quantity'), @@ -279,18 +281,11 @@ openerp.point_of_sale = function(db) { product_id: this.get('id') }; return result; - }; - return Orderline; - })(); - var OrderlineCollection = (function() { - __extends(OrderlineCollection, Backbone.Collection); - function OrderlineCollection() { - OrderlineCollection.__super__.constructor.apply(this, arguments); - } - - OrderlineCollection.prototype.model = Orderline; - return OrderlineCollection; - })(); + }, + }); + var OrderlineCollection = Backbone.Collection.extend({ + model: Orderline, + }); /* Every PaymentLine has all the attributes of the corresponding CashRegister. */ @@ -365,9 +360,13 @@ openerp.point_of_sale = function(db) { var existing; existing = (this.get('orderLines')).get(product.id); if (existing != null) { - return existing.incrementQuantity(); + existing.incrementQuantity(); } else { - return (this.get('orderLines')).add(new Orderline(product.toJSON())); + var line = new Orderline(product.toJSON()); + this.get('orderLines').add(line); + line.bind('killme', function() { + this.get('orderLines').remove(line); + }, this); } }; Order.prototype.addPaymentLine = function(cashRegister) { From 26839f8fca378bc697b3c11d852124df5b7be02d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 13 Dec 2011 17:36:31 +0100 Subject: [PATCH 13/23] [imp] added css print bzr revid: nicolas.vanhoren@openerp.com-20111213163631-0c3zo6ape917woao --- addons/point_of_sale/static/src/css/pos.css | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 2ff5fbf9dd3..afb6d19898f 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -487,3 +487,25 @@ background-color: #D92A2A; } +@media print { + #oe_header, #oe_menu, .point-of-sale #topheader, .point-of-sale #leftpane { + display: none; + } + .point-of-sale #content { + top: 0px; + } + .point-of-sale #rigthpane { + left: 0px; + background-color: white; + } + #receipt-screen header, #pos-finish-order { + display: none; + } + #receipt-screen { + text-align: left; + } + .pos-sale-ticket { + margin: 0; + } +} + From e7b4fd0a9d81058a6af8e5acef8dac838c5c908f Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 13 Dec 2011 18:02:48 +0100 Subject: [PATCH 14/23] [fix] problem with pending operations not always notified bzr revid: nicolas.vanhoren@openerp.com-20111213170248-04rbu93vz4yiml96 --- addons/point_of_sale/static/src/js/pos.js | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index f2301feb028..82383b1a8d8 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -61,26 +61,16 @@ openerp.point_of_sale = function(db) { this.flush_mutex = new $.Mutex(); this.build_tree = _.bind(this.build_tree, this); this.session = session; + this.set({'pending_operations': this.store.get('pending_operations', [])}); + this.bind('change:pending_operations', _.bind(function(unused, val) { + this.store.set('pending_operations', val); + }, this)); $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']), this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]), this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name']), this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type'])) .then(this.build_tree); }, - get: function(attribute) { - if (attribute === 'pending_operations') { - return this.store.get('pending_operations', []); - } - return Backbone.Model.prototype.get.call(this, attribute); - }, - set: function(attributes, options) { - _.each(attributes, _.bind(function (value, attribute) { - if (attribute === 'pending_operations') { - this.store.set('pending_operations', value); - } - }, this)); - return Backbone.Model.prototype.set.call(this, attributes, options); - }, fetch: function(osvModel, fields, domain) { var dataSetSearch; var self = this; @@ -90,7 +80,7 @@ openerp.point_of_sale = function(db) { }); }, push: function(osvModel, record) { - var ops = this.get('pending_operations'); + var ops = _.clone(this.get('pending_operations')); ops.push({model: osvModel, record: record}); this.set({pending_operations: ops}); return this.flush(); From cb9c87c8ce5ede26090a3eb3645d390175ed76f3 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 14 Dec 2011 13:30:41 +0100 Subject: [PATCH 15/23] [imp] now calls home page on close bzr revid: nicolas.vanhoren@openerp.com-20111214123041-1shjqcvzs0lkd32j --- addons/point_of_sale/static/src/js/pos.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 82383b1a8d8..1798caae868 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1232,7 +1232,7 @@ openerp.point_of_sale = function(db) { }, this)); }, close: function() { - this.stop(); + this.do_action({type: 'ir.actions.client', tag: 'default_home'}); }, stop: function() { $('.oe_footer').show(); From 4a6fea38958ef1bf31e0ce90a7338559c26a06d5 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 14 Dec 2011 14:10:27 +0100 Subject: [PATCH 16/23] [fix] small css bug bzr revid: nicolas.vanhoren@openerp.com-20111214131027-8sqbng7rp84nez1h --- addons/point_of_sale/static/src/js/pos.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 1798caae868..bc473dd4745 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1191,12 +1191,11 @@ openerp.point_of_sale = function(db) { }); this.$element.find('#steps').buttonset(); - - $('.oe_toggle_secondary_menu').hide(); - $('.oe_footer').hide(); return pos.ready.then( function() { pos.app = new App(self.$element); + $('.oe_toggle_secondary_menu').hide(); + $('.oe_footer').hide(); }); }, changed_pending_operations: function () { From 9e74b94e5c786449011708a5389f83687e8b117c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 14 Dec 2011 15:54:26 +0100 Subject: [PATCH 17/23] =?UTF-8?q?[imp]=20soft=20coded=20the=20=E2=82=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: nicolas.vanhoren@openerp.com-20111214145426-brfbdzyaq15y7brv --- addons/point_of_sale/static/src/js/pos.js | 73 +++++++++++++++------ addons/point_of_sale/static/src/xml/pos.xml | 39 ++++++----- 2 files changed, 77 insertions(+), 35 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index bc473dd4745..2d9010830ec 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -22,7 +22,16 @@ openerp.point_of_sale = function(db) { QWeb.add_template("/point_of_sale/static/src/xml/pos.xml"); var qweb_template = function(template) { return function(ctx) { - return QWeb.render(template, ctx); + return QWeb.render(template, _.extend({}, ctx,{ + 'currency': pos.get('currency'), + 'format_amount': function(amount) { + if (pos.get('currency').position == 'after') { + return amount + ' ' + pos.get('currency').symbol; + } else { + return pos.get('currency').symbol + ' ' + amount; + } + }, + })); }; }; var _t = db.web._t; @@ -65,10 +74,15 @@ openerp.point_of_sale = function(db) { this.bind('change:pending_operations', _.bind(function(unused, val) { this.store.set('pending_operations', val); }, this)); + this.set({'currency': this.store.get('currency', {symbol: '$', position: 'after'})}); + this.bind('change:currency', _.bind(function(unused, val) { + this.store.set('currency', val); + }, this)); $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']), this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]), this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name']), - this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type'])) + this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']), + this.get_currency()) .then(this.build_tree); }, fetch: function(osvModel, fields, domain) { @@ -79,6 +93,20 @@ openerp.point_of_sale = function(db) { return self.store.set(osvModel, result); }); }, + get_currency: function() { + return new db.web.Model("sale.shop").get_func("search_read")([]).pipe(function(result) { + var company_id = result[0]['company_id'][0]; + return new db.web.Model("res.company").get_func("read")(company_id, ['currency_id']).pipe(function(result) { + var currency_id = result['currency_id'][0] + return new db.web.Model("res.currency").get_func("read")([currency_id], + ['symbol', 'position']).pipe(function(result) { + return result[0]; + }); + }); + }).then(_.bind(function(currency) { + this.set({'currency': currency}); + }, this)); + }, push: function(osvModel, record) { var ops = _.clone(this.get('pending_operations')); ops.push({model: osvModel, record: record}); @@ -1170,33 +1198,38 @@ openerp.point_of_sale = function(db) { db.web.client_actions.add('pos.ui', 'db.point_of_sale.PointOfSale'); db.point_of_sale.PointOfSale = db.web.Widget.extend({ - template: "PointOfSale", - start: function() { - var self = this; + init: function() { + this._super.apply(this, arguments); if (pos) throw "It is not possible to instantiate multiple instances "+ "of the point of sale at the same time."; pos = new Pos(this.session); - - this.synch_notification = new db.point_of_sale.SynchNotification(this); - this.synch_notification.replace($('.oe_pos_synch-notification', this.$element)); - this.synch_notification.on_synch.add(_.bind(pos.flush, pos)); - - pos.bind('change:pending_operations', this.changed_pending_operations, this); - this.changed_pending_operations(); - - this.$element.find("#loggedas button").click(function() { - self.try_close(); - }); + }, + start: function() { + var self = this; + return pos.ready.then(_.bind(function() { + this.render_element(); + this.synch_notification = new db.point_of_sale.SynchNotification(this); + this.synch_notification.replace($('.oe_pos_synch-notification', this.$element)); + this.synch_notification.on_synch.add(_.bind(pos.flush, pos)); + + pos.bind('change:pending_operations', this.changed_pending_operations, this); + this.changed_pending_operations(); + + this.$element.find("#loggedas button").click(function() { + self.try_close(); + }); + + this.$element.find('#steps').buttonset(); - this.$element.find('#steps').buttonset(); - - return pos.ready.then( function() { pos.app = new App(self.$element); $('.oe_toggle_secondary_menu').hide(); $('.oe_footer').hide(); - }); + }, this)); + }, + render: function() { + return qweb_template("PointOfSale")(); }, changed_pending_operations: function () { this.synch_notification.on_change_nbr_pending(pos.get('pending_operations').length); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 8b82bafd648..662217ff485 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -50,15 +50,15 @@
      • Subtotal: - 0 € + 0
      • Tax: - 0 € + 0
      • Total: - 0 € + 0
      @@ -103,11 +103,11 @@ - + - +
      Paid: €
      Change: €
      @@ -173,8 +173,7 @@
      - - € +
      @@ -187,8 +186,7 @@ - - € + @@ -197,8 +195,7 @@ - - € + @@ -217,7 +214,7 @@ - € + @@ -244,9 +241,21 @@

      - - - + + +
      Total: €
      Tax: €
      Change: €
      Total: + + + +
      Tax: + + + +
      Change: + + + +
      From f52f5537281640960d35230a095c0e10d1eb69b3 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 14 Dec 2011 16:36:56 +0100 Subject: [PATCH 18/23] [imp] added wizard when we close the pos bzr revid: nicolas.vanhoren@openerp.com-20111214153656-ogqo2ik5878lb118 --- addons/point_of_sale/static/src/js/pos.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 2d9010830ec..7add23bb73a 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1264,7 +1264,14 @@ openerp.point_of_sale = function(db) { }, this)); }, close: function() { - this.do_action({type: 'ir.actions.client', tag: 'default_home'}); + new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_close_statement']], ['res_id']).pipe( + _.bind(function(res) { + this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) { + var action = result.result; + this.do_action(action) + this.do_action({type: 'ir.actions.client', tag: 'default_home'}); + }, this)); + }, this)); }, stop: function() { $('.oe_footer').show(); From 91909f1927630024111e7316a2619e718b4f0ead Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 14 Dec 2011 18:03:56 +0100 Subject: [PATCH 19/23] [imp] now closes dialogs when using client actions bzr revid: nicolas.vanhoren@openerp.com-20111214170356-znxja2f0jekb63a9 --- addons/web/static/src/js/chrome.js | 2 +- addons/web/static/src/js/data.js | 2 +- addons/web/static/src/js/views.js | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 83f7f971434..0af03606713 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -663,7 +663,7 @@ openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# * self.$content.remove(); if (!self.session.uid) return; - var func = new openerp.web.Model(self.session, "res.users").get_func("read"); + var func = new openerp.web.Model("res.users").get_func("read"); return func(self.session.uid, ["name", "company_id"]).pipe(function(res) { self.$content = $(QWeb.render("Header-content", {widget: self, user: res})); self.$content.appendTo(self.$element); diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 26147b4d4e0..aec701e6e67 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -811,7 +811,7 @@ openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({ }); openerp.web.Model = openerp.web.CallbackEnabled.extend({ - init: function(_, model_name) { + init: function(model_name) { this._super(); this.model_name = model_name; }, diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index fcc8a4cc06c..116d7da3aef 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -152,6 +152,7 @@ session.web.ActionManager = session.web.Widget.extend({ }, ir_actions_client: function (action) { this.content_stop(); + this.dialog_stop(); var ClientWidget = session.web.client_actions.get_object(action.tag); (this.client_widget = new ClientWidget(this, action.params)).appendTo(this); From b16eb923f0a3b15bb76381dbf957aa1a8f0f61b4 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 14 Dec 2011 18:06:58 +0100 Subject: [PATCH 20/23] [imp] added wizard when there is no cash registers bzr revid: nicolas.vanhoren@openerp.com-20111214170658-y3eao3448ocy84rf --- addons/point_of_sale/static/src/js/pos.js | 19 ++++++++++++++----- .../wizard/pos_close_statement.py | 5 +++++ .../wizard/pos_close_statement.xml | 4 +++- .../wizard/pos_open_statement.py | 13 +++---------- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 7add23bb73a..0b76097d177 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -80,7 +80,7 @@ openerp.point_of_sale = function(db) { }, this)); $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']), this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]), - this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name']), + this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'], [['state', '=', 'open']]), this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']), this.get_currency()) .then(this.build_tree); @@ -1226,6 +1226,15 @@ openerp.point_of_sale = function(db) { pos.app = new App(self.$element); $('.oe_toggle_secondary_menu').hide(); $('.oe_footer').hide(); + + if (pos.store.get('account.bank.statement').length === 0) + return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_open_statement']], ['res_id']).pipe( + _.bind(function(res) { + return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) { + var action = result.result; + this.do_action(action); + }, this)); + }, this)); }, this)); }, render: function() { @@ -1264,12 +1273,12 @@ openerp.point_of_sale = function(db) { }, this)); }, close: function() { - new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_close_statement']], ['res_id']).pipe( + return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_close_statement']], ['res_id']).pipe( _.bind(function(res) { - this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) { + return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) { var action = result.result; - this.do_action(action) - this.do_action({type: 'ir.actions.client', tag: 'default_home'}); + action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'default_home'}}); + this.do_action(action); }, this)); }, this)); }, diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py index 92dee2f8e4c..08f51113d8d 100644 --- a/addons/point_of_sale/wizard/pos_close_statement.py +++ b/addons/point_of_sale/wizard/pos_close_statement.py @@ -25,6 +25,10 @@ from tools.translate import _ class pos_close_statement(osv.osv_memory): _name = 'pos.close.statement' _description = 'Close Statements' + + def cancel_wizard(self, cr, uid, ids, context=None): + if context.get('cancel_action'): + return context['cancel_action'] def close_statement(self, cr, uid, ids, context=None): """ @@ -35,6 +39,7 @@ class pos_close_statement(osv.osv_memory): @param context: A standard dictionary @return : Blank Dictionary """ + context = context or {} mod_obj = self.pool.get('ir.model.data') statement_obj = self.pool.get('account.bank.statement') journal_obj = self.pool.get('account.journal') diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml index 61c984c873e..9c11ad02e39 100644 --- a/addons/point_of_sale/wizard/pos_close_statement.xml +++ b/addons/point_of_sale/wizard/pos_close_statement.xml @@ -15,7 +15,9 @@