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 -
-
-
-
- - -
-
-
-
- -