From 86298440ec615f40bd2a80f03c1aebcec9ef3bcb Mon Sep 17 00:00:00 2001 From: "Jacky (trj)" Date: Wed, 12 Jan 2022 15:39:31 +0000 Subject: [PATCH] [FIX] point_of_sale,pos_epson_printer: htmlToImgLetterRendering in every printer The letterRendering setting was only properly set for the `Printer` class but not for the `EpsonPrinter`. closes odoo/odoo#82980 X-original-commit: 3bbf4bbcc0e1f81c1eddb91b54c3c863722aea46 Related: odoo/enterprise#23586 Signed-off-by: Masereel Pierre --- addons/point_of_sale/static/src/js/printers.js | 10 ++++------ addons/pos_epson_printer/static/src/js/printers.js | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/point_of_sale/static/src/js/printers.js b/addons/point_of_sale/static/src/js/printers.js index 479de7580af..ae10695cbca 100644 --- a/addons/point_of_sale/static/src/js/printers.js +++ b/addons/point_of_sale/static/src/js/printers.js @@ -42,10 +42,10 @@ class PrintResultGenerator { } var PrinterMixin = { - init: function() { + init: function (pos) { this.receipt_queue = []; this.printResultGenerator = new PrintResultGenerator(); - this.htmlToImgLetterRendering = false; // Whether to render each letter seperately. Necessary if letter-spacing is used. + this.pos = pos; }, /** @@ -104,7 +104,7 @@ var PrinterMixin = { $('.pos-receipt-print').empty(); resolve(self.process_canvas(canvas)); }, - letterRendering: self.htmlToImgLetterRendering, + letterRendering: self.pos.htmlToImgLetterRendering(), }) }); return promise; @@ -131,9 +131,7 @@ var PrinterMixin = { var Printer = core.Class.extend(PrinterMixin, { init: function (url, pos) { - PrinterMixin.init.call(this, arguments); - this.pos = pos; - this.htmlToImgLetterRendering = pos.htmlToImgLetterRendering(); + PrinterMixin.init.call(this, pos); this.connection = new Session(undefined, url || 'http://localhost:8069', { use_cors: true}); }, diff --git a/addons/pos_epson_printer/static/src/js/printers.js b/addons/pos_epson_printer/static/src/js/printers.js index 45cfab37d8b..72a855963d3 100644 --- a/addons/pos_epson_printer/static/src/js/printers.js +++ b/addons/pos_epson_printer/static/src/js/printers.js @@ -45,8 +45,8 @@ class EpsonPrintResultGenerator extends PrintResultGenerator { } var EpsonPrinter = core.Class.extend(PrinterMixin, { - init(ip) { - PrinterMixin.init.call(this, arguments); + init(ip, pos) { + PrinterMixin.init.call(this, pos); var url = window.location.protocol + '//' + ip; this.address = url + '/cgi-bin/epos/service.cgi?devid=local_printer'; this.printResultGenerator = new EpsonPrintResultGenerator(url);