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 @@ + + + +
@@ -838,6 +861,11 @@
  • Reference
  • +

    Unsent Orders

    +
      +
    • Show All Unsent Orders
    • +
    +

    Hardware Status

    • Weighting