From 76a457ce845d4ba3b2ace4b9564731f62edbb9c9 Mon Sep 17 00:00:00 2001 From: Robin Heinz Date: Tue, 1 Jun 2021 08:22:26 +0000 Subject: [PATCH] Revert "[FIX] point_of_sale: random failure when reprint receipt" This reverts commit 892af4c542ae96bf718066a6fdc74d2e0d43038f. X-original-commit: 6c1172922505cd955d278bc80d327423fc6867a6 --- addons/point_of_sale/static/src/css/pos.css | 4 ---- .../ControlButtons/ReprintReceiptButton.js | 6 +++++- .../Screens/OrderManagementScreen/OrderManagementScreen.js | 3 +-- .../Screens/OrderManagementScreen/OrderManagementScreen.xml | 5 +---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 20f455985dd..b9ac2a14767 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -2980,10 +2980,6 @@ td { color: white; } -.order-receipt-hidden { - display: none; -} - .order-receipt { color: white; font-size: medium; diff --git a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/ReprintReceiptButton.js b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/ReprintReceiptButton.js index 5878e96294e..913f98af4e6 100644 --- a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/ReprintReceiptButton.js +++ b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/ReprintReceiptButton.js @@ -6,6 +6,7 @@ odoo.define('point_of_sale.ReprintReceiptButton', function (require) { const PosComponent = require('point_of_sale.PosComponent'); const OrderManagementScreen = require('point_of_sale.OrderManagementScreen'); const Registries = require('point_of_sale.Registries'); + const OrderReceipt = require('point_of_sale.OrderReceipt'); const contexts = require('point_of_sale.PosContext'); class ReprintReceiptButton extends PosComponent { @@ -19,7 +20,10 @@ odoo.define('point_of_sale.ReprintReceiptButton', function (require) { if (!order) return; if (this.env.pos.proxy.printer) { - const receiptHtml = this.props.hiddenOrderReceipt.el.outerHTML; + const fixture = document.createElement('div'); + const orderReceipt = new (Registries.Component.get(OrderReceipt))(this, { order }); + await orderReceipt.mount(fixture); + const receiptHtml = orderReceipt.el.outerHTML; const printResult = await this.env.pos.proxy.printer.print_receipt(receiptHtml); if (!printResult.successful) { this.showTempScreen('ReprintReceiptScreen', { order: order }); diff --git a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js index 6c6e80a7772..88380abfe8b 100644 --- a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js @@ -1,7 +1,7 @@ odoo.define('point_of_sale.OrderManagementScreen', function (require) { 'use strict'; - const { useContext, useRef } = owl.hooks; + const { useContext } = owl.hooks; const { useListener } = require('web.custom_hooks'); const ControlButtonsMixin = require('point_of_sale.ControlButtonsMixin'); const NumberBuffer = require('point_of_sale.NumberBuffer'); @@ -27,7 +27,6 @@ odoo.define('point_of_sale.OrderManagementScreen', function (require) { OrderFetcher.setComponent(this); OrderFetcher.setConfigId(this.env.pos.config_id); this.orderManagementContext = useContext(contexts.orderManagement); - this.receiptRef = useRef('order-receipt'); } mounted() { OrderFetcher.on('update', this, this.render); diff --git a/addons/point_of_sale/static/src/xml/Screens/OrderManagementScreen/OrderManagementScreen.xml b/addons/point_of_sale/static/src/xml/Screens/OrderManagementScreen/OrderManagementScreen.xml index 94d7358e7fe..8992e2c80ee 100644 --- a/addons/point_of_sale/static/src/xml/Screens/OrderManagementScreen/OrderManagementScreen.xml +++ b/addons/point_of_sale/static/src/xml/Screens/OrderManagementScreen/OrderManagementScreen.xml @@ -9,7 +9,7 @@
- +
@@ -26,9 +26,6 @@
-
- -