From 06e983d4df53295c970f4c97b824f8a8aee53a2b Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Wed, 16 Jul 2014 17:11:18 +0200 Subject: [PATCH 01/34] [IMP] point_of_sale: add an error sound to the error popups --- addons/point_of_sale/static/src/js/screens.js | 3 +++ .../point_of_sale/static/src/sounds/error.wav | Bin 0 -> 25190 bytes 2 files changed, 3 insertions(+) create mode 100644 addons/point_of_sale/static/src/sounds/error.wav diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 2f2f5e57312..48fa00e1d70 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -348,6 +348,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa var self = this; this._super(); + $('body').append(''); + if( text && (text.message || text.comment) ){ this.$('.message').text(text.message); this.$('.comment').text(text.comment); @@ -375,6 +377,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa show: function(barcode){ this._super(); this.$('.barcode').text(barcode); + }, }); diff --git a/addons/point_of_sale/static/src/sounds/error.wav b/addons/point_of_sale/static/src/sounds/error.wav new file mode 100644 index 0000000000000000000000000000000000000000..472f39107190844ac725defe4aa9fd6fefa4d9dc GIT binary patch literal 25190 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 F{|B~-GC%+T literal 0 HcmV?d00001 From 0040a9f2df6637705d7e4a77b356e5f21874ac2d Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 17 Jul 2014 15:03:31 +0200 Subject: [PATCH 02/34] [IMP] point_of_sale: initial commit for the fullscreen mode. The fullscreen option will detect if the pos is displayed in fullscreen and if not will tell the user how to set it up for fullscreen, or propose to go fullscreen with the HTML5 Built-in API. The HTML5 API requires a click from the user to allow fullscreen, so the popup will pop everytime unless the user has setup kiosk-mode or native application emulation which makes the app start in real fullscreen. --- addons/point_of_sale/point_of_sale.py | 1 + addons/point_of_sale/point_of_sale_view.xml | 1 + addons/point_of_sale/static/src/css/pos.css | 2 +- .../static/src/img/ios-share-icon.png | Bin 0 -> 522 bytes addons/point_of_sale/static/src/js/screens.js | 20 ++++++++ addons/point_of_sale/static/src/js/widgets.js | 8 ++++ addons/point_of_sale/static/src/xml/pos.xml | 45 ++++++++++++++++++ 7 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 addons/point_of_sale/static/src/img/ios-share-icon.png diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 5c8103c7626..b3ff62a7994 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -72,6 +72,7 @@ class pos_config(osv.osv): 'iface_scan_via_proxy' : fields.boolean('Scan via Proxy', help="Enable barcode scanning with a remotely connected barcode scanner"), 'iface_invoicing': fields.boolean('Invoicing',help='Enables invoice generation from the Point of Sale'), 'iface_big_scrollbars': fields.boolean('Large Scrollbars',help='For imprecise industrial touchscreens'), + 'iface_fullscreen': fields.boolean('Fullscreen', help='Display the Point of Sale in full screen mode'), 'receipt_header': fields.text('Receipt Header',help="A short text that will be inserted as a header in the printed receipt"), 'receipt_footer': fields.text('Receipt Footer',help="A short text that will be inserted as a footer in the printed receipt"), 'proxy_ip': fields.char('IP Address', help='The hostname or ip address of the hardware proxy, Will be autodetected if left empty', size=45), diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 07ec934318e..91707e648ab 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -658,6 +658,7 @@ + diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 30939636b23..b9c9605ed92 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -1663,7 +1663,7 @@ td { .pos .popup .comment{ font-weight: normal; font-size: 18px; - margin: 0px 16px; + margin: 0px 16px 16px 16px; } .pos .popup .footer{ position:absolute; diff --git a/addons/point_of_sale/static/src/img/ios-share-icon.png b/addons/point_of_sale/static/src/img/ios-share-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8588657e12373ac3fc6737dadf53deb15f2ff44c GIT binary patch literal 522 zcmV+l0`>igP)iX5@`nTBoq0IZR)cb+F{AREH_4fI$())b6{7$0%F_ZpEp#3C_ z{ttrxe7XD#fd2!0|00b30($>Uq5Ttt{|SEoCXW6YhyEOh{yv)iJemF;iv9e^!b3h z{N(TY!rc12+WL^h`{3;QyxRLVmi}C-{g1@_h`{^5-1_70`RMTZ&g1%Nu>F(9`)IKI zpUnHv<@%Y(`=ieL$>I9r?)uN<`XY<|27Ui@wfq;P<6Zy&010qNS#tmY4#NNd4#NS* zZ>VGd000McNliru-Uks3DGn5YaGd}E0C!15K~y-)V_={*U}wQE&nqg3R|T)EqC7qo zyy`~$CI+}wcqn=@@Y}gs+wK%#=V?!EcFfg}&X0R^Y)zKmi;KPX&5*XaG%tlRgFrW}p`U0G$INf0q5oqyPW_ M07*qoM6N<$g1Pr4*Z=?k literal 0 HcmV?d00001 diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 48fa00e1d70..b326a6326be 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -314,6 +314,26 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); + module.FullscreenPopup = module.PopUpWidget.extend({ + template:'FullscreenPopupWidget', + show: function(){ + var self = this; + this._super(); + this.renderElement(); + this.$('.button.fullscreen').off('click').click(function(){ + window.document.body.webkitRequestFullscreen(); + self.pos_widget.screen_selector.close_popup(); + }); + this.$('.button.cancel').off('click').click(function(){ + self.pos_widget.screen_selector.close_popup(); + }); + }, + ismobile: function(){ + return typeof window.orientation !== 'undefined'; + } + }); + + module.ChooseReceiptPopupWidget = module.PopUpWidget.extend({ template:'ChooseReceiptPopupWidget', show: function(){ diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 5db12165737..72a6f7f1d49 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -1001,6 +1001,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa self.screen_selector.show_popup('error', 'Sorry, we could not create a user session'); }else if(!self.pos.config){ self.screen_selector.show_popup('error', 'Sorry, we could not find any PoS Configuration for this session'); + }else if(self.pos.config.iface_fullscreen && document.body.webkitRequestFullscreen && ( + window.screen.availWidth > window.innerWidth || + window.screen.availHeight > window.innerHeight )){ + self.screen_selector.show_popup('fullscreen'); } self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').addClass('oe_hidden');}); @@ -1085,6 +1089,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.confirm_popup = new module.ConfirmPopupWidget(this,{}); this.confirm_popup.appendTo(this.$el); + this.fullscreen_popup = new module.FullscreenPopup(this,{}); + this.fullscreen_popup.appendTo(this.$el); + // -------- Misc --------- this.close_button = new module.HeaderButtonWidget(this,{ @@ -1140,6 +1147,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa 'error-no-client': this.error_no_client_popup, 'error-invoice-transfer': this.error_invoice_transfer_popup, 'confirm': this.confirm_popup, + 'fullscreen': this.fullscreen_popup, }, default_screen: 'products', default_mode: 'cashier', diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 929212cce8d..6f6be86b6d4 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -586,6 +586,51 @@ + +
+
+

Fullscreen Setup

+ + +

+ The best way to make the point of sale fullscreen on mobile + devices is to add the point of sale to your home screen. On + iPhone and iPad this is done by tapping + and then Add to Homescreen +

+

+ This also works on Android with the Chrome Beta Browser, using the Add to Homescreen option + in the browser's menu. +

+

+ If you want to work in fullscreen just this time tap the Go Fullscreen button. +

+ + + +

+ The best way to make the point of sale fullscreen on desktop + and laptops is to launch your browser in kiosk mode. Please + refer to your browser's documentation for the specific + instructions. +

+

+ If you want to work in fullscreen just this time, click the Go Fullscreen button. +

+ + +
+
+ Go Fullscreen +
+
+ Cancel +
+
+
+
+ +
From d2f6b5c57d1df76633ed5357dd265e7c30f26909 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 17 Jul 2014 17:20:56 +0200 Subject: [PATCH 03/34] [IMP] point_of_sale: a little explaination of how the barcode pattern system works --- addons/point_of_sale/point_of_sale_view.xml | 34 ++++++++++++++++----- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 91707e648ab..6c577a59f4e 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -673,13 +673,33 @@ - - - - - - - + +

+ Barcode Patterns allow to match barcodes to actions or to embed information such as price and quantity in the barcode. + Barcode Patterns only work with EAN13 barcodes. +

+

+ Each type of barcode accepts a list of patterns seprated by commas. A scanned + barcode will be attributed to a type if it matches one of its patterns. + The patterns take the form of EAN13 barcodes. Numbers in the pattern must match + the number in the scanned barcode. A 'x' or a '*' in a pattern will match + any one number. If the patterns are shorter than EAN13 barcodes, they are assumed + to be prefixes and match at the beginning. Weight, Price and Discount patterns also + tell how the weight, price or discount is encoded in the barcode. 'N' indicate the + positions where the integer part is en encoded, and 'D' where the decimals are encoded. + If multiple pattern match one barcode, the longest pattern with the less 'x' or '*' is + considered the matching one. If a barcode matches no pattern it will not be found in + the POS. +

+ + + + + + + + + From 8d2fdafebc6676699de2d48ca2bcc66bdcf3a1af Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 17 Jul 2014 17:51:27 +0200 Subject: [PATCH 04/34] [IMP] point_of_sale: improved rendering speed of the partner list --- addons/point_of_sale/static/src/js/screens.js | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index b326a6326be..dcbe933ae64 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -580,6 +580,11 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa module.ClientListScreenWidget = module.ScreenWidget.extend({ template: 'ClientListScreenWidget', + init: function(parent, options){ + this._super(parent, options); + this.partner_cache = new module.DomCache(); + }, + show_leftpane: false, auto_back: true, @@ -610,7 +615,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa } this.$('.client-list-contents').delegate('.client-line','click',function(event){ - console.log('uh'); self.line_select(event,$(this),parseInt($(this).data('id'))); }); @@ -651,14 +655,24 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.$('.searchbox input').focus(); }, render_list: function(partners){ - var contents = this.$('.client-list-contents'); - contents.empty(); + var contents = this.$el[0].querySelector('.client-list-contents'); + contents.innerHtml = ""; for(var i = 0, len = partners.length; i < len; i++){ - var clientline = $(QWeb.render('ClientLine',{partner:partners[i]})); - if( partners[i] === this.new_client ){ - clientline.addClass('highlight'); + var partner = partners[i]; + var clientline = this.partner_cache.get_node(partner.id); + if(!clientline){ + var clientline_html = QWeb.render('ClientLine',{partner:partners[i]}); + var clientline = document.createElement('tbody'); + clientline.innerHTML = clientline_html; + clientline = clientline.childNodes[1]; + this.partner_cache.cache_node(partner.id,clientline); } - contents.append(clientline); + if( partners === this.new_client ){ + clientline.classList.add('highlight'); + }else{ + clientline.classList.remove('highlight'); + } + contents.appendChild(clientline); } }, save_changes: function(){ From 8014e984f156eef09f4baeaf90b0b23e11d86209 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Fri, 18 Jul 2014 13:28:22 +0200 Subject: [PATCH 05/34] [FIX] point_of_sale: order invoicing was broken --- addons/point_of_sale/static/src/js/models.js | 75 ++++++------------- addons/point_of_sale/static/src/js/widgets.js | 4 +- 2 files changed, 26 insertions(+), 53 deletions(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 92276db60de..17278ed1bd9 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -324,20 +324,21 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal // it returns a deferred that succeeds after having tried to send the order and all the other pending orders. push_order: function(order) { var self = this; - this.proxy.log('push_order',order.export_as_JSON()); - var order_id = this.db.add_order(order.export_as_JSON()); + + if(order){ + this.proxy.log('push_order',order.export_as_JSON()); + this.db.add_order(order.export_as_JSON()); + } + var pushed = new $.Deferred(); - this.set('synch',{state:'connecting', pending:self.db.get_orders().length}); - this.flush_mutex.exec(function(){ - var flushed = self._flush_all_orders(); + var flushed = self._flush_orders(self.db.get_orders()); - flushed.always(function(){ + flushed.always(function(ids){ + console.log('pushed orders:',ids); pushed.resolve(); }); - - return flushed; }); return pushed; }, @@ -361,8 +362,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal var order_id = this.db.add_order(order.export_as_JSON()); - this.set('synch',{state:'connecting', pending:self.db.get_orders().length}); - this.flush_mutex.exec(function(){ var done = new $.Deferred(); // holds the mutex @@ -373,7 +372,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal // things will happen as a duplicate will be sent next time // so we must make sure the server detects and ignores duplicated orders - var transfer = self._flush_order(order_id, {timeout:30000, to_invoice:true}); + var transfer = self._flush_orders([self.db.get_order(order_id)], {timeout:30000, to_invoice:true}); transfer.fail(function(){ invoiced.reject('error-transfer'); @@ -382,10 +381,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal // on success, get the order id generated by the server transfer.pipe(function(order_server_id){ + // generate the pdf and download it self.pos_widget.do_action('point_of_sale.pos_invoice_report',{additional_context:{ active_ids:order_server_id, }}); + invoiced.resolve(); done.resolve(); }); @@ -397,62 +398,33 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal return invoiced; }, - // attemps to send all pending orders ( stored in the pos_db ) to the server, - // and remove the successfully sent ones from the db once - // it has been confirmed that they have been sent correctly. - flush: function() { + // wrapper around the _save_to_server that updates the synch status widget + _flush_orders: function(orders, options) { var self = this; - var flushed = new $.Deferred(); - this.flush_mutex.exec(function(){ - var done = new $.Deferred(); + this.set('synch',{ state: 'connecting', pending: orders.length}); - self._flush_all_orders() - .done( function(){ flushed.resolve();}) - .fail( function(){ flushed.reject(); }) - .always(function(){ done.resolve(); }); - - return done; - }); - - return flushed; - }, - - // attempts to send the locally stored order of id 'order_id' - // the sending is asynchronous and can take some time to decide if it is successful or not - // it is therefore important to only call this method from inside a mutex - // this method returns a deferred indicating wether the sending was successful or not - // there is a timeout parameter which is set to 2 seconds by default. - _flush_order: function( order_id, options) { - return this._flush_all_orders([this.db.get_order(order_id)], options); - }, - - // attempts to send all the locally stored orders. As with _flush_order, it should only be - // called from within a mutex. - // this method returns a deferred that always succeeds when all orders have been tried to be sent, - // even if none of them could actually be sent. - _flush_all_orders: function () { - var self = this; - self.set('synch', { - state: 'connecting', - pending: self.get('synch').pending - }); - return self._save_to_server(self.db.get_orders()).done(function () { + return self._save_to_server(orders, options).done(function (server_ids) { var pending = self.db.get_orders().length; + self.set('synch', { state: pending ? 'connecting' : 'connected', pending: pending }); + + return server_ids; }); }, // send an array of orders to the server // available options: // - timeout: timeout for the rpc call in ms + // returns a deferred that resolves with the list of + // server generated ids for the sent orders _save_to_server: function (orders, options) { if (!orders || !orders.length) { var result = $.Deferred(); - result.resolve(); + result.resolve([]); return result; } @@ -474,10 +446,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal shadow: !options.to_invoice, timeout: timeout } - ).then(function () { + ).then(function (server_ids) { _.each(orders, function (order) { self.db.remove_order(order.id); }); + return server_ids; }).fail(function (unused, event){ // prevent an error popup creation by the rpc failure // we want the failure to be silent as we send the orders in the background diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 72a6f7f1d49..eaa506d91c6 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -840,7 +840,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa self.set_status(synch.state, synch.pending); }); this.$el.click(function(){ - self.pos.flush(); + self.pos.push_order(); }); }, }); @@ -1009,7 +1009,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').addClass('oe_hidden');}); - self.pos.flush(); + self.pos.push_order(); }).fail(function(){ // error when loading models data from the backend return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id']) From eb1444b54d04292c682a70e117e9a58f38db41b2 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Fri, 18 Jul 2014 14:30:13 +0200 Subject: [PATCH 06/34] [FIX] point_of_sale: it was impossible to delete a pos session --- addons/point_of_sale/point_of_sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index b3ff62a7994..5accc6d4a1f 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -395,7 +395,7 @@ class pos_session(osv.osv): for obj in self.browse(cr, uid, ids, context=context): for statement in obj.statement_ids: statement.unlink(context=context) - return True + return super(pos_session, self).unlink(cr, uid, ids, context=context) def open_cb(self, cr, uid, ids, context=None): From 4def7a4c7d3bb201296f989474186fefd2af97c7 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Fri, 18 Jul 2014 17:16:30 +0200 Subject: [PATCH 07/34] [FIX] point_of_sale: it was impossible to delete a pos session --- addons/point_of_sale/point_of_sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 5accc6d4a1f..71db4e487d0 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -493,7 +493,7 @@ class pos_session(osv.osv): pos_order_obj._create_account_move_line(cr, uid, order_ids, session, move_id, context=local_context) for order in session.order_ids: - if order.state not in ('paid', 'invoiced'): + if order.state not in ('paid', 'invoiced', 'done'): raise osv.except_osv( _('Error!'), _("You cannot confirm all orders of this session, because they have not the 'paid' status")) From 92bf582567d18e2b1b0a9cf9205b87976e02323d Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 22 Jul 2014 14:33:32 +0200 Subject: [PATCH 08/34] [IMP] point_of_sale: show traceback popup when there is a server error when posting orders (which should NEVER happen !) --- addons/point_of_sale/point_of_sale.py | 1 + addons/point_of_sale/static/src/css/pos.css | 7 +++++++ addons/point_of_sale/static/src/js/models.js | 8 +++++++- addons/point_of_sale/static/src/js/screens.js | 3 +++ addons/point_of_sale/static/src/js/widgets.js | 4 ++++ addons/point_of_sale/static/src/xml/pos.xml | 14 ++++++++++++++ 6 files changed, 36 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 71db4e487d0..35ec6de981b 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -552,6 +552,7 @@ class pos_order(osv.osv): orders_to_save = [o for o in orders if o['data']['name'] not in existing_references] order_ids = [] + for tmp_order in orders_to_save: to_invoice = tmp_order['to_invoice'] order = tmp_order['data'] diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index b9c9605ed92..4db8439ab73 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -1665,6 +1665,13 @@ td { font-size: 18px; margin: 0px 16px 16px 16px; } +.pos .popup .comment.traceback { + height: 264px; + overflow: auto; + font-size: 14px; + text-align: left; + font-family: 'Inconsolata'; +} .pos .popup .footer{ position:absolute; bottom:0; diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 17278ed1bd9..222d5663621 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -451,7 +451,13 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal self.db.remove_order(order.id); }); return server_ids; - }).fail(function (unused, event){ + }).fail(function (error, event){ + if(error.code === 200 ){ // Business Logic Error, not a connection problem + self.pos_widget.screen_selector.show_popup('error-traceback',{ + message: error.data.message, + comment: error.data.debug + }); + } // prevent an error popup creation by the rpc failure // we want the failure to be silent as we send the orders in the background event.preventDefault(); diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index dcbe933ae64..0e1d9e06893 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -387,6 +387,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }, }); + module.ErrorTracebackPopupWidget = module.ErrorPopupWidget.extend({ + template:'ErrorTracebackPopupWidget', + }); module.ErrorSessionPopupWidget = module.ErrorPopupWidget.extend({ template:'ErrorSessionPopupWidget', diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index eaa506d91c6..8d55ad7224d 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -1086,6 +1086,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.error_invoice_transfer_popup = new module.ErrorInvoiceTransferPopupWidget(this, {}); this.error_invoice_transfer_popup.appendTo(this.$el); + this.error_traceback_popup = new module.ErrorTracebackPopupWidget(this,{}); + this.error_traceback_popup.appendTo(this.$el); + this.confirm_popup = new module.ConfirmPopupWidget(this,{}); this.confirm_popup.appendTo(this.$el); @@ -1146,6 +1149,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa 'choose-receipt': this.choose_receipt_popup, 'error-no-client': this.error_no_client_popup, 'error-invoice-transfer': this.error_invoice_transfer_popup, + 'error-traceback': this.error_traceback_popup, 'confirm': this.confirm_popup, 'fullscreen': this.fullscreen_popup, }, diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 6f6be86b6d4..423dc06748f 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -680,6 +680,20 @@
+ +
+
+

+

+
+
+ Ok +
+
+
+
+ +
From 55701e0552ef02a18779e605682724a8d2eb42cb Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 22 Jul 2014 15:27:34 +0200 Subject: [PATCH 09/34] [IMP] point_of_sale: add debug popup that displays unsent order data, for when localStorage is hard to inspect --- addons/point_of_sale/static/src/css/pos.css | 3 ++ addons/point_of_sale/static/src/js/screens.js | 12 ++++++++ addons/point_of_sale/static/src/js/widgets.js | 7 +++++ addons/point_of_sale/static/src/xml/pos.xml | 28 +++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 4db8439ab73..c3358e71665 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -1671,6 +1671,9 @@ td { font-size: 14px; text-align: left; font-family: 'Inconsolata'; + -webkit-user-select: text; + -moz-user-select: text; + user-select: text; } .pos .popup .footer{ position:absolute; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 0e1d9e06893..9e0f3aecab8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -438,6 +438,18 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa template: 'ErrorInvoiceTransferPopupWidget', }); + module.UnsentOrdersPopupWidget = module.PopUpWidget.extend({ + template: 'UnsentOrdersPopupWidget', + show: function(options){ + var self = this; + this._super(options); + this.renderElement(); + this.$('.button.confirm').click(function(){ + self.pos_widget.screen_selector.close_popup(); + }); + }, + }); + module.ScaleScreenWidget = module.ScreenWidget.extend({ template:'ScaleScreenWidget', diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 8d55ad7224d..40c2b6b2a8b 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -797,6 +797,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.$('.button.reference').click(function(){ self.pos.barcode_reader.scan(self.$('input.ean').val()); }); + this.$('.button.show_orders').click(function(){ + self.pos.pos_widget.screen_selector.show_popup('unsent-orders'); + }); _.each(this.eans, function(ean, name){ self.$('.button.'+name).click(function(){ self.$('input.ean').val(ean); @@ -1095,6 +1098,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.fullscreen_popup = new module.FullscreenPopup(this,{}); this.fullscreen_popup.appendTo(this.$el); + this.unsent_orders_popup = new module.UnsentOrdersPopupWidget(this,{}); + this.unsent_orders_popup.appendTo(this.$el); + // -------- Misc --------- this.close_button = new module.HeaderButtonWidget(this,{ @@ -1152,6 +1158,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa 'error-traceback': this.error_traceback_popup, 'confirm': this.confirm_popup, 'fullscreen': this.fullscreen_popup, + 'unsent-orders': this.unsent_orders_popup, }, default_screen: 'products', default_mode: 'cashier', diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 423dc06748f..3f95a34f310 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -731,6 +731,29 @@
+ +
+
+

Unsent Orders

+ +

+ There are no unsent orders +

+ + +

+ +

+ +
+
+ Ok +
+
+
+
+ +
@@ -838,6 +861,11 @@
  • Reference
    • +

    Unsent Orders

    +
      +
    • Show All Unsent Orders
      • +
    +

    Hardware Status

    • Weighting
      • From cd96f67cf6acd65180e5fe1c1fedaa80b9abdde7 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 22 Jul 2014 15:58:08 +0200 Subject: [PATCH 10/34] [IMP] point_of_sale: add a debug option to delete all unsent orders --- addons/point_of_sale/static/src/js/db.js | 3 +++ addons/point_of_sale/static/src/js/widgets.js | 10 ++++++++++ addons/point_of_sale/static/src/xml/pos.xml | 1 + 3 files changed, 14 insertions(+) diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js index 38230fb0ca2..08d4f879968 100644 --- a/addons/point_of_sale/static/src/js/db.js +++ b/addons/point_of_sale/static/src/js/db.js @@ -345,6 +345,9 @@ function openerp_pos_db(instance, module){ }); this.save('orders',orders); }, + remove_all_orders: function(){ + this.save('orders',[]); + }, get_orders: function(){ return this.load('orders',[]); }, diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 40c2b6b2a8b..50120f9d9df 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -800,6 +800,16 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.$('.button.show_orders').click(function(){ self.pos.pos_widget.screen_selector.show_popup('unsent-orders'); }); + this.$('.button.delete_orders').click(function(){ + self.pos.pos_widget.screen_selector.show_popup('confirm',{ + message: _t('Delete Unsent Orders ?'), + comment: _t('This operation will permanently destroy all unsent orders from the local storage. You will lose all the data. This operation cannot be undone.'), + confirm: function(){ + self.pos.db.remove_all_orders(); + self.pos.set({synch: { state:'connected', pending: 0 }}); + }, + }); + }); _.each(this.eans, function(ean, name){ self.$('.button.'+name).click(function(){ self.$('input.ean').val(ean); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 3f95a34f310..d596862b676 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -864,6 +864,7 @@

      Unsent Orders

      • Show All Unsent Orders
        • +
      • Delete All Unsent Orders

      Hardware Status

      From fb325bee48068dc87128e4bb7dbd0d4eed96ea38 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Wed, 23 Jul 2014 15:58:08 +0200 Subject: [PATCH 11/34] [IMP] point_of_sale: add a basic UI unit test based on the new 'Tour' module --- addons/point_of_sale/static/src/js/tests.js | 176 ++++++++++---------- 1 file changed, 86 insertions(+), 90 deletions(-) diff --git a/addons/point_of_sale/static/src/js/tests.js b/addons/point_of_sale/static/src/js/tests.js index 018b343de58..08aa6e87213 100644 --- a/addons/point_of_sale/static/src/js/tests.js +++ b/addons/point_of_sale/static/src/js/tests.js @@ -1,93 +1,89 @@ -function openerp_pos_tests(instance, module){ //module is instance.point_of_sale +(function() { + 'use strict'; - // Various UI Tests to measure performance and memory leaks. - module.UiTester = function(){ - var running = false; - var queue = new module.JobQueue(); + openerp.Tour.register({ + id: 'pos_basic_order', + name: 'Complete a basic order trough the Front-End', + path: '/web#model=pos.session.opening&action=point_of_sale.action_pos_session_opening', + mode: 'test', + steps: [ + { + title: 'Wait fot the bloody screen to be ready', + wait: 200, + }, + { + title: 'Load the Session', + waitNot: '.oe_loading:visible', + element: 'span:contains("Resume Session"),span:contains("Start Session")', + }, + { + title: 'Loading the Loading Screen', + waitFor: '.loader' + }, + { + title: 'Waiting for the end of loading...', + waitFor: '.loader:hidden', + }, + { + title: 'Loading The Point of Sale', + waitFor: '.pos', + }, + { + title: 'On va manger des CHIPS!', + element: '.product-list .product-name:contains("250g Lays Pickels")', + }, + { + title: 'The chips have been added to the Order', + waitFor: '.order .product-name:contains("250g Lays Pickels")', + }, + { + title: 'The order total has been updated to the correct value', + wait: 2000, + waitFor: '.order .total .value:contains("1.48 €")', + }, + { + title: "Let's buy more chips", + element: '.product-list .product-name:contains("250g Lays Pickels")', + }, + { + title: "Let's veryify we pay the correct price for two bags of chips", + waitFor: '.order .total .value:contains("2.96 €")', + }, + { + title: "Let's pay with a debit card", + element: ".paypad-button:contains('Bank')", + }, + { + title: "Let's accept the payment", + onload: function(){ + // The test cannot validate or cancel the print() ... so we replace it by a noop !. + window._print = window.print; + window.print = function(){ console.log('Print!') }; + }, + element: ".button .iconlabel:contains('Validate'):visible", + }, + { + title: "Let's finish the order", + element: ".button:not(.disabled) .iconlabel:contains('Next'):visible", + }, + { + onload: function(){ + window.print = window._print; + window._print = undefined; + }, + title: "Let's wait for the order posting", + waitFor: ".oe_status.js_synch .js_connected:visible", + }, + { + title: "Let's close the Point of Sale", + element: ".header-button:contains('Close')", + }, + { + title: "Wait for the backend to ready itself", + element: 'span:contains("Resume Session"),span:contains("Start Session")', + }, + ], + }); - // stop the currently running test - this.stop = function(){ - queue.clear(); - }; +})(); - // randomly switch product categories - this.category_switch = function(interval){ - queue.schedule(function(){ - var breadcrumbs = $('.breadcrumb-button'); - var categories = $('.category-button'); - if(categories.length > 0){ - var rnd = Math.floor(Math.random()*categories.length); - categories.eq(rnd).click(); - }else{ - var rnd = Math.floor(Math.random()*breadcrumbs.length); - breadcrumbs.eq(rnd).click(); - } - },{repeat:true, duration:interval}); - }; - - // randomly order products then resets the order - this.order_products = function(interval){ - - queue.schedule(function(){ - var def = new $.Deferred(); - var order_queue = new module.JobQueue(); - var order_size = 1 + Math.floor(Math.random()*10); - - while(order_size--){ - order_queue.schedule(function(){ - var products = $('.product'); - if(products.length > 0){ - var rnd = Math.floor(Math.random()*products.length); - products.eq(rnd).click(); - } - },{duration:20}); - } - order_queue.finished().then(function(){ - $('.deleteorder-button').click(); - def.resolve(); - }); - return def; - },{repeat:true, duration: interval}); - - }; - - // makes a complete product order cycle ( print via proxy must be activated, and scale deactivated ) - this.full_order_cycle = function(interval){ - queue.schedule(function(){ - var def = new $.Deferred(); - var order_queue = new module.JobQueue(); - var order_size = 1 + Math.floor(Math.random()*50); - - while(order_size--){ - order_queue.schedule(function(){ - var products = $('.product'); - if(products.length > 0){ - var rnd = Math.floor(Math.random()*products.length); - products.eq(rnd).click(); - } - },{duration:50}); - } - order_queue.schedule(function(){ - $('.paypad-button:first').click(); - },{duration:250}); - order_queue.schedule(function(){ - $('.paymentline-input:first').val(10000); - $('.paymentline-input:first').keydown(); - $('.paymentline-input:first').keyup(); - },{duration:250}); - order_queue.schedule(function(){ - $('.pos-actionbar-button-list .button:eq(2)').click(); - },{duration:250}); - order_queue.schedule(function(){ - def.resolve(); - }); - return def; - },{repeat: true, duration: interval}); - }; - }; - - if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){ - window.pos_test_ui = new module.UiTester(); - } - -} From a975034097b52fcf458493be3f52bced31b67b70 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Wed, 23 Jul 2014 15:59:54 +0200 Subject: [PATCH 12/34] [IMP] point_of_sale: forgot changes in this file in the previous commit that introduced unit tests --- addons/point_of_sale/static/src/js/main.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/main.js b/addons/point_of_sale/static/src/js/main.js index 90fa3567cda..373a5f66761 100644 --- a/addons/point_of_sale/static/src/js/main.js +++ b/addons/point_of_sale/static/src/js/main.js @@ -19,8 +19,6 @@ openerp.point_of_sale = function(instance) { openerp_pos_widgets(instance,module); // import pos_widgets.js - openerp_pos_tests(instance,module); // import pos_tests.js - instance.web.client_actions.add('pos.ui', 'instance.point_of_sale.PosWidget'); }; From 433ed2d6366ae81b0005570b3f6ed1e85eabea81 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Wed, 23 Jul 2014 16:23:38 +0200 Subject: [PATCH 13/34] [IMP] point_of_sale: tests work better when they are loaded and run by the unit test system! --- addons/point_of_sale/test/test_frontend.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 addons/point_of_sale/test/test_frontend.py diff --git a/addons/point_of_sale/test/test_frontend.py b/addons/point_of_sale/test/test_frontend.py new file mode 100644 index 00000000000..7e51c5ae643 --- /dev/null +++ b/addons/point_of_sale/test/test_frontend.py @@ -0,0 +1,9 @@ + +import openerp.tests + +@openerp.tests.common.at_install(False) +@openerp.tests.common.post_install(True) +class TestUi(openerp.tests.HttpCase): + def test_01_pos_basic_order(self): + self.phantom_js("/", "openerp.Tour.run('pos_basic_order', 'test')", "openerp.Tour.tours.pos_basic_order", login="admin") + From 62c7482a2dc1b608df3fbd728bd6742dc0488a6e Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 24 Jul 2014 14:09:46 +0200 Subject: [PATCH 14/34] [IMP] point_of_sale: made the server data loading more modular for easier development of point_of_sale extensions --- addons/point_of_sale/static/src/js/models.js | 380 +++++++++++-------- 1 file changed, 219 insertions(+), 161 deletions(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 222d5663621..e35c31a4ea6 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -114,180 +114,238 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal return done; }, - // helper function to load data from the server + // helper function to load data from the server. Obsolete use the models loader below. fetch: function(model, fields, domain, ctx){ this._load_progress = (this._load_progress || 0) + 0.05; this.pos_widget.loading_message(_t('Loading')+' '+model,this._load_progress); return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all() }, + // Server side model loaders. This is the list of the models that need to be loaded from + // the server. The models are loaded one by one by this list's order. The 'loaded' callback + // is used to store the data in the appropriate place once it has been loaded. This callback + // can return a deferred that will pause the loading of the next module. + // a shared temporary dictionary is available for loaders to communicate private variables + // used during loading such as object ids, etc. + models: [ + { + model: 'res.users', + fields: ['name','company_id'], + domain: function(self){ return [['id','=',self.session.uid]]; }, + loaded: function(self,users){ self.user = users[0]; }, + },{ + model: 'res.company', + fields: [ 'currency_id', 'email', 'website', 'company_registry', 'vat', 'name', 'phone', 'partner_id' ], + domain: function(self){ return [['id','=',self.user.company_id[0]]]; }, + loaded: function(self,companies){ self.company = companies[0]; }, + },{ + model: 'product.uom', + fields: [], + domain: null, + loaded: function(self,units){ + self.units = units; + var units_by_id = {}; + for(var i = 0, len = units.length; i < len; i++){ + units_by_id[units[i].id] = units[i]; + units[i].groupable = ( units[i].category_id[0] === 1 ); + units[i].is_unit = ( units[i].id === 1 ); + } + self.units_by_id = units_by_id; + } + },{ + model: 'res.users', + fields: ['name','ean13'], + domain: null, + loaded: function(self,users){ self.users = users; }, + },{ + model: 'res.partner', + fields: ['name','street','city','country_id','phone','zip','mobile','email','ean13'], + domain: null, + loaded: function(self,partners){ + self.partners = partners; + self.db.add_partners(partners); + }, + },{ + model: 'account.tax', + fields: ['name','amount', 'price_include', 'type'], + domain: null, + loaded: function(self,taxes){ self.taxes = taxes; }, + },{ + model: 'pos.session', + fields: ['id', 'journal_ids','name','user_id','config_id','start_at','stop_at','sequence_number'], + domain: function(self){ return [['state','=','opened'],['user_id','=',self.session.uid]]; }, + loaded: function(self,pos_sessions){ self.pos_session = pos_sessions[0]; }, + },{ + model: 'pos.config', + fields: [], + domain: function(self){ return [['id','=', self.pos_session.config_id[0]]]; }, + loaded: function(self,configs){ + self.config = configs[0]; + self.config.use_proxy = self.config.iface_payment_terminal || + self.config.iface_electronic_scale || + self.config.iface_print_via_proxy || + self.config.iface_scan_via_proxy || + self.config.iface_cashdrawer; + + self.barcode_reader.add_barcode_patterns({ + 'product': self.config.barcode_product, + 'cashier': self.config.barcode_cashier, + 'client': self.config.barcode_customer, + 'weight': self.config.barcode_weight, + 'discount': self.config.barcode_discount, + 'price': self.config.barcode_price, + }); + }, + },{ + model: 'stock.location', + fields: [], + domain: function(self){ return [['id','=', self.config.stock_location_id[0]]]; }, + loaded: function(self, locations){ self.shop = locations[0]; }, + },{ + model: 'product.pricelist', + fields: ['currency_id'], + domain: function(self){ return [['id','=',self.config.pricelist_id[0]]]; }, + loaded: function(self, pricelists){ self.pricelist = pricelists[0]; }, + },{ + model: 'res.currency', + fields: ['symbol','position','rounding','accuracy'], + domain: function(self){ return [['id','=',self.pricelist.currency_id[0]]]; }, + loaded: function(self, currencies){ + self.currency = currencies[0]; + }, + },{ + model: 'product.packaging', + fields: ['ean','product_tmpl_id'], + domain: null, + loaded: function(self, packagings){ + self.db.add_packagings(packagings); + }, + },{ + model: 'pos.category', + fields: ['id','name','parent_id','child_id','image'], + domain: null, + loaded: function(self, categories){ + self.db.add_categories(categories); + }, + },{ + model: 'product.product', + fields: ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code', 'variants', + 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description', + 'product_tmpl_id'], + domain: function(self){ return [['sale_ok','=',true],['available_in_pos','=',true]]; }, + context: function(self){ return { pricelist: self.pricelist.id }; }, + loaded: function(self, products){ + self.db.add_products(products); + }, + },{ + model: 'account.bank.statement', + fields: ['account_id','currency','journal_id','state','name','user_id','pos_session_id'], + domain: function(self){ return [['state', '=', 'open'],['pos_session_id', '=', self.pos_session.id]]; }, + loaded: function(self, bankstatements, tmp){ + self.bankstatements = bankstatements; + + tmp.journals = []; + _.each(bankstatements,function(statement){ + tmp.journals.push(statement.journal_id[0]); + }); + }, + },{ + model: 'account.journal', + fields: [], + domain: function(self,tmp){ return [['id','in',tmp.journals]]; }, + loaded: function(self, journals){ + self.journals = journals; + + // associate the bank statements with their journals. + var bankstatements = self.bankstatements; + for(var i = 0, ilen = bankstatements.length; i < ilen; i++){ + for(var j = 0, jlen = journals.length; j < jlen; j++){ + if(bankstatements[i].journal_id[0] === journals[j].id){ + bankstatements[i].journal = journals[j]; + bankstatements[i].self_checkout_payment_method = journals[j].self_checkout_payment_method; + } + } + } + self.cashregisters = bankstatements; + }, + },{ + loaded: function(self){ + self.company_logo = new Image(); + self.company_logo.crossOrigin = 'anonymous'; + var logo_loaded = new $.Deferred(); + self.company_logo.onload = function(){ + var img = self.company_logo; + var ratio = 1; + var targetwidth = 300; + var maxheight = 150; + if( img.width !== targetwidth ){ + ratio = targetwidth / img.width; + } + if( img.height * ratio > maxheight ){ + ratio = maxheight / img.height; + } + var width = Math.floor(img.width * ratio); + var height = Math.floor(img.height * ratio); + var c = document.createElement('canvas'); + c.width = width; + c.height = height + var ctx = c.getContext('2d'); + ctx.drawImage(self.company_logo,0,0, width, height); + + self.company_logo_base64 = c.toDataURL(); + window.logo64 = self.company_logo_base64; + logo_loaded.resolve(); + }; + self.company_logo.onerror = function(){ + logo_loaded.reject(); + }; + self.company_logo.src = window.location.origin + '/web/binary/company_logo'; + + return logo_loaded; + }, + }, + ], + // loads all the needed data on the sever. returns a deferred indicating when all the data has loaded. load_server_data: function(){ var self = this; + var loaded = new $.Deferred(); + var progress = 0; + var progress_step = 1.0 / self.models.length; + var tmp = {}; // this is used to share a temporary state between models loaders - var loaded = self.fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) - .then(function(users){ - self.user = users[0]; - - return self.fetch('res.company', - [ - 'currency_id', - 'email', - 'website', - 'company_registry', - 'vat', - 'name', - 'phone', - 'partner_id', - ], - [['id','=',users[0].company_id[0]]], - {show_address_only: true}); - }).then(function(companies){ - self.company = companies[0]; - - return self.fetch('product.uom', null, null); - }).then(function(units){ - self.units = units; - var units_by_id = {}; - for(var i = 0, len = units.length; i < len; i++){ - units_by_id[units[i].id] = units[i]; - units[i].groupable = ( units[i].category_id[0] === 1 ); - units[i].is_unit = ( units[i].id === 1 ); - } - self.units_by_id = units_by_id; + function load_model(index){ + if(index >= self.models.length){ + loaded.resolve(); + }else{ + var model = self.models[index]; + self.pos_widget.loading_message(_t('Loading')+' '+(model.model || ''), progress); + var fields = typeof model.fields === 'function' ? model.fields(self,tmp) : model.fields; + var domain = typeof model.domain === 'function' ? model.domain(self,tmp) : model.domain; + var context = typeof model.context === 'function' ? model.context(self,tmp) : model.context; + progress += progress_step; - return self.fetch('res.users', ['name','ean13'], [['ean13', '!=', false]]); - }).then(function(users){ - self.users = users; - - return self.fetch('res.partner', ['name','street','city','country_id','phone','zip','mobile','email','ean13']); - }).then(function(partners){ - self.partners = partners; - self.db.add_partners(partners); - - return self.fetch('account.tax', ['name','amount', 'price_include', 'type']); - }).then(function(taxes){ - self.taxes = taxes; - - return self.fetch( - 'pos.session', - ['id', 'journal_ids','name','user_id','config_id','start_at','stop_at','sequence_number'], - [['state', '=', 'opened'], ['user_id', '=', self.session.uid]] - ); - }).then(function(pos_sessions){ - self.pos_session = pos_sessions[0]; - - return self.fetch('pos.config',[],[['id','=', self.pos_session.config_id[0]]]); - }).then(function(configs){ - self.config = configs[0]; - self.config.use_proxy = self.config.iface_payment_terminal || - self.config.iface_electronic_scale || - self.config.iface_print_via_proxy || - self.config.iface_scan_via_proxy || - self.config.iface_cashdrawer; - - self.barcode_reader.add_barcode_patterns({ - 'product': self.config.barcode_product, - 'cashier': self.config.barcode_cashier, - 'client': self.config.barcode_customer, - 'weight': self.config.barcode_weight, - 'discount': self.config.barcode_discount, - 'price': self.config.barcode_price, - }); - return self.fetch('stock.location',[],[['id','=', self.config.stock_location_id[0]]]); - }).then(function(shops){ - self.shop = shops[0]; - - return self.fetch('product.pricelist',['currency_id'],[['id','=',self.config.pricelist_id[0]]]); - }).then(function(pricelists){ - self.pricelist = pricelists[0]; - - return self.fetch('res.currency',['symbol','position','rounding','accuracy'],[['id','=',self.pricelist.currency_id[0]]]); - }).then(function(currencies){ - self.currency = currencies[0]; - - return self.fetch('product.packaging',['ean','product_tmpl_id']); - }).then(function(packagings){ - self.db.add_packagings(packagings); - - return self.fetch('pos.category', ['id','name','parent_id','child_id','image']); - }).then(function(categories){ - self.db.add_categories(categories); - - return self.fetch( - 'product.product', - ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code', 'variants', - 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description', - 'product_tmpl_id'], - [['sale_ok','=',true],['available_in_pos','=',true]], - {pricelist: self.pricelist.id} // context for price - ); - }).then(function(products){ - self.db.add_products(products); - - return self.fetch( - 'account.bank.statement', - ['account_id','currency','journal_id','state','name','user_id','pos_session_id'], - [['state','=','open'],['pos_session_id', '=', self.pos_session.id]] - ); - }).then(function(bankstatements){ - var journals = []; - _.each(bankstatements,function(statement) { - journals.push(statement.journal_id[0]); - }); - self.bankstatements = bankstatements; - return self.fetch('account.journal', undefined, [['id','in', journals]]); - }).then(function(journals){ - self.journals = journals; - - // associate the bank statements with their journals. - var bankstatements = self.bankstatements; - for(var i = 0, ilen = bankstatements.length; i < ilen; i++){ - for(var j = 0, jlen = journals.length; j < jlen; j++){ - if(bankstatements[i].journal_id[0] === journals[j].id){ - bankstatements[i].journal = journals[j]; - bankstatements[i].self_checkout_payment_method = journals[j].self_checkout_payment_method; - } - } + if( model.model ){ + new instance.web.Model(model.model).query(fields).filter(domain).context(context).all() + .then(function(result){ + $.when(model.loaded(self,result,tmp)) + .then(function(){ load_model(index + 1); }, + function(err){ loaded.reject(err); }); + },function(err){ + loaded.reject(err); + }); + }else if( model.loaded ){ + $.when(model.loaded(self,tmp)) + .then( function(){ load_model(index +1); }, + function(err){ loaded.reject(err); }); + }else{ + load_model(index + 1); } - self.cashregisters = bankstatements; + } + } + + load_model(0); - // Load the company Logo - - self.company_logo = new Image(); - self.company_logo.crossOrigin = 'anonymous'; - var logo_loaded = new $.Deferred(); - self.company_logo.onload = function(){ - var img = self.company_logo; - var ratio = 1; - var targetwidth = 300; - var maxheight = 150; - if( img.width !== targetwidth ){ - ratio = targetwidth / img.width; - } - if( img.height * ratio > maxheight ){ - ratio = maxheight / img.height; - } - var width = Math.floor(img.width * ratio); - var height = Math.floor(img.height * ratio); - var c = document.createElement('canvas'); - c.width = width; - c.height = height - var ctx = c.getContext('2d'); - ctx.drawImage(self.company_logo,0,0, width, height); - - self.company_logo_base64 = c.toDataURL(); - window.logo64 = self.company_logo_base64; - logo_loaded.resolve(); - }; - self.company_logo.onerror = function(){ - logo_loaded.reject(); - }; - self.company_logo.src = window.location.origin + '/web/binary/company_logo'; - - return logo_loaded; - }); - return loaded; }, From 6d87dfb0046d6f4ae48d04a1c0996bc9716fe39f Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 24 Jul 2014 15:21:54 +0200 Subject: [PATCH 15/34] [IMP] point_of_sale: report errors when loading the point of sale with a traceback and a nice popup --- addons/point_of_sale/static/src/js/models.js | 28 +++++++++---- addons/point_of_sale/static/src/js/widgets.js | 41 +++++++++++++++---- 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index e35c31a4ea6..28b0b3188f1 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -328,23 +328,35 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal if( model.model ){ new instance.web.Model(model.model).query(fields).filter(domain).context(context).all() .then(function(result){ - $.when(model.loaded(self,result,tmp)) - .then(function(){ load_model(index + 1); }, - function(err){ loaded.reject(err); }); + try{ // catching exceptions in model.loaded(...) + $.when(model.loaded(self,result,tmp)) + .then(function(){ load_model(index + 1); }, + function(err){ loaded.reject(err); }); + }catch(err){ + loaded.reject(err); + } },function(err){ loaded.reject(err); }); }else if( model.loaded ){ - $.when(model.loaded(self,tmp)) - .then( function(){ load_model(index +1); }, - function(err){ loaded.reject(err); }); + try{ // catching exceptions in model.loaded(...) + $.when(model.loaded(self,tmp)) + .then( function(){ load_model(index +1); }, + function(err){ loaded.reject(err); }); + }catch(err){ + loaded.reject(err); + } }else{ load_model(index + 1); } } } - - load_model(0); + + try{ + load_model(0); + }catch(err){ + loaded.reject(err); + } return loaded; }, diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 50120f9d9df..84aa163f632 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -1024,17 +1024,40 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa self.pos.push_order(); - }).fail(function(){ // error when loading models data from the backend - return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id']) - .pipe( _.bind(function(res){ - return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']}) - .pipe(_.bind(function(result){ - var action = result.result; - this.do_action(action); - }, this)); - }, self)); + }).fail(function(err){ // error when loading models data from the backend + self.loading_error(err); }); }, + loading_error: function(err){ + var self = this; + + var message = err.message; + var comment = err.stack; + + if(err.message === 'XmlHttpRequestError '){ + message = 'Network Failure (XmlHttpRequestError)'; + comment = 'The Point of Sale could not be loaded due to a network problem.\n Please check your internet connection.'; + }else if(err.message === 'OpenERP Server Error'){ + message = err.data.message; + comment = err.data.debug; + } + + if( typeof comment !== 'string' ){ + comment = 'Traceback not available.'; + } + + var popup = $(QWeb.render('ErrorTracebackPopupWidget',{ + widget: { message: message, comment: comment }, + })); + + popup.find('.button').click(function(){ + self.close(); + }); + + popup.css({ zindex: 9001 }); + + popup.appendTo(this.$el); + }, loading_progress: function(fac){ this.$('.loader .loader-feedback').removeClass('oe_hidden'); this.$('.loader .progress').css({'width': ''+Math.floor(fac*100)+'%'}); From dfd9f164a2e182b424b595c3429cc14d761dab0f Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 24 Jul 2014 18:08:12 +0200 Subject: [PATCH 16/34] [IMP] pos_discount: a new pos extension that allows you to quickly give a global discount on the current order --- addons/pos_discount/__init__.py | 25 ++++++++++ addons/pos_discount/__openerp__.py | 47 +++++++++++++++++++ addons/pos_discount/discount.py | 39 +++++++++++++++ addons/pos_discount/static/src/js/discount.js | 34 ++++++++++++++ .../pos_discount/static/src/xml/discount.xml | 10 ++++ addons/pos_discount/views/templates.xml | 12 +++++ addons/pos_discount/views/views.xml | 20 ++++++++ 7 files changed, 187 insertions(+) create mode 100644 addons/pos_discount/__init__.py create mode 100644 addons/pos_discount/__openerp__.py create mode 100644 addons/pos_discount/discount.py create mode 100644 addons/pos_discount/static/src/js/discount.js create mode 100644 addons/pos_discount/static/src/xml/discount.xml create mode 100644 addons/pos_discount/views/templates.xml create mode 100644 addons/pos_discount/views/views.xml diff --git a/addons/pos_discount/__init__.py b/addons/pos_discount/__init__.py new file mode 100644 index 00000000000..5487d145a9b --- /dev/null +++ b/addons/pos_discount/__init__.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import discount + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/pos_discount/__openerp__.py b/addons/pos_discount/__openerp__.py new file mode 100644 index 00000000000..d367db148cd --- /dev/null +++ b/addons/pos_discount/__openerp__.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + + +{ + 'name': 'Point of Sale Discounts', + 'version': '1.0', + 'category': 'Point of Sale', + 'sequence': 6, + 'summary': 'Simple Discounts in the Point of Sale ', + 'description': """ + +======================= + +This module allows the cashier to quickly give a percentage +sale discount to a customer. + +""", + 'author': 'OpenERP SA', + 'depends': ['point_of_sale'], + 'data': [ + 'views/views.xml', + 'views/templates.xml' + ], + 'installable': True, + 'auto_install': False, +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/pos_discount/discount.py b/addons/pos_discount/discount.py new file mode 100644 index 00000000000..f8d24eb638b --- /dev/null +++ b/addons/pos_discount/discount.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import logging + +import openerp + +from openerp import tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ + +class pos_config(osv.osv): + _inherit = 'pos.config' + _columns = { + 'discount_pc': fields.float('Discount Percentage', help='The discount percentage'), + 'discount_product_id': fields.many2one('product.product','Discount Product', help='The product used to model the discount'), + } + _defaults = { + 'discount_pc': 10, + } + diff --git a/addons/pos_discount/static/src/js/discount.js b/addons/pos_discount/static/src/js/discount.js new file mode 100644 index 00000000000..5eaab362d20 --- /dev/null +++ b/addons/pos_discount/static/src/js/discount.js @@ -0,0 +1,34 @@ +openerp.pos_discount = function(instance){ + var module = instance.point_of_sale; + var round_pr = instance.web.round_precision + var QWeb = instance.web.qweb; + + QWeb.add_template('/pos_discount/static/src/xml/discount.xml'); + + module.PosWidget.include({ + build_widgets: function(){ + var self = this; + this._super(); + + if(!this.pos.config.discount_product_id){ + return; + } + + var discount = $(QWeb.render('DiscountButton')); + + discount.click(function(){ + var order = self.pos.get('selectedOrder'); + var product = self.pos.db.get_product_by_id(self.pos.config.discount_product_id[0]); + var discount = - self.pos.config.discount_pc/ 100.0 * order.getTotalTaxIncluded(); + if( discount < 0 ){ + order.addProduct(product, { price: discount }); + } + }); + + discount.appendTo(this.$('.control-buttons')); + this.$('.control-buttons').removeClass('oe_hidden'); + }, + }); + +}; + diff --git a/addons/pos_discount/static/src/xml/discount.xml b/addons/pos_discount/static/src/xml/discount.xml new file mode 100644 index 00000000000..c8be941683f --- /dev/null +++ b/addons/pos_discount/static/src/xml/discount.xml @@ -0,0 +1,10 @@ + + + + +
      + Discount +
      +       + +       diff --git a/addons/pos_discount/views/templates.xml b/addons/pos_discount/views/templates.xml new file mode 100644 index 00000000000..0dbf22eb0fe --- /dev/null +++ b/addons/pos_discount/views/templates.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/addons/pos_discount/views/views.xml b/addons/pos_discount/views/views.xml new file mode 100644 index 00000000000..3448e0b2b6f --- /dev/null +++ b/addons/pos_discount/views/views.xml @@ -0,0 +1,20 @@ + + + + + + pos.config.form.view + pos.config + + + + + + + + + + + + + From cdc841d723524b3c72c12b3258b11c089db94a61 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 28 Jul 2014 11:33:24 +0200 Subject: [PATCH 17/34] [IMP] point_of_sale: allow an order to remember what screen it was on, instead of switching back to default screen. This is used by the soon to be merged restaurant addon to create new orders and display them at a particular screen. However, this behaviour is more confusing in the other cases, so I'll think of a better way to solve this. --- addons/point_of_sale/static/src/js/screens.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 9e0f3aecab8..deefd638310 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -73,8 +73,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa load_saved_screen: function(){ this.close_popup(); var selectedOrder = this.pos.get('selectedOrder'); - // this.set_current_screen(selectedOrder.get_screen_data('screen') || this.default_screen,null,'refresh'); - this.set_current_screen(this.default_screen,null,'refresh'); + // FIXME : this changing screen behaviour is sometimes confusing ... + this.set_current_screen(selectedOrder.get_screen_data('screen') || this.default_screen,null,'refresh'); + //this.set_current_screen(this.default_screen,null,'refresh'); }, set_user_mode: function(user_mode){ From 41ab8aa5b4cb7573048dcd2899a2b3108668629b Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 28 Jul 2014 13:27:44 +0200 Subject: [PATCH 18/34] [FIX] point_of_sale: removed useless console.log() --- addons/point_of_sale/static/src/js/models.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 28b0b3188f1..d351fee5ff1 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -406,7 +406,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal var flushed = self._flush_orders(self.db.get_orders()); flushed.always(function(ids){ - console.log('pushed orders:',ids); pushed.resolve(); }); }); From f1dc21f5743a067eeceed41bb00c8f63a6dc2433 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 28 Jul 2014 13:28:39 +0200 Subject: [PATCH 19/34] [IMP] restaurant: a module that extends the point of sale with restaurant features --- addons/restaurant/__init__.py | 25 ++ addons/restaurant/__openerp__.py | 55 +++++ addons/restaurant/restaurant.py | 55 +++++ addons/restaurant/restaurant_view.xml | 74 ++++++ .../restaurant/security/ir.model.access.csv | 3 + .../restaurant/static/src/css/restaurant.css | 2 + addons/restaurant/static/src/js/main.js | 11 + addons/restaurant/static/src/js/multiprint.js | 215 ++++++++++++++++++ addons/restaurant/static/src/js/printbill.js | 28 +++ addons/restaurant/static/src/js/splitbill.js | 180 +++++++++++++++ .../restaurant/static/src/xml/multiprint.xml | 55 +++++ .../restaurant/static/src/xml/printbill.xml | 143 ++++++++++++ .../restaurant/static/src/xml/splitbill.xml | 88 +++++++ addons/restaurant/views/templates.xml | 23 ++ 14 files changed, 957 insertions(+) create mode 100644 addons/restaurant/__init__.py create mode 100644 addons/restaurant/__openerp__.py create mode 100644 addons/restaurant/restaurant.py create mode 100644 addons/restaurant/restaurant_view.xml create mode 100644 addons/restaurant/security/ir.model.access.csv create mode 100644 addons/restaurant/static/src/css/restaurant.css create mode 100644 addons/restaurant/static/src/js/main.js create mode 100644 addons/restaurant/static/src/js/multiprint.js create mode 100644 addons/restaurant/static/src/js/printbill.js create mode 100644 addons/restaurant/static/src/js/splitbill.js create mode 100644 addons/restaurant/static/src/xml/multiprint.xml create mode 100644 addons/restaurant/static/src/xml/printbill.xml create mode 100644 addons/restaurant/static/src/xml/splitbill.xml create mode 100644 addons/restaurant/views/templates.xml diff --git a/addons/restaurant/__init__.py b/addons/restaurant/__init__.py new file mode 100644 index 00000000000..381469e26fc --- /dev/null +++ b/addons/restaurant/__init__.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import restaurant + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/restaurant/__openerp__.py b/addons/restaurant/__openerp__.py new file mode 100644 index 00000000000..dbf735b800e --- /dev/null +++ b/addons/restaurant/__openerp__.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + + +{ + 'name': 'Restaurant', + 'version': '1.0', + 'category': 'Point of Sale', + 'sequence': 6, + 'summary': 'Restaurant extensions for the Point of Sale ', + 'description': """ + +======================= + +This module adds several restaurant features to the Point of Sale: +- Bill Printing: Allows you to print a receipt before the order is paid +- Bill Splitting: Allows you to split an order into different orders +- Kitchen Order Printing: allows you to print orders updates to kitchen or bar printers + +""", + 'author': 'OpenERP SA', + 'depends': ['point_of_sale'], + 'data': [ + 'restaurant_view.xml', + 'security/ir.model.access.csv', + 'views/templates.xml', + ], + 'qweb':[ + 'static/src/xml/multiprint.xml', + 'static/src/xml/splitbill.xml', + 'static/src/xml/printbill.xml', + ], + 'installable': True, + 'auto_install': False, +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/restaurant/restaurant.py b/addons/restaurant/restaurant.py new file mode 100644 index 00000000000..c7d02a336c1 --- /dev/null +++ b/addons/restaurant/restaurant.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import logging + +import openerp +from openerp import tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ + +_logger = logging.getLogger(__name__) + +class restaurant_printer(osv.osv): + _name = 'restaurant.printer' + + _columns = { + 'name' : fields.char('Printer Name', size=32, required=True, help='An internal identification of the printer'), + 'proxy_ip': fields.char('Proxy IP Address', size=32, help="The IP Address or hostname of the Printer's hardware proxy"), + 'product_categories_ids': fields.many2many('pos.category','printer_category_rel', 'printer_id','category_id',string='Printed Product Categories'), + } + + _defaults = { + 'name' : 'Printer', + } + +class pos_config(osv.osv): + _inherit = 'pos.config' + _columns = { + 'iface_splitbill': fields.boolean('Bill Splitting', help='Enables Bill Splitting in the Point of Sale'), + 'iface_printbill': fields.boolean('Bill Printing', help='Allows to print the Bill before payment'), + 'printer_ids': fields.many2many('restaurant.printer','pos_config_printer_rel', 'config_id','printer_id',string='Order Printers'), + } + _defaults = { + 'iface_splitbill': False, + 'iface_printbill': False, + } + diff --git a/addons/restaurant/restaurant_view.xml b/addons/restaurant/restaurant_view.xml new file mode 100644 index 00000000000..84adc883b94 --- /dev/null +++ b/addons/restaurant/restaurant_view.xml @@ -0,0 +1,74 @@ + + + + + Order Printer + restaurant.printer + +
      + + + + + +
      +       +       + + + Order Printers + ir.actions.act_window + restaurant.printer + form + tree,form + +

      + Click to add a Restaurant Order Printer. +

      + Order Printers are used by restaurants and bars to print the + order updates in the kitchen/bar when the waiter updates the order. +

      + Each Order Printer has an IP Address that defines the PosBox/Hardware + Proxy where the printer can be found, and a list of product categories. + An Order Printer will only print updates for prodcuts belonging to one of + its categories. +

      +       +       + + + Order Printers + restaurant.printer + + + + + + + + + + + + + pos.config.form.view.inherit + pos.config + + + + + + + + + + + + +       +       diff --git a/addons/restaurant/security/ir.model.access.csv b/addons/restaurant/security/ir.model.access.csv new file mode 100644 index 00000000000..31c7f956f86 --- /dev/null +++ b/addons/restaurant/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_restaurant_printer,restaurant.printer.user,model_restaurant_printer,point_of_sale.group_pos_user,1,0,0,0 +access_restaurant_printer_manager,restaurant.printer.manager,model_restaurant_printer,point_of_sale.group_pos_manager,1,0,0,0 diff --git a/addons/restaurant/static/src/css/restaurant.css b/addons/restaurant/static/src/css/restaurant.css new file mode 100644 index 00000000000..0ffebfc0a46 --- /dev/null +++ b/addons/restaurant/static/src/css/restaurant.css @@ -0,0 +1,2 @@ +/* --- Restaurant Specific CSS --- */ + diff --git a/addons/restaurant/static/src/js/main.js b/addons/restaurant/static/src/js/main.js new file mode 100644 index 00000000000..4b8d25368a5 --- /dev/null +++ b/addons/restaurant/static/src/js/main.js @@ -0,0 +1,11 @@ +openerp.restaurant = function(instance){ + + var module = instance.point_of_sale; + + openerp_restaurant_multiprint(instance,module); + + openerp_restaurant_splitbill(instance,module); + + openerp_restaurant_printbill(instance,module); + +}; diff --git a/addons/restaurant/static/src/js/multiprint.js b/addons/restaurant/static/src/js/multiprint.js new file mode 100644 index 00000000000..14e412a5071 --- /dev/null +++ b/addons/restaurant/static/src/js/multiprint.js @@ -0,0 +1,215 @@ +function openerp_restaurant_multiprint(instance,module){ + var QWeb = instance.web.qweb; + var _t = instance.web._t; + + module.Printer = instance.web.Class.extend(openerp.PropertiesMixin,{ + init: function(parent,options){ + openerp.PropertiesMixin.init.call(this,parent); + var self = this; + options = options || {}; + var url = options.url || 'http://localhost:8069'; + this.connection = new instance.web.Session(undefined,url, { use_cors: true}); + this.host = url; + this.receipt_queue = []; + }, + print: function(receipt){ + var self = this; + if(receipt){ + this.receipt_queue.push(receipt); + } + var aborted = false; + function send_printing_job(){ + if(self.receipt_queue.length > 0){ + var r = self.receipt_queue.shift(); + self.connection.rpc('/hw_proxy/print_xml_receipt',{receipt: r},{timeout: 5000}) + .then(function(){ + send_printing_job(); + },function(){ + self.receipt_queue.unshift(r); + }); + } + } + send_printing_job(); + }, + }); + + module.PosModel.prototype.models.push({ + model: 'restaurant.printer', + fields: ['name','proxy_ip','product_categories_ids'], + domain: null, + loaded: function(self,printers){ + var active_printers = {}; + for (var i = 0; i < self.config.printer_ids.length; i++) { + active_printers[self.config.printer_ids[i]] = true; + } + + self.printers = []; + for(var i = 0; i < printers.length; i++){ + if(active_printers[printers[i].id]){ + var printer = new module.Printer(self,{url:'http://'+printers[i].proxy_ip+':8069'}); + printer.config = printers[i]; + self.printers.push(printer); + } + } + }, + }); + + module.Order = module.Order.extend({ + lineResume: function(){ + var resume = {}; + this.get('orderLines').each(function(item){ + var line = item.export_as_JSON(); + if( typeof resume[line.product_id] === 'undefined'){ + resume[line.product_id] = line.qty; + }else{ + resume[line.product_id] += line.qty; + } + }); + return resume; + }, + saveChanges: function(){ + this.old_resume = this.lineResume(); + }, + computeChanges: function(categories){ + var current = this.lineResume(); + var old = this.old_resume || {}; + var json = this.export_as_JSON(); + var add = []; + var rem = []; + + for( product in current){ + if (typeof old[product] === 'undefined'){ + add.push({ + 'id': product, + 'name': this.pos.db.get_product_by_id(product).name, + 'quantity': current[product], + }); + }else if( old[product] < current[product]){ + add.push({ + 'id': product, + 'name': this.pos.db.get_product_by_id(product).name, + 'quantity': current[product] - old[product], + }); + }else if( old[product] > current[product]){ + rem.push({ + 'id': product, + 'name': this.pos.db.get_product_by_id(product).name, + 'quantity': old[product] - current[product], + }); + } + } + + for( product in old){ + if(typeof current[product] === 'undefined'){ + rem.push({ + 'id': product, + 'name': this.pos.db.get_product_by_id(product).name, + 'quantity': old[product], + }); + } + } + + if(categories && categories.length > 0){ + // filter the added and removed orders to only contains + // products that belong to one of the categories supplied as a parameter + + var self = this; + function product_in_category(product_id){ + var cat = self.pos.db.get_product_by_id(product_id).pos_categ_id[0]; + while(cat){ + for(var i = 0; i < categories.length; i++){ + if(cat === categories[i]){ + return true; + } + } + cat = self.pos.db.get_category_parent_id(cat); + } + return false; + } + + var _add = []; + var _rem = []; + + for(var i = 0; i < add.length; i++){ + if(product_in_category(add[i].id)){ + _add.push(add[i]); + } + } + add = _add; + + for(var i = 0; i < rem.length; i++){ + if(product_in_category(rem[i].id)){ + _rem.push(rem[i]); + } + } + rem = _rem; + } + + return { + 'new': add, + 'cancelled': rem, + 'table': json.table || 'unknown table', + 'name': json.name || 'unknown order', + }; + + }, + printChanges: function(){ + var printers = this.pos.printers; + for(var i = 0; i < printers.length; i++){ + var changes = this.computeChanges(printers[i].config.product_categories_ids); + if ( changes['new'].length > 0 || changes['cancelled'].length > 0){ + var receipt = QWeb.render('OrderChangeReceipt',{changes:changes, widget:this}); + printers[i].print(receipt); + } + } + }, + hasChangesToPrint: function(){ + var printers = this.pos.printers; + for(var i = 0; i < printers.length; i++){ + var changes = this.computeChanges(printers[i].config.product_categories_ids); + if ( changes['new'].length > 0 || changes['cancelled'].length > 0){ + return true; + } + } + return false; + }, + }); + + module.PosWidget.include({ + build_widgets: function(){ + var self = this; + this._super(); + + if(this.pos.printers.length){ + var submitorder = $(QWeb.render('SubmitOrderButton')); + + submitorder.click(function(){ + var order = self.pos.get('selectedOrder'); + if(order.hasChangesToPrint()){ + order.printChanges(); + order.saveChanges(); + self.pos_widget.order_widget.update_summary(); + } + }); + + submitorder.appendTo(this.$('.control-buttons')); + this.$('.control-buttons').removeClass('oe_hidden'); + } + }, + + }); + + module.OrderWidget.include({ + update_summary: function(){ + this._super(); + var order = this.pos.get('selectedOrder'); + + if(order.hasChangesToPrint()){ + this.pos_widget.$('.order-submit').addClass('highlight'); + }else{ + this.pos_widget.$('.order-submit').removeClass('highlight'); + } + }, + }); + +} diff --git a/addons/restaurant/static/src/js/printbill.js b/addons/restaurant/static/src/js/printbill.js new file mode 100644 index 00000000000..89bf9db7bc7 --- /dev/null +++ b/addons/restaurant/static/src/js/printbill.js @@ -0,0 +1,28 @@ +function openerp_restaurant_printbill(instance,module){ + var QWeb = instance.web.qweb; + var _t = instance.web._t; + + module.PosWidget.include({ + build_widgets: function(){ + var self = this; + this._super(); + + if(this.pos.config.iface_printbill){ + var printbill = $(QWeb.render('PrintBillButton')); + + printbill.click(function(){ + var order = self.pos.get('selectedOrder'); + if(order.get('orderLines').models.length > 0){ + var receipt = order.export_for_printing(); + self.pos.proxy.print_receipt(QWeb.render('BillReceipt',{ + receipt: receipt, widget: self, + })); + } + }); + + printbill.appendTo(this.$('.control-buttons')); + this.$('.control-buttons').removeClass('oe_hidden'); + } + }, + }); +} diff --git a/addons/restaurant/static/src/js/splitbill.js b/addons/restaurant/static/src/js/splitbill.js new file mode 100644 index 00000000000..dd90d159af5 --- /dev/null +++ b/addons/restaurant/static/src/js/splitbill.js @@ -0,0 +1,180 @@ +function openerp_restaurant_splitbill(instance, module){ + var QWeb = instance.web.qweb; + var _t = instance.web._t; + + module.SplitbillScreenWidget = module.ScreenWidget.extend({ + template: 'SplitbillScreenWidget', + + show_leftpane: false, + previous_screen: 'products', + + renderElement: function(){ + var self = this; + this._super(); + var order = this.pos.get('selectedOrder'); + if(!order){ + return; + } + var orderlines = order.get('orderLines').models; + for(var i = 0; i < orderlines.length; i++){ + var line = orderlines[i]; + linewidget = $(QWeb.render('SplitOrderline',{ + widget:this, + line:line, + selected: false, + quantity: 0, + id: line.id, + })); + linewidget.data('id',line.id); + this.$('.orderlines').append(linewidget); + } + this.$('.back').click(function(){ + self.pos_widget.screen_selector.set_current_screen(self.previous_screen); + }); + }, + + lineselect: function($el,order,neworder,splitlines,line_id){ + var split = splitlines[line_id] || {'quantity': 0, line: null}; + var line = order.getOrderline(line_id); + + if( !line.get_unit().groupable ){ + if( split.quantity !== line.get_quantity()){ + split.quantity = line.get_quantity(); + }else{ + split.quantity = 0; + } + }else{ + if( split.quantity < line.get_quantity()){ + split.quantity += line.get_unit().rounding; + if(split.quantity > line.get_quantity()){ + split.quantity = line.get_quantity(); + } + }else{ + split.quantity = 0; + } + } + + if( split.quantity ){ + if ( !split.line ){ + split.line = line.clone(); + neworder.addOrderline(split.line); + } + split.line.set_quantity(split.quantity); + }else if( split.line ) { + neworder.removeOrderline(split.line); + split.line = null; + } + + splitlines[line_id] = split; + $el.replaceWith($(QWeb.render('SplitOrderline',{ + widget: this, + line: line, + selected: split.quantity !== 0, + quantity: split.quantity, + id: line_id, + }))); + this.$('.order-info .subtotal').text(this.format_currency(neworder.getSubtotal())); + }, + + pay: function($el,order,neworder,splitlines,cashregister_id){ + var orderlines = order.get('orderLines').models; + var empty = true; + var full = true; + + for(var i = 0; i < orderlines.length; i++){ + var id = orderlines[i].id; + var split = splitlines[id]; + if(!split){ + full = false; + }else{ + if(split.quantity){ + empty = false; + if(split.quantity !== orderlines[i].get_quantity()){ + full = false; + } + } + } + } + + if(empty){ + return; + } + + for(var i = 0; i < this.pos.cashregisters.length; i++){ + if(this.pos.cashregisters[i].id === cashregister_id){ + var cashregister = this.pos.cashregisters[i]; + break; + } + } + + if(full){ + order.addPaymentline(cashregister); + this.pos_widget.screen_selector.set_current_screen('payment'); + }else{ + for(var id in splitlines){ + var split = splitlines[id]; + var line = order.getOrderline(parseInt(id)); + line.set_quantity(line.get_quantity() - split.quantity); + if(Math.abs(line.get_quantity()) < 0.00001){ + order.removeOrderline(line); + } + delete splitlines[id]; + } + neworder.addPaymentline(cashregister); + neworder.set_screen_data('screen','payment'); + this.pos.get('orders').add(neworder); + this.pos.set('selectedOrder',neworder); + } + }, + show: function(){ + var self = this; + this._super(); + this.renderElement(); + + var order = this.pos.get('selectedOrder'); + var neworder = new module.Order({ + pos: this.pos, + temporary: true, + }); + neworder.set('client',order.get('client')); + + var splitlines = {}; + + this.$('.orderlines').on('click','.orderline',function(){ + var id = parseInt($(this).data('id')); + var $el = $(this); + self.lineselect($el,order,neworder,splitlines,id); + }); + + this.$('.paymentmethod').click(function(){ + var id = parseInt($(this).data('id')); + var $el = $(this); + self.pay($el,order,neworder,splitlines,id); + }); + }, + }); + + module.PosWidget.include({ + build_widgets: function(){ + var self = this; + this._super(); + + if(this.pos.config.iface_splitbill){ + this.splitbill_screen = new module.SplitbillScreenWidget(this,{}); + this.splitbill_screen.appendTo(this.$('.screens')); + this.screen_selector.add_screen('splitbill',this.splitbill_screen); + + var splitbill = $(QWeb.render('SplitbillButton')); + + splitbill.click(function(){ + if(self.pos.get('selectedOrder').get('orderLines').models.length > 0){ + self.pos_widget.screen_selector.set_current_screen('splitbill'); + } + }); + + splitbill.appendTo(this.$('.control-buttons')); + this.$('.control-buttons').removeClass('oe_hidden'); + } + }, + }); +} diff --git a/addons/restaurant/static/src/xml/multiprint.xml b/addons/restaurant/static/src/xml/multiprint.xml new file mode 100644 index 00000000000..8f3027dd552 --- /dev/null +++ b/addons/restaurant/static/src/xml/multiprint.xml @@ -0,0 +1,55 @@ + + + + + + + Order + + + + + +
      +
      +
      + +
      +
      CANCELLED
      +
      +
      + + + + + + +
      +
      +
      +       + +
      NEW
      +
      +
      + + + + + + +
      +
      +       +       +       + +       diff --git a/addons/restaurant/static/src/xml/printbill.xml b/addons/restaurant/static/src/xml/printbill.xml new file mode 100644 index 00000000000..8727743a2ad --- /dev/null +++ b/addons/restaurant/static/src/xml/printbill.xml @@ -0,0 +1,143 @@ + + + + + + + Bill + + + + + + + +
      +       + +

      +
      +       +
      + +
      +       + +
      +       + +
      Tel:
      +       + +
      VAT:
      +       + +
      +       + +
      +       + +
      +       + +
      --------------------------------
      +
      Served by
      +       +
      +

      + + + +
      + + + + + + + + + + + + Discount: % + + + + + + + + + + x + + + + + + + + + + +
      + + + + + -------- + Subtotal + + + + + + + + + + + -------- + + 
              TOTAL
       + +       +

      + + + + + + Discounts + + + + + + + + + + + + + + +
      +
      +
      +
      +       + +
      +
      +
      +
      +
      + +       +       + +       diff --git a/addons/restaurant/static/src/xml/splitbill.xml b/addons/restaurant/static/src/xml/splitbill.xml new file mode 100644 index 00000000000..d56f01aaa9b --- /dev/null +++ b/addons/restaurant/static/src/xml/splitbill.xml @@ -0,0 +1,88 @@ + + + + + + + Split + + + + + +
    • + + + + + + +
        + +
      • + + + + + / + + + + + + + + + at + + / + +
        • +         + +
      • + With a + + % + + discount +
        • +         +
      +
      • +       + + +
      +
      +
      + + + Back + +

      Bill Splitting

      +
      +
      +
      +
        +
      +
      +
      +
      +
      + +
      +
      + +
      + +
      +       +
      +
      +
      +
      +       + +       diff --git a/addons/restaurant/views/templates.xml b/addons/restaurant/views/templates.xml new file mode 100644 index 00000000000..a0cb45cb8e5 --- /dev/null +++ b/addons/restaurant/views/templates.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + From 01f8a6a59a75a9a1839ded3c1243708e1f2dd00e Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 28 Jul 2014 13:33:54 +0200 Subject: [PATCH 20/34] [IMP] pos_discount: add an icon to the discount button --- addons/pos_discount/static/src/xml/discount.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/pos_discount/static/src/xml/discount.xml b/addons/pos_discount/static/src/xml/discount.xml index c8be941683f..65a38afb97d 100644 --- a/addons/pos_discount/static/src/xml/discount.xml +++ b/addons/pos_discount/static/src/xml/discount.xml @@ -3,7 +3,7 @@
      - Discount + Discount
      From 9750fb1686c843018383d9c3cf459c99975d577b Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 29 Jul 2014 14:28:46 +0200 Subject: [PATCH 21/34] [IMP] restaurant: add the order sequence number to the kitchen instruction receipt --- addons/restaurant/static/src/js/multiprint.js | 1 + addons/restaurant/static/src/xml/multiprint.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/restaurant/static/src/js/multiprint.js b/addons/restaurant/static/src/js/multiprint.js index 14e412a5071..4a86e4e5a31 100644 --- a/addons/restaurant/static/src/js/multiprint.js +++ b/addons/restaurant/static/src/js/multiprint.js @@ -150,6 +150,7 @@ function openerp_restaurant_multiprint(instance,module){ 'cancelled': rem, 'table': json.table || 'unknown table', 'name': json.name || 'unknown order', + 'sequence_number': json.sequence_number || 0, }; }, diff --git a/addons/restaurant/static/src/xml/multiprint.xml b/addons/restaurant/static/src/xml/multiprint.xml index 8f3027dd552..63176f8938f 100644 --- a/addons/restaurant/static/src/xml/multiprint.xml +++ b/addons/restaurant/static/src/xml/multiprint.xml @@ -18,7 +18,8 @@ value-thousands-separator='' value-autoint='on' > -
      +
      #
      +


      From 7b36676323fb8c2685fd90b236311e1f260854f4 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 29 Jul 2014 15:29:28 +0200 Subject: [PATCH 22/34] [IMP] restaurant: discard kitchen order changes when splitting the bill. --- addons/restaurant/static/src/js/splitbill.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/addons/restaurant/static/src/js/splitbill.js b/addons/restaurant/static/src/js/splitbill.js index dd90d159af5..81591ccc589 100644 --- a/addons/restaurant/static/src/js/splitbill.js +++ b/addons/restaurant/static/src/js/splitbill.js @@ -122,6 +122,19 @@ function openerp_restaurant_splitbill(instance, module){ } neworder.addPaymentline(cashregister); neworder.set_screen_data('screen','payment'); + + // for the kitchen printer we assume that everything + // has already been sent to the kitchen before splitting + // the bill. So we save all changes both for the old + // order and for the new one. This is not entirely correct + // but avoids flooding the kitchen with unnecessary orders. + // Not sure what to do in this case. + + if ( neworder.saveChanges ) { + order.saveChanges(); + neworder.saveChanges(); + } + this.pos.get('orders').add(neworder); this.pos.set('selectedOrder',neworder); } From de9ba0d1cbae53c58a229d230fdf84db45673d7b Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 29 Jul 2014 18:07:29 +0200 Subject: [PATCH 23/34] [WIP] point_of_sale: removed the payment method selection from the paypad, as the payment method will be selected from the new payment screen --- addons/point_of_sale/static/src/css/pos.css | 32 +++++++----- addons/point_of_sale/static/src/js/widgets.js | 49 +++++-------------- addons/point_of_sale/static/src/xml/pos.xml | 18 +++---- 3 files changed, 40 insertions(+), 59 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index c3358e71665..64e62f37d77 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -502,20 +502,20 @@ td { color: inherit; } -/* ********* The paypad contains the payment buttons ********* */ +/* ********* The actionpad (payment, set customer) ********* */ -.pos .paypad { - padding: 8px 4px 8px 8px; +.pos .actionpad{ + padding: 8px 3px 8px 19px; display: inline-block; text-align: center; vertical-align: top; - width: 205px; + width: 183px; max-height: 350px; overflow-y: auto; overflow-x: hidden; } -.pos .paypad button { - height: 39px; +.pos .actionpad .button { + height: 50px; display: block; width: 100%; margin: 0px -6px 4px -2px; @@ -524,13 +524,19 @@ td { color: #555555; font-size: 14px; } -.pos .paypad button:active, -.pos .numpad button:active, -.pos .numpad .selected-mode, -.pos .popup button:active{ - border: none; +.pos .actionpad .button.pay { + height: 158px; +} +.pos .actionpad .button.pay .fa { + display: block; + font-size: 32px; + line-height: 60px; + background: rgb(86, 86, 86); color: white; - background: #7f82ac; + width: 60px; + margin: auto; + border-radius: 30px; + margin-bottom: 10px; } /* ********* The Numpad ********* */ @@ -543,7 +549,7 @@ td { .pos .numpad button { height: 50px; width: 50px; - margin: 0px 0px 4px 0px; + margin: 0px 3px 4px 0px; font-weight: bold; vertical-align: middle; color: #555555; diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 84aa163f632..c5943870f41 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -83,46 +83,21 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, }); - // The paypad allows to select the payment method (cashregisters) - // used to pay the order. - module.PaypadWidget = module.PosBaseWidget.extend({ - template: 'PaypadWidget', + // The action pads contains the payment button and the customer selection button. + module.ActionpadWidget = module.PosBaseWidget.extend({ + template: 'ActionpadWidget', renderElement: function() { var self = this; this._super(); - - _.each(this.pos.cashregisters,function(cashregister) { - var button = new module.PaypadButtonWidget(self,{ - pos: self.pos, - pos_widget : self.pos_widget, - cashregister: cashregister, - }); - button.appendTo(self.$el); + this.$('.pay').click(function(){ + self.pos.pos_widget.screen_selector.set_current_screen('payment'); + }); + this.$('.set-customer').click(function(){ + self.pos.pos_widget.screen_selector.set_current_screen('clientlist'); }); } }); - module.PaypadButtonWidget = module.PosBaseWidget.extend({ - template: 'PaypadButtonWidget', - init: function(parent, options){ - this._super(parent, options); - this.cashregister = options.cashregister; - }, - renderElement: function() { - var self = this; - this._super(); - - this.$el.click(function(){ - if (self.pos.get('selectedOrder').get('screen') === 'receipt'){ //TODO Why ? - console.warn('TODO should not get there...?'); - return; - } - self.pos.get('selectedOrder').addPaymentline(self.cashregister); - self.pos_widget.screen_selector.set_current_screen('payment'); - }); - }, - }); - module.OrderWidget = module.PosBaseWidget.extend({ template:'OrderWidget', init: function(parent, options) { @@ -1156,8 +1131,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.action_bar = new module.ActionBarWidget(this); this.action_bar.replace(this.$(".placeholder-RightActionBar")); - this.paypad = new module.PaypadWidget(this, {}); - this.paypad.replace(this.$('.placeholder-PaypadWidget')); + this.actionpad = new module.ActionpadWidget(this, {}); + this.actionpad.replace(this.$('.placeholder-ActionpadWidget')); this.numpad = new module.NumpadWidget(this); this.numpad.replace(this.$('.placeholder-NumpadWidget')); @@ -1216,10 +1191,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.numpad_visible = visible; if(visible){ this.numpad.show(); - this.paypad.show(); + this.actionpad.show(); }else{ this.numpad.hide(); - this.paypad.hide(); + this.actionpad.hide(); } } }, diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index d596862b676..6af641d2fd2 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -36,7 +36,7 @@
      -
      +
      @@ -144,8 +144,14 @@
      There are pending operations that could not be saved into the database, are you sure you want to exit?
       - -
      + +
      + +
      @@ -906,12 +912,6 @@ - - - - From 59030d53c0a4591897062d21cd6995df95c3b8d8 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 29 Jul 2014 18:09:37 +0200 Subject: [PATCH 24/34] [FIX] point_of_sale: update css for error boxes from jquery-ui to bootstrap --- addons/point_of_sale/static/src/css/pos.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 64e62f37d77..dcdfda3d831 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -20,6 +20,19 @@ .ui-dialog .ui-icon-closethick{ float: right; } +div.modal.in { + position: absolute; + background: white; + padding: 20px; + box-shadow: 0px 10px 20px black; + border-radius: 3px; + max-width: 600px; + max-height: 400px; + margin-top: -200px; + margin-left: -300px; + top: 50%; + left: 50%; +} /* --- Generic Restyling and Resets --- */ html { From ec29736801fbd6dd5f845f1f6e7e713406ad839b Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Tue, 5 Aug 2014 12:22:11 +0200 Subject: [PATCH 25/34] [WIP] point_of_sale: work on new payment screen --- addons/point_of_sale/static/src/css/pos.css | 154 ++++++++++-------- addons/point_of_sale/static/src/js/models.js | 49 +++++- addons/point_of_sale/static/src/js/screens.js | 92 +++++++++++ .../static/src/js/widget_base.js | 10 +- addons/point_of_sale/static/src/js/widgets.js | 2 +- addons/point_of_sale/static/src/xml/pos.xml | 139 ++++++++++++++++ 6 files changed, 368 insertions(+), 78 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index dcdfda3d831..15cf3112c3c 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -932,6 +932,9 @@ td { overflow-y: auto; border-right: dashed 1px rgb(215,215,215); } +.screen .left-content.pc40{ + right: 60%; +} .screen .right-content{ position: absolute; right:0px; top: 64px; bottom: 0px; @@ -939,6 +942,9 @@ td { overflow-x: hidden; overflow-y: auto; } +.screen .right-content.pc60{ + left:40% +} .screen .centered-content{ position: absolute; right:25%; top: 64px; bottom: 0px; @@ -985,95 +991,89 @@ td { position:relative; } + /* b) The payment screen */ - -.pos .pos-payment-container { +.pos .payment-numpad { display: inline-block; - font-size: 16px; - text-align: left; - width: 360px; + width: 230px; + margin-top: 8px; + margin-right: 8px; + float: right; } -.pos .payment-due-total { - text-align: center; - font-weight: bold; - font-size: 48px; - margin: 27px; - text-shadow: 0px 2px rgb(202, 202, 202); + +.pos .paymentlines-container { + padding: 16px; + padding-top: 0; + border-bottom: dashed 1px gainsboro; + min-height: 148px; +} + +.pos .paymentlines { + width: 100%; +} +.pos .paymentlines .controls { + width: 40px; +} +.pos .paymentlines .label > * { + font-size: 16px; + padding: 8px; +} +.pos .paymentlines tbody{ + background: white; + border-radius: 3px; } .pos .paymentline{ - position: relative; - padding: 8px; - border-box: 3px; - box-sizing: border-box; - -moz-box-sizing: border-box; - border-radius: 3px; + font-size: 18px; } -.pos .paymentline-name{ - margin-bottom: 8px; +.pos .paymentline.selected { + font-size: 22px; + background: #6EC89B; + color: white; } -.pos .paymentline-input{ - font-size: 20px; - font-family: Lato; - display: block; - width: 100%; - box-sizing: border-box; - -moz-box-sizing: border-box; - outline: none; - border: none; - padding: 6px 8px; +.pos .paymentline.selected .edit { background: white; - color: #484848; - text-align: right; + color: #6EC89B; + outline: 3px blue; + border: solid 4px #6EC89B; border-radius: 3px; - box-shadow: 0px 2px rgba(143, 143, 143, 0.3) inset; } -.pos .paymentline-input:focus{ - color: rgb(130, 124, 255); - box-shadow: 0px 2px rgba(219, 219, 219, 0.3) inset; - -webkit-animation: all 250ms linear; +.pos .paymentline > *{ + padding: 8px; } - -.paymentline-delete { - width: 32px; - height: 32px; - padding: 5px; - text-align: center; - box-sizing: border-box; - -moz-box-sizing: border-box; - position: absolute; - bottom: 10px; - left: 8px; +.pos .paymentline .delete-button{ cursor: pointer; + text-align: center; +} +.pos .payment-buttons { + display: inline-block; + width: 300px; + margin: 16px; + margin-right: 0px; + float: left; } -.pos .pos-payment-container .left-block{ - display: inline-block; - width:49%; - margin:0; - padding:0; - text-align:left; -} -.pos .pos-payment-container .infoline{ - margin-top:5px; - margin-bottom:5px; +.payment-screen .payment-buttons .button { + background: rgb(221, 221, 221); + line-height: 48px; + margin-bottom: 4px; + border-radius: 3px; + font-size: 16px; padding: 0px 8px; - opacity: 0.5; + border: solid 1px rgb(202, 202, 202); + cursor: pointer; + text-align: center; } -.pos .pos-payment-container .infoline.bigger{ - opacity: 1; - font-size: 20px; +.payment-screen .paymentlines-empty .total { + text-align: center; + padding: 24px 0px 18px; + font-size: 64px; + color: #43996E; + text-shadow: 0px 2px white, 0px 2px 2px rgba(0, 0, 0, 0.27); } -.pos .pos-payment-container .right-block{ - display: inline-block; - width:49%; - margin:0; - padding:0; - text-align:right; -} -.pos .paymentline.selected{ - background: rgb(220,220,220); +.payment-screen .paymentlines-empty .message { + text-align: center; } /* c) The receipt screen */ @@ -1488,10 +1488,12 @@ td { font-size: 24px; vertical-align: top; } -.splitbill-screen .paymentmethods { +.splitbill-screen .paymentmethods, +.payment-screen .paymentmethods { margin: 16px; } -.splitbill-screen .paymentmethod { +.splitbill-screen .paymentmethod, +.payment-screen .paymentmethod { background: rgb(221, 221, 221); line-height: 40px; margin-bottom: 4px; @@ -1501,6 +1503,14 @@ td { cursor: pointer; text-align: center; } +.splitbill-screen .paymentmethod.active, +.payment-screen .paymentmethod.active { + background: #6EC89B; + color: white; + border-color: #6EC89B; +} + + /* ********* The ActionBarWidget ********* */ diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index d351fee5ff1..30699e7b237 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -996,11 +996,39 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal return sum + paymentLine.get_amount(); }), 0); }, - getChange: function() { - return this.getPaidTotal() - this.getTotalTaxIncluded(); + getChange: function(paymentline) { + if (!paymentline) { + var change = this.getPaidTotal() - this.getTotalTaxIncluded(); + } else { + var change = -this.getTotalTaxIncluded(); + var lines = this.get('paymentLines').models; + for (var i = 0; i < lines.length; i++) { + change += lines[i].get_amount(); + if (lines[i] === paymentline) { + break; + } + } + } + return round_pr(Math.max(0,change), this.pos.currency.rounding); }, - getDueLeft: function() { - return this.getTotalTaxIncluded() - this.getPaidTotal(); + getDueLeft: function(paymentline) { + if (!paymentline) { + var due = this.getTotalTaxIncluded() - this.getPaidTotal(); + } else { + var due = this.getTotalTaxIncluded(); + var lines = this.get('paymentLines').models; + for (var i = 0; i < lines.length; i++) { + if (lines[i] === paymentline) { + break; + } else { + due -= lines[i].get_amount(); + } + } + } + return round_pr(Math.max(0,due), this.pos.currency.rounding); + }, + isPaid: function(){ + return this.getDueLeft() === 0; }, // sets the type of receipt 'receipt'(default) or 'invoice' set_receipt_type: function(type){ @@ -1032,6 +1060,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal } } }, + // remove all the paymentlines with zero money in it + clean_empty_paymentlines: function() { + var lines = this.get('paymentLines').models; + var empty = []; + for ( var i = 0; i < lines.length; i++) { + if (!lines[i].get_amount()) { + empty.push(lines[i]); + } + } + for ( var i = 0; i < empty.length; i++) { + this.removePaymentline(empty[i]); + } + }, //see set_screen_data get_screen_data: function(key){ return this.screen_data[key]; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index deefd638310..872a1fd1769 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -849,6 +849,98 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); + module.NewPaymentScreenWidget = module.ScreenWidget.extend({ + template: 'NewPaymentScreenWidget', + back_screen: 'product', + next_screen: 'receipt', + show_leftpane: false, + show_numpad: false, + init: function(parent, options) { + this._super(parent, options); + this.pos.bind('change:selectedOrder',function(){ + this.bind_events(); + this.renderElement(); + },this); + }, + click_numpad: function(button){ + console.log(button); + }, + render_numpad: function() { + var numpad = $(QWeb.render('PaymentScreen-Numpad', { widget:this })); + return numpad; + }, + click_delete_paymentline: function(cid){ + var lines = this.pos.get_order().get('paymentLines').models; + for ( var i = 0; i < lines.length; i++ ) { + if (lines[i].cid === cid) { + this.pos.get_order().removePaymentline(lines[i]); + this.render_paymentlines(); + return; + } + } + }, + render_paymentlines: function() { + var self = this; + var order = this.pos.get_order(); + var lines = order.get('paymentLines').models; + + this.$('.paymentlines-container').empty(); + var lines = $(QWeb.render('PaymentScreen-Paymentlines', { + widget: this, + order: order, + paymentlines: lines, + })); + + lines.on('click','.delete-button',function(){ + self.click_delete_paymentline($(this).data('cid')); + }); + + lines.appendTo(this.$('.paymentlines-container')); + }, + click_paymentmethods: function(id){ + var cashregister = null; + for ( var i = 0; i < this.pos.cashregisters.length; i++ ) { + if ( this.pos.cashregisters[i].journal_id[0] === id ){ + cashregister = this.pos.cashregisters[i]; + break; + } + } + this.pos.get_order().addPaymentline( cashregister ); + this.render_paymentlines(); + }, + render_paymentmethods: function() { + var self = this; + var methods = $(QWeb.render('PaymentScreen-Paymentmethods', { widget:this })); + methods.on('click','.paymentmethod',function(){ + self.click_paymentmethods($(this).data('id')); + }); + return methods; + }, + renderElement: function() { + var self = this; + this._super(); + + var numpad = this.render_numpad(); + numpad.appendTo(this.$('.payment-numpad')); + + var methods = this.render_paymentmethods(); + methods.appendTo(this.$('.paymentmethods-container')); + + this.render_paymentlines(); + + this.$('.back').click(function(){ + self.pos_widget.screen_selector.back(); + }); + + }, + show: function(){ + this.pos.get_order().clean_empty_paymentlines(); + this.render_paymentlines(); + this._super(); + }, + + }); + module.PaymentScreenWidget = module.ScreenWidget.extend({ template: 'PaymentScreenWidget', back_screen: 'products', diff --git a/addons/point_of_sale/static/src/js/widget_base.js b/addons/point_of_sale/static/src/js/widget_base.js index 648ab725f9e..c3f7d2baf5f 100644 --- a/addons/point_of_sale/static/src/js/widget_base.js +++ b/addons/point_of_sale/static/src/js/widget_base.js @@ -1,5 +1,7 @@ function openerp_pos_basewidget(instance, module){ //module is instance.point_of_sale + var round_pr = instance.web.round_precision + // This is a base class for all Widgets in the POS. It exposes relevant data to the // templates : // - widget.currency : { symbol: '$' | '€' | ..., position: 'before' | 'after } @@ -27,6 +29,12 @@ function openerp_pos_basewidget(instance, module){ //module is instance.point_of var decimals = Math.max(0,Math.ceil(Math.log(1.0 / this.currency.rounding) / Math.log(10))); + this.format_currency_no_symbol = function(amount){ + amount = round_pr(amount,this.currency.rounding); + amount = amount.toFixed(decimals); + return amount; + }; + this.format_currency = function(amount){ if(typeof amount === 'number'){ amount = Math.round(amount*100)/100; @@ -37,7 +45,7 @@ function openerp_pos_basewidget(instance, module){ //module is instance.point_of }else{ return this.currency.symbol + ' ' + amount; } - } + }; }, show: function(){ diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index c5943870f41..9747848a3f6 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -1067,7 +1067,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.receipt_screen = new module.ReceiptScreenWidget(this, {}); this.receipt_screen.appendTo(this.$('.screens')); - this.payment_screen = new module.PaymentScreenWidget(this, {}); + this.payment_screen = new module.NewPaymentScreenWidget(this, {}); this.payment_screen.appendTo(this.$('.screens')); this.clientlist_screen = new module.ClientListScreenWidget(this, {}); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 6af641d2fd2..98317a167e6 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -389,7 +389,146 @@
      + + +
      +
      + +
      +
      + Please select a payment method. +
      +
      +       + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      DueTenderedChangeMethod
      +       + +       + + +
      + + + + +
      + + + + +
      + + + + +
      + + + + +
      +
      +       + + +
      + +
      + +
      +       +
      +       + +
      +
      +
      + + + Back + +

      Payment

      + + Validate + + +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      + +
      + Invoice +
      +       + +
      + Open Cashbox +
      +       +
      + +
      +
      + +
      +
      +
      + +
      From 1f39a7d640448acfb817fd83d9f68d80ecda68f1 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 7 Aug 2014 17:28:46 +0200 Subject: [PATCH 26/34] [IMP] point_of_sale: new payment screen is now operational --- addons/point_of_sale/static/src/css/pos.css | 18 +- addons/point_of_sale/static/src/js/models.js | 8 + addons/point_of_sale/static/src/js/screens.js | 468 ++++++------------ addons/point_of_sale/static/src/js/widgets.js | 2 +- addons/point_of_sale/static/src/xml/pos.xml | 91 ++-- 5 files changed, 211 insertions(+), 376 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 15cf3112c3c..e828736e4d6 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -996,7 +996,7 @@ td { .pos .payment-numpad { display: inline-block; - width: 230px; + width: 232px; margin-top: 8px; margin-right: 8px; float: right; @@ -1024,7 +1024,7 @@ td { border-radius: 3px; } .pos .paymentline{ - font-size: 18px; + font-size: 22px; } .pos .paymentline.selected { font-size: 22px; @@ -1035,13 +1035,25 @@ td { background: white; color: #6EC89B; outline: 3px blue; - border: solid 4px #6EC89B; + box-shadow: 0px 0px 0px 3px #6EC89B; + position: relative; border-radius: 3px; } .pos .paymentline > *{ padding: 8px; } +.pos .paymentline .col-due, +.pos .paymentline .col-tendered, +.pos .paymentline .col-change { + min-width: 80px; +} +.pos .paymentline .col-change.highlight { + background: rgb(184, 152, 204); +} +.pos .paymentline .col-name { + font-size: 16px; +} .pos .paymentline .delete-button{ cursor: pointer; text-align: center; diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 30699e7b237..02a84c61b51 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -1030,6 +1030,14 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal isPaid: function(){ return this.getDueLeft() === 0; }, + isPaidWithCash: function(){ + return !!this.get('paymentLines').find( function(pl){ + return pl.cashregister.journal.type === 'cash'; + }); + }, + finalize: function(){ + this.destroy(); + }, // sets the type of receipt 'receipt'(default) or 'invoice' set_receipt_type: function(type){ this.receipt_type = type; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 872a1fd1769..0e6d56881fb 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -783,9 +783,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa module.ReceiptScreenWidget = module.ScreenWidget.extend({ template: 'ReceiptScreenWidget', - - show_numpad: true, - show_leftpane: true, + show_numpad: false, + show_leftpane: false, show: function(){ this._super(); @@ -849,24 +848,102 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); - module.NewPaymentScreenWidget = module.ScreenWidget.extend({ - template: 'NewPaymentScreenWidget', + module.PaymentScreenWidget = module.ScreenWidget.extend({ + template: 'PaymentScreenWidget', back_screen: 'product', next_screen: 'receipt', show_leftpane: false, show_numpad: false, init: function(parent, options) { + var self = this; this._super(parent, options); + this.pos.bind('change:selectedOrder',function(){ - this.bind_events(); this.renderElement(); + this.watch_order_changes(); },this); + this.watch_order_changes(); + + this.inputbuffer = ""; + this.keyboard_handler = function(event){ + var key = ''; + if ( event.keyCode === 13 ) { // Enter + self.validate_order(); + } else if ( event.keyCode === 190 ) { // Dot + key = '.'; + } else if ( event.keyCode === 46 ) { // Delete + key = 'CLEAR'; + } else if ( event.keyCode === 8 ) { // Backspace + key = 'BACKSPACE'; + event.preventDefault(); // Prevents history back nav + } else if ( event.keyCode >= 48 && event.keyCode <= 57 ){ // Numbers + key = '' + (event.keyCode - 48); + } else if ( event.keyCode >= 96 && event.keyCode <= 105 ){ // Numpad Numbers + key = '' + (event.keyCode - 96); + } else if ( event.keyCode === 189 || event.keyCode === 109 ) { // Minus + key = '-'; + } else if ( event.keyCode === 107 ) { // Plus + key = '+'; + } + + self.payment_input(key); + + }; }, - click_numpad: function(button){ - console.log(button); + // resets the current input buffer + reset_input: function(){ + this.inputbuffer = ""; + }, + // handle both keyboard and numpad input. Accepts + // a string that represents the key pressed. + payment_input: function(input) { + var oldbuf = this.inputbuffer.slice(0); + + if (input === '.') { + if (!this.inputbuffer.length || this.inputbuffer === '-') { + this.inputbuffer += "0."; + } else if (this.inputbuffer.indexOf('.') < 0){ + this.inputbuffer = this.inputbuffer + '.'; + } + } else if (input === 'CLEAR') { + this.inputbuffer = ""; + } else if (input === 'BACKSPACE') { + this.inputbuffer = this.inputbuffer.substring(0,this.inputbuffer.length - 1); + } else if (input === '+') { + if ( this.inputbuffer[0] === '-' ) { + this.inputbuffer = this.inputbuffer.substring(1,this.inputbuffer.length); + } + } else if (input === '-') { + if ( this.inputbuffer[0] === '-' ) { + this.inputbuffer = this.inputbuffer.substring(1,this.inputbuffer.length); + } else { + this.inputbuffer = '-' + this.inputbuffer; + } + } else if (input[0] === '+' && !isNaN(parseFloat(input))) { + this.inputbuffer = '' + ((parseFloat(this.inputbuffer) || 0) + parseFloat(input)); + } else if (!isNaN(parseInt(input))) { + this.inputbuffer += input; + } + + if (this.inputbuffer !== oldbuf) { + var order = this.pos.get_order(); + if (order.selected_paymentline) { + order.selected_paymentline.set_amount(parseFloat(this.inputbuffer)); + this.order_changes(); + this.render_paymentlines(); + this.$('.paymentline.selected .edit').text(this.inputbuffer); + } + } + }, + click_numpad: function(button) { + this.payment_input(button.data('action')); }, render_numpad: function() { + var self = this; var numpad = $(QWeb.render('PaymentScreen-Numpad', { widget:this })); + numpad.on('click','button',function(){ + self.click_numpad($(this)); + }); return numpad; }, click_delete_paymentline: function(cid){ @@ -874,6 +951,18 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa for ( var i = 0; i < lines.length; i++ ) { if (lines[i].cid === cid) { this.pos.get_order().removePaymentline(lines[i]); + this.reset_input(); + this.render_paymentlines(); + return; + } + } + }, + click_paymentline: function(cid){ + var lines = this.pos.get_order().get('paymentLines').models; + for ( var i = 0; i < lines.length; i++ ) { + if (lines[i].cid === cid) { + this.pos.get_order().selectPaymentline(lines[i]); + this.reset_input(); this.render_paymentlines(); return; } @@ -894,10 +983,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa lines.on('click','.delete-button',function(){ self.click_delete_paymentline($(this).data('cid')); }); + + lines.on('click','.paymentline',function(){ + self.click_paymentline($(this).data('cid')); + }); lines.appendTo(this.$('.paymentlines-container')); }, - click_paymentmethods: function(id){ + click_paymentmethods: function(id) { var cashregister = null; for ( var i = 0; i < this.pos.cashregisters.length; i++ ) { if ( this.pos.cashregisters[i].journal_id[0] === id ){ @@ -906,6 +999,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa } } this.pos.get_order().addPaymentline( cashregister ); + this.reset_input(); this.render_paymentlines(); }, render_paymentmethods: function() { @@ -932,355 +1026,95 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa self.pos_widget.screen_selector.back(); }); + this.$('.next').click(function(){ + self.validate_order(); + }); + + this.$('.js_invoice').click(function(){ + self.validate_order({invoice: true}); + }); + }, show: function(){ this.pos.get_order().clean_empty_paymentlines(); + this.reset_input(); this.render_paymentlines(); + window.document.body.addEventListener('keydown',this.keyboard_handler); this._super(); }, - - }); - - module.PaymentScreenWidget = module.ScreenWidget.extend({ - template: 'PaymentScreenWidget', - back_screen: 'products', - next_screen: 'receipt', - init: function(parent, options) { + hide: function(){ + window.document.body.removeEventListener('keydown',this.keyboard_handler); + this._super(); + }, + // sets up listeners to watch for order changes + watch_order_changes: function() { var self = this; - this._super(parent,options); - - this.pos.bind('change:selectedOrder',function(){ - this.bind_events(); - this.renderElement(); - },this); - - this.bind_events(); - - this.line_delete_handler = function(event){ - var node = this; - while(node && !node.classList.contains('paymentline')){ - node = node.parentNode; - } - if(node){ - self.pos.get('selectedOrder').removePaymentline(node.line) - } - event.stopPropagation(); - }; - - this.line_change_handler = function(event){ - var node = this; - while(node && !node.classList.contains('paymentline')){ - node = node.parentNode; - } - if(node){ - node.line.set_amount(this.value); - } - }; - - this.line_click_handler = function(event){ - var node = this; - while(node && !node.classList.contains('paymentline')){ - node = node.parentNode; - } - if(node){ - self.pos.get('selectedOrder').selectPaymentline(node.line); - } - }; - - this.hotkey_handler = function(event){ - if(event.which === 13){ - self.validate_order(); - }else if(event.which === 27){ - self.back(); - } - }; - - }, - show: function(){ - this._super(); - var self = this; - - this.enable_numpad(); - this.focus_selected_line(); - - document.body.addEventListener('keyup', this.hotkey_handler); - - this.add_action_button({ - label: _t('Back'), - icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png', - click: function(){ - self.back(); - }, - }); - - this.add_action_button({ - label: _t('Validate'), - name: 'validation', - icon: '/point_of_sale/static/src/img/icons/png48/validate.png', - click: function(){ - self.validate_order(); - }, - }); - - if( this.pos.config.iface_invoicing ){ - this.add_action_button({ - label: 'Invoice', - name: 'invoice', - icon: '/point_of_sale/static/src/img/icons/png48/invoice.png', - click: function(){ - self.validate_order({invoice: true}); - }, - }); - } - - if( this.pos.config.iface_cashdrawer ){ - this.add_action_button({ - label: _t('Cash'), - name: 'cashbox', - icon: '/point_of_sale/static/src/img/open-cashbox.png', - click: function(){ - self.pos.proxy.open_cashbox(); - }, - }); - } - - this.update_payment_summary(); - - }, - close: function(){ - this._super(); - this.disable_numpad(); - document.body.removeEventListener('keyup',this.hotkey_handler); - }, - remove_empty_lines: function(){ - var order = this.pos.get('selectedOrder'); - var lines = order.get('paymentLines').models.slice(0); - for(var i = 0; i < lines.length; i++){ - var line = lines[i]; - if(line.get_amount() === 0){ - order.removePaymentline(line); - } - } - }, - back: function() { - this.remove_empty_lines(); - this.pos_widget.screen_selector.set_current_screen(this.back_screen); - }, - bind_events: function() { + var order = this.pos.get_order(); if(this.old_order){ this.old_order.unbind(null,null,this); } - var order = this.pos.get('selectedOrder'); - order.bind('change:selected_paymentline',this.focus_selected_line,this); - + order.bind('all',function(){ + self.order_changes(); + }); this.old_order = order; - - if(this.old_paymentlines){ - this.old_paymentlines.unbind(null,null,this); - } - var paymentlines = order.get('paymentLines'); - paymentlines.bind('add', this.add_paymentline, this); - paymentlines.bind('change:selected', this.rerender_paymentline, this); - paymentlines.bind('change:amount', function(line){ - if(!line.selected && line.node){ - line.node.value = line.amount.toFixed(2); - } - this.update_payment_summary(); - },this); - paymentlines.bind('remove', this.remove_paymentline, this); - paymentlines.bind('all', this.update_payment_summary, this); - - this.old_paymentlines = paymentlines; - - if(this.old_orderlines){ - this.old_orderlines.unbind(null,null,this); - } - var orderlines = order.get('orderLines'); - orderlines.bind('all', this.update_payment_summary, this); - - this.old_orderlines = orderlines; }, - focus_selected_line: function(){ - var line = this.pos.get('selectedOrder').selected_paymentline; - if(line){ - var input = line.node.querySelector('input'); - if(!input){ - return; - } - var value = input.value; - input.focus(); - - if(this.numpad_state){ - this.numpad_state.reset(); - } - - if(Number(value) === 0){ - input.value = ''; - }else{ - input.value = value; - input.select(); - } + // called when the order is changed, used to show if + // the order is paid or not + order_changes: function(){ + var order = this.pos.get_order(); + console.log('change!'); + if (order.isPaid()) { + self.$('.next').addClass('highlight'); + }else{ + self.$('.next').removeClass('highlight'); } }, - add_paymentline: function(line) { - var list_container = this.el.querySelector('.payment-lines'); - list_container.appendChild(this.render_paymentline(line)); - - if(this.numpad_state){ - this.numpad_state.reset(); - } - }, - render_paymentline: function(line){ - var el_html = openerp.qweb.render('Paymentline',{widget: this, line: line}); - el_html = _.str.trim(el_html); - - var el_node = document.createElement('tbody'); - el_node.innerHTML = el_html; - el_node = el_node.childNodes[0]; - el_node.line = line; - el_node.querySelector('.paymentline-delete') - .addEventListener('click', this.line_delete_handler); - el_node.addEventListener('click', this.line_click_handler); - el_node.querySelector('input') - .addEventListener('keyup', this.line_change_handler); - - line.node = el_node; - - return el_node; - }, - rerender_paymentline: function(line){ - var old_node = line.node; - var new_node = this.render_paymentline(line); - - old_node.parentNode.replaceChild(new_node,old_node); - }, - remove_paymentline: function(line){ - line.node.parentNode.removeChild(line.node); - line.node = undefined; - }, - renderElement: function(){ - this._super(); - - var paymentlines = this.pos.get('selectedOrder').get('paymentLines').models; - var list_container = this.el.querySelector('.payment-lines'); - - for(var i = 0; i < paymentlines.length; i++){ - list_container.appendChild(this.render_paymentline(paymentlines[i])); - } - - this.update_payment_summary(); - }, - update_payment_summary: function() { - var currentOrder = this.pos.get('selectedOrder'); - var paidTotal = currentOrder.getPaidTotal(); - var dueTotal = currentOrder.getTotalTaxIncluded(); - var remaining = dueTotal > paidTotal ? dueTotal - paidTotal : 0; - var change = paidTotal > dueTotal ? paidTotal - dueTotal : 0; - - this.$('.payment-due-total').html(this.format_currency(dueTotal)); - this.$('.payment-paid-total').html(this.format_currency(paidTotal)); - this.$('.payment-remaining').html(this.format_currency(remaining)); - this.$('.payment-change').html(this.format_currency(change)); - if(currentOrder.selected_orderline === undefined){ - remaining = 1; // What is this ? - } - - if(this.pos_widget.action_bar){ - this.pos_widget.action_bar.set_button_disabled('validation', !this.is_paid()); - this.pos_widget.action_bar.set_button_disabled('invoice', !this.is_paid()); - } - }, - is_paid: function(){ - var currentOrder = this.pos.get('selectedOrder'); - return (currentOrder.getTotalTaxIncluded() < 0.000001 - || currentOrder.getPaidTotal() + 0.000001 >= currentOrder.getTotalTaxIncluded()); - - }, + // Check if the order is paid, then sends it to the backend, + // and complete the sale process validate_order: function(options) { var self = this; options = options || {}; - var currentOrder = this.pos.get('selectedOrder'); + var order = this.pos.get_order(); - if(!this.is_paid()){ + if (!order.isPaid() || this.invoicing) { return; } - if( this.pos.config.iface_cashdrawer - && this.pos.get('selectedOrder').get('paymentLines').find( function(pl){ - return pl.cashregister.journal.type === 'cash'; - })){ + if (order.isPaidWithCash() && this.pos.config.iface_cashdrawer) { this.pos.proxy.open_cashbox(); } - if(options.invoice){ - // deactivate the validation button while we try to send the order - this.pos_widget.action_bar.set_button_disabled('validation',true); - this.pos_widget.action_bar.set_button_disabled('invoice',true); - - var invoiced = this.pos.push_and_invoice_order(currentOrder); + if (options.invoice) { + var invoiced = this.pos.push_and_invoice_order(order); + this.invoicing = true; invoiced.fail(function(error){ - if(error === 'error-no-client'){ + self.invoicing = false; + if (error === 'error-no-client') { self.pos_widget.screen_selector.show_popup('error-no-client'); - }else{ + } else { self.pos_widget.screen_selector.show_popup('error-invoice-transfer'); } - self.pos_widget.action_bar.set_button_disabled('validation',false); - self.pos_widget.action_bar.set_button_disabled('invoice',false); }); invoiced.done(function(){ - self.pos_widget.action_bar.set_button_disabled('validation',false); - self.pos_widget.action_bar.set_button_disabled('invoice',false); - self.pos.get('selectedOrder').destroy(); + self.invoicing = false; + order.finalize(); }); - - }else{ - this.pos.push_order(currentOrder) - if(this.pos.config.iface_print_via_proxy){ + } else { + this.pos.push_order(order) + if (this.pos.config.iface_print_via_proxy) { var receipt = currentOrder.export_for_printing(); this.pos.proxy.print_receipt(QWeb.render('XmlReceipt',{ receipt: receipt, widget: self, })); - this.pos.get('selectedOrder').destroy(); //finish order and go back to scan screen - }else{ + order.finalize(); //finish order and go back to scan screen + } else { this.pos_widget.screen_selector.set_current_screen(this.next_screen); } } - - // hide onscreen (iOS) keyboard - setTimeout(function(){ - document.activeElement.blur(); - $("input").blur(); - },250); - }, - enable_numpad: function(){ - this.disable_numpad(); //ensure we don't register the callbacks twice - this.numpad_state = this.pos_widget.numpad.state; - if(this.numpad_state){ - this.numpad_state.reset(); - this.numpad_state.changeMode('payment'); - this.numpad_state.bind('set_value', this.set_value, this); - this.numpad_state.bind('change:mode', this.set_mode_back_to_payment, this); - } - - }, - disable_numpad: function(){ - if(this.numpad_state){ - this.numpad_state.unbind('set_value', this.set_value); - this.numpad_state.unbind('change:mode',this.set_mode_back_to_payment); - } - }, - set_mode_back_to_payment: function() { - this.numpad_state.set({mode: 'payment'}); - }, - set_value: function(val) { - var selected_line =this.pos.get('selectedOrder').selected_paymentline; - if(selected_line){ - selected_line.set_amount(val); - selected_line.node.querySelector('input').value = selected_line.amount.toFixed(2); - } }, }); + } diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 9747848a3f6..c5943870f41 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -1067,7 +1067,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.receipt_screen = new module.ReceiptScreenWidget(this, {}); this.receipt_screen.appendTo(this.$('.screens')); - this.payment_screen = new module.NewPaymentScreenWidget(this, {}); + this.payment_screen = new module.PaymentScreenWidget(this, {}); this.payment_screen.appendTo(this.$('.screens')); this.clientlist_screen = new module.ClientListScreenWidget(this, {}); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 98317a167e6..0849244155e 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -423,19 +423,29 @@ - - - - + + + + + + + + + + - - - - - + + + + + + + + + @@ -448,25 +458,25 @@
      - - - - + + + +
      - - - - + + + +
      - - - - + + + +
      - - - - + + +
      @@ -483,7 +493,7 @@
      - +
      @@ -530,35 +540,6 @@ - -
      -
      -
      -
      -
      -
      - - Paid: - - -
      -
      - - Remaining: - - -
      -
      - - Change: - - -
      -
      -
      -
      -       -
      From 8c962cbdefa40cc209659a47386958761cc88123 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 7 Aug 2014 17:36:24 +0200 Subject: [PATCH 27/34] [FIX] point_of_sale: removed console.log + fixed paid status update due to missing self declaration --- addons/point_of_sale/static/src/js/screens.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 0e6d56881fb..3132cb507f8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -1039,6 +1039,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.pos.get_order().clean_empty_paymentlines(); this.reset_input(); this.render_paymentlines(); + this.order_changes(); window.document.body.addEventListener('keydown',this.keyboard_handler); this._super(); }, @@ -1061,8 +1062,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa // called when the order is changed, used to show if // the order is paid or not order_changes: function(){ + var self = this; var order = this.pos.get_order(); - console.log('change!'); if (order.isPaid()) { self.$('.next').addClass('highlight'); }else{ From 78e79073b9992068ed0f1e4655881b3e0432c0ba Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Thu, 7 Aug 2014 18:56:25 +0200 Subject: [PATCH 28/34] [IMP] point_of_sale: reworked the receipt screen to be in style with the payment screen --- addons/point_of_sale/static/src/css/pos.css | 30 ++++++++++-- addons/point_of_sale/static/src/js/screens.js | 49 ++++++++++--------- addons/point_of_sale/static/src/xml/pos.xml | 18 +++++-- 3 files changed, 67 insertions(+), 30 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index e828736e4d6..f15862706cd 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -1090,8 +1090,19 @@ td { /* c) The receipt screen */ +.pos .receipt-screen .centered-content .button { + line-height: 32px; + padding: 3px 13px; + font-size: 20px; + background: rgb(230, 230, 230); + margin: 12px; + border-radius: 3px; + border: solid 1px rgb(209, 209, 209); + cursor: pointer; +} .pos .pos-receipt-container { font-size: 0.75em; + text-align: center; } .pos .pos-sale-ticket { @@ -1126,10 +1137,16 @@ td { } @media print { + body { + margin: 0; + } .oe_leftbar, .pos .pos-topheader, .pos .pos-leftpane, - .pos .keyboard_frame { + .pos .keyboard_frame, + .pos .receipt-screen header, + .pos .receipt-screen .top-content, + .pos .receipt-screen .centered-content .button { display: none !important; } .pos, @@ -1150,12 +1167,17 @@ td { left: 0px !important; background-color: white; } - .pos .receipt-screen header { - display: none !important; - } .pos .receipt-screen { text-align: left; } + .pos .receipt-screen .centered-content{ + position: static; + border: none; + margin: none; + } + .pos .pos-receipt-container { + text-align: left; + } .pos-actionbar { display: none !important; } diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 3132cb507f8..a61f1e007d8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -790,22 +790,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this._super(); var self = this; - var print_button = this.add_action_button({ - label: _t('Print'), - icon: '/point_of_sale/static/src/img/icons/png48/printer.png', - click: function(){ self.print(); }, - }); - - var finish_button = this.add_action_button({ - label: _t('Next Order'), - icon: '/point_of_sale/static/src/img/icons/png48/go-next.png', - click: function() { self.finishOrder(); }, - }); - this.refresh(); this.print(); - // // The problem is that in chrome the print() is asynchronous and doesn't // execute until all rpc are finished. So it conflicts with the rpc used // to send the orders to the backend, and the user is able to go to the next @@ -822,32 +809,48 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa // 2 seconds is the same as the default timeout for sending orders and so the dialog // should have appeared before the timeout... so yeah that's not ultra reliable. - finish_button.set_disabled(true); + this.lock_screen(true); setTimeout(function(){ - finish_button.set_disabled(false); + self.lock_screen(false); }, 2000); }, + lock_screen: function(locked) { + this._locked = locked; + if (locked) { + this.$('.next').removeClass('highlight'); + } else { + this.$('.next').addClass('highlight'); + } + }, print: function() { window.print(); }, - finishOrder: function() { - this.pos.get('selectedOrder').destroy(); + finish_order: function() { + if (!this._locked) { + this.pos.get_order().finalize(); + } + }, + renderElement: function() { + var self = this; + this._super(); + this.$('.next').click(function(){ + self.finish_order(); + }); + this.$('.button.print').click(function(){ + self.print(); + }); }, refresh: function() { - var order = this.pos.get('selectedOrder'); - $('.pos-receipt-container', this.$el).html(QWeb.render('PosTicket',{ + var order = this.pos.get_order(); + this.$('.pos-receipt-container').html(QWeb.render('PosTicket',{ widget:this, order: order, orderlines: order.get('orderLines').models, paymentlines: order.get('paymentLines').models, })); }, - close: function(){ - this._super(); - } }); - module.PaymentScreenWidget = module.ScreenWidget.extend({ template: 'PaymentScreenWidget', back_screen: 'product', diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 0849244155e..7de5e1cf0a4 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -541,9 +541,21 @@ -
      -
      -
      +
      +
      +
      +

      Receipt

      + + Next Order + + +
      +
      +
      + Print +
      +
      +
      From daaf9eb23b5a69fc6ca9e31b860c4825c74fd75d Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Fri, 8 Aug 2014 12:22:13 +0200 Subject: [PATCH 29/34] [IMP] point_of_sale: layout improvements on the payment screen + fix some styling issues + use most common notes value on the numpad --- addons/point_of_sale/static/src/css/pos.css | 37 ++++++++++++--------- addons/point_of_sale/static/src/xml/pos.xml | 11 +++--- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index f15862706cd..9083687a89e 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -933,7 +933,7 @@ td { border-right: dashed 1px rgb(215,215,215); } .screen .left-content.pc40{ - right: 60%; + right: 66%; } .screen .right-content{ position: absolute; @@ -943,7 +943,7 @@ td { overflow-y: auto; } .screen .right-content.pc60{ - left:40% + left:34% } .screen .centered-content{ position: absolute; @@ -996,17 +996,22 @@ td { .pos .payment-numpad { display: inline-block; - width: 232px; - margin-top: 8px; - margin-right: 8px; - float: right; + width: 50%; + box-sizing: border-box; + padding: 8px; + text-align: center; + float: left; +} +.pos .payment-numpad .numpad button { + width: 66px; + height: 66px; } .pos .paymentlines-container { padding: 16px; padding-top: 0; border-bottom: dashed 1px gainsboro; - min-height: 148px; + min-height: 154px; } .pos .paymentlines { @@ -1041,12 +1046,12 @@ td { } .pos .paymentline > *{ - padding: 8px; + padding: 8px 12px; } .pos .paymentline .col-due, .pos .paymentline .col-tendered, .pos .paymentline .col-change { - min-width: 80px; + min-width: 90px; } .pos .paymentline .col-change.highlight { background: rgb(184, 152, 204); @@ -1060,10 +1065,10 @@ td { } .pos .payment-buttons { display: inline-block; - width: 300px; - margin: 16px; - margin-right: 0px; - float: left; + width: 50%; + box-sizing: border-box; + padding: 16px; + float: right; } .payment-screen .payment-buttons .button { @@ -1091,11 +1096,13 @@ td { /* c) The receipt screen */ .pos .receipt-screen .centered-content .button { - line-height: 32px; + line-height: 40px; padding: 3px 13px; font-size: 20px; + text-align: center; background: rgb(230, 230, 230); - margin: 12px; + margin: 16px; + margin-bottom: 0px; border-radius: 3px; border: solid 1px rgb(209, 209, 209); cursor: pointer; diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 7de5e1cf0a4..5c5c7e531ed 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -461,17 +461,17 @@ - +
      - +
      - +
      @@ -518,6 +518,9 @@
      +
      +
      +
      @@ -531,8 +534,6 @@
      -
      -
      From f8cc4fa242e7afc3a6d0b850762c191b8e852c89 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Fri, 8 Aug 2014 12:57:23 +0200 Subject: [PATCH 30/34] [IMP] point_of_sale: improved payment screen input handling --- addons/point_of_sale/static/src/js/screens.js | 21 ++++++++++++++++--- addons/point_of_sale/static/src/xml/pos.xml | 9 ++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index a61f1e007d8..d0c9e2847e1 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -868,6 +868,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.watch_order_changes(); this.inputbuffer = ""; + this.firstinput = true; this.keyboard_handler = function(event){ var key = ''; if ( event.keyCode === 13 ) { // Enter @@ -895,7 +896,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }, // resets the current input buffer reset_input: function(){ - this.inputbuffer = ""; + var line = this.pos.get_order().selected_paymentline; + this.firstinput = true; + if (line) { + this.inputbuffer = this.format_currency_no_symbol(line.get_amount()); + } else { + this.inputbuffer = ""; + } }, // handle both keyboard and numpad input. Accepts // a string that represents the key pressed. @@ -903,7 +910,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa var oldbuf = this.inputbuffer.slice(0); if (input === '.') { - if (!this.inputbuffer.length || this.inputbuffer === '-') { + if (this.firstinput) { + this.inputbuffer = "0."; + }else if (!this.inputbuffer.length || this.inputbuffer === '-') { this.inputbuffer += "0."; } else if (this.inputbuffer.indexOf('.') < 0){ this.inputbuffer = this.inputbuffer + '.'; @@ -925,9 +934,15 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa } else if (input[0] === '+' && !isNaN(parseFloat(input))) { this.inputbuffer = '' + ((parseFloat(this.inputbuffer) || 0) + parseFloat(input)); } else if (!isNaN(parseInt(input))) { - this.inputbuffer += input; + if (this.firstinput) { + this.inputbuffer = '' + input; + } else { + this.inputbuffer += input; + } } + this.firstinput = false; + if (this.inputbuffer !== oldbuf) { var order = this.pos.get_order(); if (order.selected_paymentline) { diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 5c5c7e531ed..34ca8b1d3fc 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -424,9 +424,14 @@ - + + + + - + + + From 92d4260d479c35ba1fb9a288e0ae01bddc065eb6 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Fri, 8 Aug 2014 13:01:20 +0200 Subject: [PATCH 31/34] [IMP] point_of_sale: replaced the dollar sign by a more international alternative --- addons/point_of_sale/static/src/css/pos.css | 3 ++- addons/point_of_sale/static/src/xml/pos.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 9083687a89e..e1e9a1c45f8 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -543,7 +543,8 @@ td { .pos .actionpad .button.pay .fa { display: block; font-size: 32px; - line-height: 60px; + line-height: 54px; + padding-top: 6px; background: rgb(86, 86, 86); color: white; width: 60px; diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 34ca8b1d3fc..c0fef767d5c 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -150,7 +150,7 @@ Set Customer
      From 7ce28ac75d0c6fd66b3544aa88ed3372d4e99c55 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 11 Aug 2014 11:21:11 +0200 Subject: [PATCH 32/34] [IMP] point_of_sale: let the cashier directly select the invoice's customer instead of displaying an unhelpful error message --- addons/point_of_sale/static/src/js/screens.js | 6 +----- addons/point_of_sale/static/src/js/widgets.js | 4 ---- addons/point_of_sale/static/src/xml/pos.xml | 13 ------------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index d0c9e2847e1..d4a20d1aef1 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -431,10 +431,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }, }); - module.ErrorNoClientPopupWidget = module.ErrorPopupWidget.extend({ - template: 'ErrorNoClientPopupWidget', - }); - module.ErrorInvoiceTransferPopupWidget = module.ErrorPopupWidget.extend({ template: 'ErrorInvoiceTransferPopupWidget', }); @@ -1111,7 +1107,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa invoiced.fail(function(error){ self.invoicing = false; if (error === 'error-no-client') { - self.pos_widget.screen_selector.show_popup('error-no-client'); + self.pos_widget.screen_selector.set_current_screen('clientlist'); } else { self.pos_widget.screen_selector.show_popup('error-invoice-transfer'); } diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index c5943870f41..33b421b9090 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -1091,9 +1091,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.choose_receipt_popup = new module.ChooseReceiptPopupWidget(this, {}); this.choose_receipt_popup.appendTo(this.$el); - this.error_no_client_popup = new module.ErrorNoClientPopupWidget(this, {}); - this.error_no_client_popup.appendTo(this.$el); - this.error_invoice_transfer_popup = new module.ErrorInvoiceTransferPopupWidget(this, {}); this.error_invoice_transfer_popup.appendTo(this.$el); @@ -1161,7 +1158,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa 'error-barcode': this.error_barcode_popup, 'error-session': this.error_session_popup, 'choose-receipt': this.choose_receipt_popup, - 'error-no-client': this.error_no_client_popup, 'error-invoice-transfer': this.error_invoice_transfer_popup, 'error-traceback': this.error_traceback_popup, 'confirm': this.confirm_popup, diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index c0fef767d5c..284ac787611 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -783,19 +783,6 @@
      - -
      -
      -

      An anonymous order cannot be invoiced

      -
      -
      - Ok -
      -
      -
      -
      -       -
      From a1ed181c6d5630d079d9b8debafca6a05dc55eb2 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 25 Aug 2014 15:36:30 +0200 Subject: [PATCH 33/34] [IMP] point_of_sale: The invoice button in the payment screen now sets the order to be invoiced instead of directly invoicing the order --- addons/point_of_sale/static/src/css/pos.css | 9 +++---- addons/point_of_sale/static/src/js/models.js | 7 ++++++ addons/point_of_sale/static/src/js/screens.js | 24 +++++++++++++++---- addons/point_of_sale/static/src/xml/pos.xml | 2 +- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index e1e9a1c45f8..1609e1b2633 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -496,10 +496,11 @@ td { margin-right: 4px; } -.pos .control-button.highlight{ - background: #6EC89B; - border: solid 1px #6EC89B; - color: white; +.pos .control-button.highlight, +.pos .button.highlight { + background: #6EC89B !important; + border: solid 1px #6EC89B !important; + color: white !important; } .pos .control-button:active { background: #7F82AC; diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 02a84c61b51..e57353fd231 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -864,6 +864,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal this.receipt_type = 'receipt'; // 'receipt' || 'invoice' this.temporary = attributes.temporary || false; this.sequence_number = this.pos.pos_session.sequence_number++; + this.to_invoice = false; return this; }, is_empty: function(){ @@ -1068,6 +1069,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal } } }, + set_to_invoice: function(to_invoice) { + this.to_invoice = to_invoice; + }, + is_to_invoice: function(){ + return this.to_invoice; + }, // remove all the paymentlines with zero money in it clean_empty_paymentlines: function() { var lines = this.get('paymentLines').models; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index d4a20d1aef1..4cf53f2fac3 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -1024,6 +1024,15 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); return methods; }, + click_invoice: function(){ + var order = this.pos.get_order(); + order.set_to_invoice(!order.is_to_invoice()); + if (order.is_to_invoice()) { + this.$('.js_invoice').addClass('highlight'); + } else { + this.$('.js_invoice').removeClass('highlight'); + } + }, renderElement: function() { var self = this; this._super(); @@ -1045,7 +1054,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); this.$('.js_invoice').click(function(){ - self.validate_order({invoice: true}); + self.click_invoice(); }); }, @@ -1086,9 +1095,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }, // Check if the order is paid, then sends it to the backend, // and complete the sale process - validate_order: function(options) { + validate_order: function() { var self = this; - options = options || {}; var order = this.pos.get_order(); @@ -1100,14 +1108,20 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.pos.proxy.open_cashbox(); } - if (options.invoice) { + if (order.is_to_invoice()) { var invoiced = this.pos.push_and_invoice_order(order); this.invoicing = true; invoiced.fail(function(error){ self.invoicing = false; if (error === 'error-no-client') { - self.pos_widget.screen_selector.set_current_screen('clientlist'); + self.pos_widget.screen_selector.show_popup('confirm',{ + message: _t('Please select the Customer'), + comment: _t('You need to select the customer before you can invoice an order.'), + confirm: function(){ + self.pos_widget.screen_selector.set_current_screen('clientlist'); + }, + }); } else { self.pos_widget.screen_selector.show_popup('error-invoice-transfer'); } diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 284ac787611..e2fdc392a40 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -528,7 +528,7 @@
      -
      +
      Invoice
      From 2b67528fe9e366829d44d8aba756bc6e359b4c61 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 25 Aug 2014 15:47:02 +0200 Subject: [PATCH 34/34] [IMP] point_of_sale: removed actionbars, were not used anymore --- addons/point_of_sale/static/src/js/screens.js | 27 ------ addons/point_of_sale/static/src/js/widgets.js | 88 ------------------- addons/point_of_sale/static/src/xml/pos.xml | 39 -------- 3 files changed, 154 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 4cf53f2fac3..fd1d1f69584 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -211,26 +211,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa barcode_error_action: function(code){ this.pos_widget.screen_selector.show_popup('error-barcode',code.code); }, - // shows an action bar on the screen. The actionbar is automatically shown when you add a button - // with add_action_button() - show_action_bar: function(){ - this.pos_widget.action_bar.show(); - }, - - // hides the action bar. The actionbar is automatically hidden when it is empty - hide_action_bar: function(){ - this.pos_widget.action_bar.hide(); - }, - - // adds a new button to the action bar. The button definition takes three parameters, all optional : - // - label: the text below the button - // - icon: a small icon that will be shown - // - click: a callback that will be executed when the button is clicked. - // the method returns a reference to the button widget, and automatically show the actionbar. - add_action_button: function(button_def){ - this.show_action_bar(); - return this.pos_widget.action_bar.add_new_button(button_def); - }, // this method shows the screen and sets up all the widget related to this screen. Extend this method // if you want to alter the behavior of the screen. @@ -242,12 +222,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.$el.removeClass('oe_hidden'); } - if(this.pos_widget.action_bar.get_button_count() > 0){ - this.show_action_bar(); - }else{ - this.hide_action_bar(); - } - var self = this; this.pos_widget.set_numpad_visible(this.show_numpad); @@ -270,7 +244,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa if(this.pos.barcode_reader){ this.pos.barcode_reader.reset_action_callbacks(); } - this.pos_widget.action_bar.destroy_buttons(); }, // this methods hides the screen. It's not a good place to put your cleanup stuff as it is called on the diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 33b421b9090..b5db7ee47e1 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -293,90 +293,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, }); - module.ActionButtonWidget = instance.web.Widget.extend({ - template:'ActionButtonWidget', - icon_template:'ActionButtonWidgetWithIcon', - init: function(parent, options){ - this._super(parent, options); - this.label = options.label || 'button'; - this.rightalign = options.rightalign || false; - this.click_action = options.click; - this.disabled = options.disabled || false; - if(options.icon){ - this.icon = options.icon; - this.template = this.icon_template; - } - }, - set_disabled: function(disabled){ - if(this.disabled != disabled){ - this.disabled = !!disabled; - this.renderElement(); - } - }, - renderElement: function(){ - this._super(); - if(this.click_action && !this.disabled){ - this.$el.click(_.bind(this.click_action, this)); - } - }, - }); - - module.ActionBarWidget = instance.web.Widget.extend({ - template:'ActionBarWidget', - init: function(parent, options){ - this._super(parent,options); - this.button_list = []; - this.buttons = {}; - this.visibility = {}; - }, - set_element_visible: function(element, visible, action){ - if(visible != this.visibility[element]){ - this.visibility[element] = !!visible; - if(visible){ - this.$('.'+element).removeClass('oe_hidden'); - }else{ - this.$('.'+element).addClass('oe_hidden'); - } - } - if(visible && action){ - this.action[element] = action; - this.$('.'+element).off('click').click(action); - } - }, - set_button_disabled: function(name, disabled){ - var b = this.buttons[name]; - if(b){ - b.set_disabled(disabled); - } - }, - destroy_buttons:function(){ - for(var i = 0; i < this.button_list.length; i++){ - this.button_list[i].destroy(); - } - this.button_list = []; - this.buttons = {}; - return this; - }, - get_button_count: function(){ - return this.button_list.length; - }, - add_new_button: function(button_options){ - var button = new module.ActionButtonWidget(this,button_options); - this.button_list.push(button); - if(button_options.name){ - this.buttons[button_options.name] = button; - } - button.appendTo(this.$('.pos-actionbar-button-list')); - return button; - }, - show:function(){ - this.$el.removeClass('oe_hidden'); - }, - hide:function(){ - this.$el.addClass('oe_hidden'); - }, - }); - module.ProductCategoriesWidget = module.PosBaseWidget.extend({ template: 'ProductCategoriesWidget', init: function(parent, options){ @@ -891,7 +807,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa // - a header, containing the list of orders // - a leftpane, containing the list of bought products (orderlines) // - a rightpane, containing the screens (see pos_screens.js) - // - an actionbar on the bottom, containing various action buttons // - popups // - an onscreen keyboard // a screen_selector which controls the switching between screens and the showing/closing of popups @@ -1125,9 +1040,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.username = new module.UsernameWidget(this,{}); this.username.replace(this.$('.placeholder-UsernameWidget')); - this.action_bar = new module.ActionBarWidget(this); - this.action_bar.replace(this.$(".placeholder-RightActionBar")); - this.actionpad = new module.ActionpadWidget(this, {}); this.actionpad.replace(this.$('.placeholder-ActionpadWidget')); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index e2fdc392a40..77dea42c5db 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -42,13 +42,6 @@
      -
      @@ -60,14 +53,6 @@
      - -
      @@ -1157,30 +1142,6 @@
      - -
      -
        -
      -
      -       - - -
    • -
      - -
      -
      • -       - - -
    • -
      - -
      -
      -
      • -       -