From 0176c1fa3095c2658bd4097bf6078050e785b2da Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Sat, 13 Feb 2016 14:08:17 +0100 Subject: [PATCH] [ADD] feedback on the screen --- beescoop_pos/static/src/css/beescoop.css | 4 ++++ beescoop_pos/static/src/js/beescoop.js | 10 +++++++++- beescoop_pos/static/src/xml/templates.xml | 3 +++ beesdoo_pos/models/beesdoo_pos.py | 8 +++++--- beesdoo_pos/views/beesdoo_pos.xml | 1 + 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 beescoop_pos/static/src/css/beescoop.css diff --git a/beescoop_pos/static/src/css/beescoop.css b/beescoop_pos/static/src/css/beescoop.css new file mode 100644 index 0000000..a68e1ed --- /dev/null +++ b/beescoop_pos/static/src/css/beescoop.css @@ -0,0 +1,4 @@ +.message-send { + margin: 16px; + text-align: center; +} \ No newline at end of file diff --git a/beescoop_pos/static/src/js/beescoop.js b/beescoop_pos/static/src/js/beescoop.js index 055c594..79b6161 100644 --- a/beescoop_pos/static/src/js/beescoop.js +++ b/beescoop_pos/static/src/js/beescoop.js @@ -5,10 +5,13 @@ odoo.define('beescoop.pos', function (require) { module.ReceiptScreenWidget = module.ReceiptScreenWidget.include({ send : function() { + var self = this; var order = this.pos.get_order().name; var records = new Model('pos.order').call('send_order', [order], {}); records.then(function(result){ - console.log(result) + var el = self.$('.message-send') + el.empty(); + el.append('

' + result + '

'); },function(err){ loaded.reject(err); }); @@ -22,5 +25,10 @@ odoo.define('beescoop.pos', function (require) { } }); }, + show: function(){ + this._super(); + var self = this; + this.$('.message-send').empty(); + }, }) }); \ No newline at end of file diff --git a/beescoop_pos/static/src/xml/templates.xml b/beescoop_pos/static/src/xml/templates.xml index 2c3946c..e9b3391 100644 --- a/beescoop_pos/static/src/xml/templates.xml +++ b/beescoop_pos/static/src/xml/templates.xml @@ -5,6 +5,9 @@
Send Receipt By Mail
+
+ +
\ No newline at end of file diff --git a/beesdoo_pos/models/beesdoo_pos.py b/beesdoo_pos/models/beesdoo_pos.py index 3e9f15f..75de9e6 100644 --- a/beesdoo_pos/models/beesdoo_pos.py +++ b/beesdoo_pos/models/beesdoo_pos.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from openerp import models, fields, api +from openerp import models, fields, api, _ class BeesPOS(models.Model): _inherit = 'pos.config' @@ -32,8 +32,10 @@ class BeescoopPosOrder(models.Model): @api.model def send_order(self, receipt_name): order = self.search([('pos_reference', '=', receipt_name)]) + if not order: + return _('Error: no order found') if not order.partner_id.email: - return False + return _('Cannot send the ticket, no email address found on the client') mail_template = self.env.ref("beescoop_pos.email_send_ticket") mail_template.send_mail(order.id) - return True \ No newline at end of file + return _("Ticket sent") \ No newline at end of file diff --git a/beesdoo_pos/views/beesdoo_pos.xml b/beesdoo_pos/views/beesdoo_pos.xml index 70050b8..80d65ff 100644 --- a/beesdoo_pos/views/beesdoo_pos.xml +++ b/beesdoo_pos/views/beesdoo_pos.xml @@ -19,6 +19,7 @@