From d49476e0f8a0c1954dc67e9e810dc394ff6752d2 Mon Sep 17 00:00:00 2001 From: Samuel Degueldre Date: Mon, 22 May 2023 08:09:18 +0000 Subject: [PATCH] [REF] pos_sale: remove unused mobile order management screen The mobile order management screen has never worked. A previous commit partially fixed it and caused it to now be rendered, but it's always rendered in a way that makes it no different from the desktop order management screen. The code has been dead for so long that allowing the code to go through the dead path crashes and after fixing the crashes the layout is broken. As such, this commit removes it entirely, and if the flow needs improvement on mobile it will be done as part of a separate task instead. Part-of: odoo/odoo#122035 --- addons/pos_sale/__manifest__.py | 11 +------ .../MobileSaleOrderManagementScreen.js | 18 ----------- .../static/src/js/SetSaleOrderButton.js | 23 +++---------- .../MobileSaleOrderManagementScreen.xml | 32 ------------------- 4 files changed, 5 insertions(+), 79 deletions(-) delete mode 100644 addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js delete mode 100644 addons/pos_sale/static/src/xml/OrderManagementScreen/MobileSaleOrderManagementScreen.xml diff --git a/addons/pos_sale/__manifest__.py b/addons/pos_sale/__manifest__.py index c0706024494..93d1643b1b5 100644 --- a/addons/pos_sale/__manifest__.py +++ b/addons/pos_sale/__manifest__.py @@ -28,16 +28,7 @@ This module adds a custom Sales Team for the Point of Sale. This enables you to 'auto_install': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_sale/static/src/css/pos_sale.css', - 'pos_sale/static/src/js/models.js', - 'pos_sale/static/src/js/SetSaleOrderButton.js', - 'pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js', - 'pos_sale/static/src/js/OrderManagementScreen/SaleOrderFetcher.js', - 'pos_sale/static/src/js/OrderManagementScreen/SaleOrderList.js', - 'pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementControlPanel.js', - 'pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementScreen.js', - 'pos_sale/static/src/js/OrderManagementScreen/SaleOrderRow.js', - 'pos_sale/static/src/xml/**/*', + 'pos_sale/static/src/**/*', ], 'web.assets_tests': [ 'pos_sale/static/tests/**/*', diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js b/addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js deleted file mode 100644 index 46ee6730853..00000000000 --- a/addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js +++ /dev/null @@ -1,18 +0,0 @@ -/** @odoo-module */ -import { SaleOrderManagementScreen } from "@pos_sale/js/OrderManagementScreen/SaleOrderManagementScreen"; -import { registry } from "@web/core/registry"; -import { useState } from "@odoo/owl"; - -export class MobileSaleOrderManagementScreen extends SaleOrderManagementScreen { - static template = "MobileSaleOrderManagementScreen"; - setup() { - super.setup(); - this.mobileState = useState({ showDetails: false }); - } - async onClickSaleOrder() { - await this.super(); - this.mobileState.showDetails = true; - } -} - -registry.category("pos_screens").add("MobileSaleOrderManagementScreen", MobileSaleOrderManagementScreen); diff --git a/addons/pos_sale/static/src/js/SetSaleOrderButton.js b/addons/pos_sale/static/src/js/SetSaleOrderButton.js index 233c01d17c4..c1600336b11 100644 --- a/addons/pos_sale/static/src/js/SetSaleOrderButton.js +++ b/addons/pos_sale/static/src/js/SetSaleOrderButton.js @@ -2,31 +2,16 @@ import { ProductScreen } from "@point_of_sale/js/Screens/ProductScreen/ProductScreen"; import { usePos } from "@point_of_sale/app/pos_hook"; -import { Component, useState } from "@odoo/owl"; -import { useService } from "@web/core/utils/hooks"; +import { Component } from "@odoo/owl"; + export class SetSaleOrderButton extends Component { static template = "SetSaleOrderButton"; - setup() { - super.setup(); this.pos = usePos(); - this.ui = useState(useService("ui")); - this.orm = useService("orm"); } async click() { - // FIXME POSREF why are we calling browse for a ping? - // Why don't we let the order management screen deal with the offline error? - await this.orm.call("sale.order", "browse", [[]]); - const screen = this.ui.isSmall - ? "MobileSaleOrderManagementScreen" - : "SaleOrderManagementScreen"; - this.pos.showScreen(screen); + this.pos.showScreen("SaleOrderManagementScreen"); } } -ProductScreen.addControlButton({ - component: SetSaleOrderButton, - condition: function () { - return true; - }, -}); +ProductScreen.addControlButton({ component: SetSaleOrderButton }); diff --git a/addons/pos_sale/static/src/xml/OrderManagementScreen/MobileSaleOrderManagementScreen.xml b/addons/pos_sale/static/src/xml/OrderManagementScreen/MobileSaleOrderManagementScreen.xml deleted file mode 100644 index 837874a4851..00000000000 --- a/addons/pos_sale/static/src/xml/OrderManagementScreen/MobileSaleOrderManagementScreen.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - -
-
-
- -
-
- - - -
-
- - -
-
-
- Back to list -
-
-
-
- - -
-
-
-
- -