diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 9836e5d9280..0c44d3db3f0 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 ca09719a2f0..0485077d471 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -418,6 +418,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 cc9a8fe9e3a..ddc08545bea 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); @@ -1088,6 +1091,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.unsent_orders_popup = new module.UnsentOrdersPopupWidget(this,{}); + this.unsent_orders_popup.appendTo(this.$el); + // -------- Misc --------- this.close_button = new module.HeaderButtonWidget(this,{ @@ -1144,6 +1150,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa 'error-invoice-transfer': this.error_invoice_transfer_popup, 'error-traceback': this.error_traceback_popup, 'confirm': this.confirm_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 93f008ffab2..45f567f0be7 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -686,6 +686,29 @@ + + + +
@@ -793,6 +816,11 @@
  • Reference
  • +

    Unsent Orders

    +
      +
    • Show All Unsent Orders
    • +
    +

    Hardware Status

    • Weighting