From 7675905b889df5249803424a582d8bb55b714bad Mon Sep 17 00:00:00 2001 From: "Loukas Wets (lowe)" Date: Mon, 6 Nov 2023 11:09:44 +0100 Subject: [PATCH] [IMP] pos_restaurant: category count display Change the category count display in the order button. closes odoo/odoo#143298 Signed-off-by: Joseph Caburnay (jcb) --- .../product_screen/action_pad/action_pad.js | 2 +- .../actionpad_widget/actionpad_widget.js | 16 ++++++++++------ .../actionpad_widget/actionpad_widget.xml | 17 +++++++++++++---- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.js b/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.js index d311f07c1b4..29fbe13ee21 100644 --- a/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.js +++ b/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.js @@ -25,6 +25,6 @@ export class ActionpadWidget extends Component { return this.pos.get_order()?.orderlines?.length; } getMainButtonClasses() { - return "button btn d-flex flex-column flex-fill align-items-center justify-content-center fw-bolder btn-lg py-5 rounded-0"; + return "button btn d-flex flex-column flex-fill align-items-center justify-content-center fw-bolder btn-lg rounded-0"; } } diff --git a/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.js b/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.js index 1c2ae0b350e..5f0ab700003 100644 --- a/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.js +++ b/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.js @@ -60,11 +60,15 @@ patch(ActionpadWidget.prototype, { } return acc; }, {}); - - return Object.values(categories) - .map((value) => { - return `${value.name} ${value.count}`; - }) - .join(" | "); + return Object.values(categories); + }, + get displayCategoryCount() { + return this.categoryCount.slice(0, 3); + }, + get isCategoryCountOverflow() { + if (this.categoryCount.length > 3) { + return true; + } + return false; }, }); diff --git a/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.xml b/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.xml index 4c15f285bad..24a7cde3d38 100644 --- a/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.xml +++ b/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.xml @@ -9,14 +9,23 @@