From b647151d7e1a1f57a9d5beaf724a087ebbb94f6c Mon Sep 17 00:00:00 2001 From: Risvana Cybro Date: Wed, 26 Nov 2025 18:59:36 +0530 Subject: [PATCH] Nov 26: [FIX] Bug Fixed 'pos_theme_sapphire' --- pos_theme_sapphire/__manifest__.py | 1 + pos_theme_sapphire/doc/RELEASE_NOTES.md | 5 + pos_theme_sapphire/static/src/css/custom.css | 14 ++ .../static/src/js/ProductScreen.js | 11 ++ .../static/src/js/ProductsWidget.js | 9 ++ .../screens/ProductScreen/ProductScreen.xml | 6 +- .../screens/ProductScreen/ProductsWidget.xml | 134 ++++++++++++++++++ 7 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 pos_theme_sapphire/static/src/js/ProductsWidget.js create mode 100644 pos_theme_sapphire/static/src/xml/screens/ProductScreen/ProductsWidget.xml diff --git a/pos_theme_sapphire/__manifest__.py b/pos_theme_sapphire/__manifest__.py index e2b57fe6f..88f913618 100644 --- a/pos_theme_sapphire/__manifest__.py +++ b/pos_theme_sapphire/__manifest__.py @@ -35,6 +35,7 @@ 'assets': { 'point_of_sale._assets_pos': [ 'pos_theme_sapphire/static/src/js/ProductScreen.js', + 'pos_theme_sapphire/static/src/js/ProductsWidget.js', 'pos_theme_sapphire/static/src/xml/**/*.xml', 'pos_theme_sapphire/static/src/css/custom.css', ], diff --git a/pos_theme_sapphire/doc/RELEASE_NOTES.md b/pos_theme_sapphire/doc/RELEASE_NOTES.md index 93a7bbddb..3b87e3022 100644 --- a/pos_theme_sapphire/doc/RELEASE_NOTES.md +++ b/pos_theme_sapphire/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### ADD - Initial commit POS Theme Sapphire + +#### 26.11.2025 +#### Version 18.0.1.0.1 +#### BUG FIX +- Fixed issue of not showing the Order Selection button in Product Screen. \ No newline at end of file diff --git a/pos_theme_sapphire/static/src/css/custom.css b/pos_theme_sapphire/static/src/css/custom.css index b45a7f0b3..9b9877bdb 100644 --- a/pos_theme_sapphire/static/src/css/custom.css +++ b/pos_theme_sapphire/static/src/css/custom.css @@ -526,3 +526,17 @@ color: white; border-radius: 4px; } + +.sidebar-order-tabs .order-tab { + background: #fff; + border: 1px solid #ddd; + padding: 6px 10px; + border-radius: 6px; + cursor: pointer; +} + +.sidebar-order-tabs .order-tab.active { + background: #5564c2; + color: white; + border-color: #3a2e8d; +} \ No newline at end of file diff --git a/pos_theme_sapphire/static/src/js/ProductScreen.js b/pos_theme_sapphire/static/src/js/ProductScreen.js index bef85e993..e11bb419b 100644 --- a/pos_theme_sapphire/static/src/js/ProductScreen.js +++ b/pos_theme_sapphire/static/src/js/ProductScreen.js @@ -11,6 +11,7 @@ import { CashMovePopup } from "@point_of_sale/app/navbar/cash_move_popup/cash_mo import { TicketScreen } from "@point_of_sale/app/screens/ticket_screen/ticket_screen"; import { BackButton } from "@point_of_sale/app/screens/product_screen/action_pad/back_button/back_button"; import { CashierName } from "@point_of_sale/app/navbar/cashier_name/cashier_name"; +import { OrderTabs } from "@point_of_sale/app/components/order_tabs/order_tabs"; ProductScreen.components = { ...ProductScreen.components, @@ -18,6 +19,7 @@ ProductScreen.components = { SaleDetailsButton, BackButton, CashierName, + OrderTabs, } patch(ProductScreen.prototype, { @@ -70,3 +72,12 @@ patch(ProductScreen.prototype, { return this.pos.showBackButton() && this.ui.isSmall; }, }); + + +patch(ProductScreen.prototype,{ + + getOrderTabs() { + return this.pos.get_open_orders().filter((order) => !order.table_id); + }, + +}); \ No newline at end of file diff --git a/pos_theme_sapphire/static/src/js/ProductsWidget.js b/pos_theme_sapphire/static/src/js/ProductsWidget.js new file mode 100644 index 000000000..998595718 --- /dev/null +++ b/pos_theme_sapphire/static/src/js/ProductsWidget.js @@ -0,0 +1,9 @@ +/** @odoo-module **/ + +import { ProductsWidget } from "@point_of_sale/app/screens/product_screen/product_list/product_list"; +import { CashierName } from "@point_of_sale/app/navbar/cashier_name/cashier_name"; + +ProductsWidget.components = { + ...ProductsWidget.components, + CashierName, +} diff --git a/pos_theme_sapphire/static/src/xml/screens/ProductScreen/ProductScreen.xml b/pos_theme_sapphire/static/src/xml/screens/ProductScreen/ProductScreen.xml index 17b321d91..e6a0f2ed1 100644 --- a/pos_theme_sapphire/static/src/xml/screens/ProductScreen/ProductScreen.xml +++ b/pos_theme_sapphire/static/src/xml/screens/ProductScreen/ProductScreen.xml @@ -36,9 +36,9 @@ -