From b71e05e804b24fcb516c7ef467a8dfcc273668e7 Mon Sep 17 00:00:00 2001
From: vlst <vlst@odoo.com>
Date: Sat, 12 Aug 2023 22:16:21 +0200
Subject: [PATCH] [REF] point_of_sale: unify numpads

At the moment, the point_of_sale module has 3 different implementations of
numpads. This is absurd. In this PR we unify them all into a single
numpad component.

One of the reasons why there are multiple numpads is because each requires
a slightly different set of buttons. The new `Numpad` component provides
a simple API which allows the consumer to specify what the buttons should be.

This is done by proving the `buttons` prop, which has the following type:
```js
    buttons: {
        type: Array,
        element: {
            type: Object,
            shape: {
                value: String,
                text: { type: String, optional: true },
                class: { type: String, optional: true },
                disabled: { type: Boolean, optional: true },
            },
        },
    }
```

In this PR we also provide a simple set of helper functions for the tours
and adapt all of the existing tests accordingly.

closes odoo/odoo#132245

Task: 3470346
Related: odoo/enterprise#46427
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
---
 .../app/generic_components/numpad/numpad.js   |  35 ++
 .../app/generic_components/numpad/numpad.scss |   3 +
 .../app/generic_components/numpad/numpad.xml  |  12 +
 .../screens/payment_screen/numpad/numpad.js   |  14 -
 .../screens/payment_screen/numpad/numpad.scss |  15 -
 .../screens/payment_screen/numpad/numpad.xml  |  28 --
 .../numpad/numpad_button/numpad_button.js     |  16 -
 .../numpad/numpad_button/numpad_button.xml    |  18 -
 .../screens/payment_screen/payment_screen.js  |  24 +-
 .../screens/payment_screen/payment_screen.xml |   8 +-
 .../category_button/category_button.xml       |  15 -
 .../screens/product_screen/numpad/numpad.js   |  48 --
 .../screens/product_screen/numpad/numpad.scss |  10 -
 .../screens/product_screen/numpad/numpad.xml  |  40 --
 .../screens/product_screen/product_screen.js  |  38 +-
 .../screens/product_screen/product_screen.xml |   4 +-
 .../screens/ticket_screen/ticket_screen.js    |  24 +-
 .../screens/ticket_screen/ticket_screen.xml   |   6 +-
 .../app/utils/input_popups/number_popup.js    |  28 +-
 .../app/utils/input_popups/number_popup.scss  |   5 -
 .../app/utils/input_popups/number_popup.xml   |  43 +-
 .../static/src/img/backspace.png              | Bin 5970 -> 0 bytes
 .../tests/tours/FixedPriceNegativeQty.tour.js |   2 +-
 .../static/tests/tours/PaymentScreen.tour.js  |   2 +-
 .../static/tests/tours/PosComboTour.js        |   2 +-
 .../static/tests/tours/ProductScreen.tour.js  |  48 +-
 .../static/tests/tours/TicketScreen.tour.js   |   9 +-
 .../static/tests/tours/acceptance_tour.js     |  14 +-
 .../tours/helpers/NumberPopupTourMethods.js   |  32 +-
 .../tests/tours/helpers/NumpadTourMethods.js  |  20 +
 .../tours/helpers/PaymentScreenTourMethods.js |  20 +-
 .../tours/helpers/ProductScreenTourMethods.js |  53 +-
 .../tours/helpers/TicketScreenTourMethods.js  |  25 -
 .../static/tests/tours/pricelist_tour.js      |  33 +-
 .../tests/tours/GiftCardProgramTours.js       |   2 +-
 .../tours/MultipleGiftWalletProgramsTour.js   |   8 +-
 .../tours/PosLoyaltyLoyaltyProgramTour.js     | 343 +++++++------
 .../tests/tours/PosLoyaltyRewardButtonTour.js | 380 +++++++-------
 .../static/tests/tours/PosLoyaltyTour.js      | 476 +++++++++---------
 .../tests/tours/PosLoyaltyTourMethods.js      |   2 +-
 .../static/tests/tours/FloorScreen.tour.js    | 234 +++++----
 .../static/tests/tours/Refund.tour.js         |   6 +-
 .../tests/helpers/ProductScreenTourMethods.js |   2 +-
 .../static/tests/tours/PosSaleTour.js         |   6 +-
 44 files changed, 956 insertions(+), 1197 deletions(-)
 create mode 100644 addons/point_of_sale/static/src/app/generic_components/numpad/numpad.js
 create mode 100644 addons/point_of_sale/static/src/app/generic_components/numpad/numpad.scss
 create mode 100644 addons/point_of_sale/static/src/app/generic_components/numpad/numpad.xml
 delete mode 100644 addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.js
 delete mode 100644 addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.scss
 delete mode 100644 addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.xml
 delete mode 100644 addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.js
 delete mode 100644 addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.xml
 delete mode 100644 addons/point_of_sale/static/src/app/screens/product_screen/category_button/category_button.xml
 delete mode 100644 addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.js
 delete mode 100644 addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.scss
 delete mode 100644 addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.xml
 delete mode 100644 addons/point_of_sale/static/src/app/utils/input_popups/number_popup.scss
 delete mode 100644 addons/point_of_sale/static/src/img/backspace.png
 create mode 100644 addons/point_of_sale/static/tests/tours/helpers/NumpadTourMethods.js

diff --git a/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.js b/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.js
new file mode 100644
index 00000000000..d61390065a6
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.js
@@ -0,0 +1,35 @@
+/** @odoo-module */
+
+import { useService } from "@web/core/utils/hooks";
+import { Component } from "@odoo/owl";
+
+export class Numpad extends Component {
+    static template = "point_of_sale.Numpad";
+    static props = {
+        class: { type: String, optional: true },
+        onClick: { type: Function, optional: true },
+        buttons: {
+            type: Array,
+            element: {
+                type: Object,
+                shape: {
+                    value: String,
+                    text: { type: String, optional: true },
+                    class: { type: String, optional: true },
+                    disabled: { type: Boolean, optional: true },
+                },
+            },
+        },
+    };
+    static defaultProps = {
+        class: "",
+    };
+    setup() {
+        if (!this.props.onClick) {
+            this.numberBuffer = useService("number_buffer");
+            this.onClick = (buttonValue) => this.numberBuffer.sendKey(buttonValue);
+        } else {
+            this.onClick = this.props.onClick;
+        }
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.scss b/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.scss
new file mode 100644
index 00000000000..947c50b5bb7
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.scss
@@ -0,0 +1,3 @@
+.max-width-325px {
+  max-width: 325px;
+}
diff --git a/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.xml b/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.xml
new file mode 100644
index 00000000000..bf2e4ad0f02
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/generic_components/numpad/numpad.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+  <t t-name="point_of_sale.Numpad">
+    <div t-attf-class="{{props.class}} numpad row row-cols-{{props.buttons.length / 4}} gx-0">
+      <button t-foreach="props.buttons" t-as="button" t-key="button.value"
+        t-attf-class="col btn btn-light py-3 border fw-bolder rounded-0 {{ button.class  or '' }}"
+        t-on-click="() => this.onClick(button.value)"
+        t-att-disabled="button.disabled"
+        t-esc="button.text or button.value" />
+    </div>
+  </t>
+</templates>
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.js b/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.js
deleted file mode 100644
index 920bf2b959f..00000000000
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/** @odoo-module */
-
-import { PSNumpadInputButton } from "@point_of_sale/app/screens/payment_screen/numpad/numpad_button/numpad_button";
-import { Component } from "@odoo/owl";
-import { useService } from "@web/core/utils/hooks";
-
-export class PaymentScreenNumpad extends Component {
-    static components = { PSNumpadInputButton };
-    static template = "point_of_sale.PaymentScreenNumpad";
-
-    setup() {
-        this.decimalPoint = useService("localization").decimalPoint;
-    }
-}
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.scss b/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.scss
deleted file mode 100644
index 2cea5999814..00000000000
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.payment-numpad .numpad button {
-    font-size: clamp(map-get($font-sizes, 6), 3vw, 36px);
-}
-
-.payment-numpad .numpad button:nth-child(16) img {
-    width: 35%;
-    max-width: 64px;
-    height: auto;
-}
-
-@include media-breakpoint-down(md) {
-    .payment-numpad .numpad button:nth-child(16) img {
-        max-width: 48px;
-    }
-}
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.xml
deleted file mode 100644
index 7a3b2b63b86..00000000000
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-
-    <t t-name="point_of_sale.PaymentScreenNumpad">
-        <div class="numpad d-grid text-center flex-grow-1 h-100 w-100">
-            <PSNumpadInputButton value="'1'" />
-            <PSNumpadInputButton value="'2'" />
-            <PSNumpadInputButton value="'3'" />
-            <PSNumpadInputButton value="'+10'" changeClassTo="'mode-button'" />
-            <PSNumpadInputButton value="'4'" />
-            <PSNumpadInputButton value="'5'" />
-            <PSNumpadInputButton value="'6'" />
-            <PSNumpadInputButton value="'+20'" changeClassTo="'mode-button'" />
-            <PSNumpadInputButton value="'7'" />
-            <PSNumpadInputButton value="'8'" />
-            <PSNumpadInputButton value="'9'" />
-            <PSNumpadInputButton value="'+50'" changeClassTo="'mode-button'" />
-            <PSNumpadInputButton value="'-'" text="'+/-'" />
-            <PSNumpadInputButton value="'0'" />
-            <PSNumpadInputButton value="decimalPoint" />
-            <PSNumpadInputButton value="'Backspace'">
-                <img src="/point_of_sale/static/src/img/backspace.png" width="24" height="21"
-                     alt="Backspace" />
-            </PSNumpadInputButton>
-        </div>
-    </t>
-
-</templates>
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.js b/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.js
deleted file mode 100644
index 2cbdbf58aa3..00000000000
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @odoo-module */
-
-import { Component } from "@odoo/owl";
-import { useService } from "@web/core/utils/hooks";
-
-export class PSNumpadInputButton extends Component {
-    static template = "point_of_sale.PSNumpadInputButton";
-
-    setup() {
-        this.numberBuffer = useService("number_buffer");
-    }
-
-    get _class() {
-        return this.props.changeClassTo || "input-button number-char";
-    }
-}
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.xml
deleted file mode 100644
index f492b91516a..00000000000
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/numpad/numpad_button/numpad_button.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-
-    <t t-name="point_of_sale.PSNumpadInputButton">
-        <button t-attf-class="{{ _class }} btn btn-light w-100 rounded-0 py-3"
-                t-on-click="() => this.numberBuffer.sendKey(props.value)">
-            <t t-slot="default">
-                <t t-if="props.text">
-                    <h1 t-esc="props.text" />
-                </t>
-                <t t-else="">
-                    <h1 t-esc="props.value" />
-                </t>
-            </t>
-        </button>
-    </t>
-
-</templates>
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
index f0c7ee20649..2ec3c5acf98 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
@@ -13,17 +13,17 @@ import { DatePickerPopup } from "@point_of_sale/app/utils/date_picker_popup/date
 import { ConfirmPopup } from "@point_of_sale/app/utils/confirm_popup/confirm_popup";
 import { ConnectionLostError } from "@web/core/network/rpc_service";
 
-import { PaymentScreenNumpad } from "@point_of_sale/app/screens/payment_screen/numpad/numpad";
 import { PaymentScreenPaymentLines } from "@point_of_sale/app/screens/payment_screen/payment_lines/payment_lines";
 import { PaymentScreenStatus } from "@point_of_sale/app/screens/payment_screen/payment_status/payment_status";
 import { usePos } from "@point_of_sale/app/store/pos_hook";
 import { Component, useState, useRef } from "@odoo/owl";
 import { renderToElement } from "@web/core/utils/render";
+import { Numpad } from "@point_of_sale/app/generic_components/numpad/numpad";
 
 export class PaymentScreen extends Component {
     static template = "point_of_sale.PaymentScreen";
     static components = {
-        PaymentScreenNumpad,
+        Numpad,
         PaymentScreenPaymentLines,
         PaymentScreenStatus,
     };
@@ -47,6 +47,26 @@ export class PaymentScreen extends Component {
         this.error = false;
         this.validateOrder = useAsyncLockedMethod(this.validateOrder);
     }
+    getNumpadButtons() {
+        return [
+            { value: "1" },
+            { value: "2" },
+            { value: "3" },
+            { value: "+10" },
+            { value: "4" },
+            { value: "5" },
+            { value: "6" },
+            { value: "+20" },
+            { value: "7" },
+            { value: "8" },
+            { value: "9" },
+            { value: "+50" },
+            { value: "-", text: "+/-" },
+            { value: "0" },
+            { value: this.env.services.localization.decimalPoint },
+            { value: "Backspace", text: "⌫" },
+        ];
+    }
 
     showMaxValueError() {
         this.popup.add(ErrorPopup, {
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml
index a3014974359..340300fc18b 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml
@@ -20,9 +20,7 @@
                     </div>
                     <div class="center-content d-flex flex-column w-50 p-1 border-start border-end bg-300" >
                         <PaymentScreenStatus order="currentOrder" />
-                        <div class="payment-numpad flex-grow-1 d-flex flex-wrap">
-                            <PaymentScreenNumpad />
-                        </div>
+                        <Numpad class="'flex-grow-1'"  buttons="getNumpadButtons()" />
                     </div>
                     <div class="right-content w-25 bg-400">
                         <t t-call="point_of_sale.PaymentScreenButtons" />
@@ -55,7 +53,8 @@
             </div>
         </t>
         <t t-else="">
-            <div class="button next validation btn btn-primary btn-lg py-5 rounded-0 d-flex flex-column align-items-center justify-content-center fw-bolder" t-attf-class="{{currentOrder.is_paid() and currentOrder._isValidEmptyOrder() ? 'highlight' : 'disabled'}}"
+            <div class="button next validation btn btn-primary btn-lg py-5 rounded-0 d-flex flex-column align-items-center justify-content-center fw-bolder" 
+                t-attf-class="{{currentOrder.is_paid() and currentOrder._isValidEmptyOrder() ? 'highlight' : 'disabled'}}"
                 t-on-click="() => this.validateOrder()">
                 <div class="pay-circle d-flex align-items-center justify-content-center mb-2">
                     <i class="oi oi-chevron-right" role="img" aria-label="Pay" title="Pay" />
@@ -65,7 +64,6 @@
         </t>
     </t>
 
-
     <t t-name="point_of_sale.PaymentScreenButtons">
         <div class="payment-buttons d-flex flex-column flex-wrap">
             <button class="button partner-button btn btn-light py-3 text-start rounded-0 border-bottom" 
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/category_button/category_button.xml b/addons/point_of_sale/static/src/app/screens/product_screen/category_button/category_button.xml
deleted file mode 100644
index 60d7b0b6502..00000000000
--- a/addons/point_of_sale/static/src/app/screens/product_screen/category_button/category_button.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<templates id="template" xml:space="preserve">
-
-    <t t-name="point_of_sale.CategoryButton">
-        <button class="category-button btn btn-light" t-on-click="() => this.props.switchCategory(props.category.id)">
-            <div class="category-img">
-                <img t-att-src="imageUrl" alt="Category" />
-            </div>
-            <div class="category-name mt-2 fw-bolder">
-                <t t-esc="props.category.name" />
-            </div>
-        </button>
-    </t>
-
-</templates>
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.js b/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.js
deleted file mode 100644
index cc154a401ee..00000000000
--- a/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/** @odoo-module */
-
-import { useService } from "@web/core/utils/hooks";
-import { Component } from "@odoo/owl";
-import { usePos } from "@point_of_sale/app/store/pos_hook";
-
-/**
- * @prop {'quantity' | 'price' | 'discount'} activeMode
- * @prop {Array<'quantity' | 'price' | 'discount'>} disabledModes
- * @prop {boolean} disableSign
- */
-export class NumpadWidget extends Component {
-    static template = "point_of_sale.NumpadWidget";
-    static defaultProps = {
-        disabledModes: [],
-        disableSign: false,
-    };
-    setup() {
-        this.pos = usePos();
-        this.numberBuffer = useService("number_buffer");
-        this.localization = useService("localization");
-    }
-    get hasPriceControlRights() {
-        return (
-            this.pos.cashierHasPriceControlRights() && !this.props.disabledModes.includes("price")
-        );
-    }
-    get hasManualDiscount() {
-        return this.pos.config.manual_discount && !this.props.disabledModes.includes("discount");
-    }
-    changeMode(mode) {
-        if (!this.hasPriceControlRights && mode === "price") {
-            return;
-        }
-        if (!this.hasManualDiscount && mode === "discount") {
-            return;
-        }
-        this.numberBuffer.capture();
-        this.numberBuffer.reset();
-        this.pos.numpadMode = mode;
-    }
-    sendInput(key) {
-        this.numberBuffer.sendKey(key);
-    }
-    get decimalSeparator() {
-        return this.localization.decimalPoint;
-    }
-}
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.scss b/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.scss
deleted file mode 100644
index c7bdf187f49..00000000000
--- a/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.numpad {
-    grid-template-columns: repeat(4, 1fr);
-    gap: 1px;
-}
-
-.numpad .disabled-mode, .pos .numpad .disabled-mode:hover {
-    background: $gray-200;
-    color: $gray-500;
-    cursor: not-allowed;
-}
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.xml b/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.xml
deleted file mode 100644
index f836e05fae4..00000000000
--- a/addons/point_of_sale/static/src/app/screens/product_screen/numpad/numpad.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-
-    <t t-name="point_of_sale.NumpadWidget">
-        <div class="numpad d-grid text-center flex-grow-1 bg-300">
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('1')">1</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('2')">2</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('3')">3</button>
-            <button class="mode-button btn btn-light w-100 rounded-0 py-3 fw-bolder" t-att-class="{'selected-mode active': props.activeMode === 'quantity'}"
-                    t-on-click="() => this.changeMode('quantity')">Qty</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('4')">4</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('5')">5</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('6')">6</button>
-            <button class="mode-button btn btn-light w-100 rounded-0 py-3 fw-bolder text-nowrap" t-att-class="{
-                        'selected-mode active': props.activeMode === 'discount',
-                        'disabled-mode': !hasManualDiscount
-                    }"
-                    t-att-disabled="!hasManualDiscount"
-                    t-on-click="() => this.changeMode('discount')">% Disc</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('7')">7</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('8')">8</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('9')">9</button>
-            <button class="mode-button btn btn-light w-100 rounded-0 py-3 fw-bolder" t-att-class="{
-                    'selected-mode active': props.activeMode === 'price',
-                    'disabled-mode': !hasPriceControlRights
-                }" t-att-disabled="!hasPriceControlRights"
-                    t-on-click="() => this.changeMode('price')">Price</button>
-            <button class="input-button px-4 numpad-minus btn btn-light w-100 rounded-0 py-3 fw-bolder" t-att-class="{ 'disabled-mode': props.disableSign }" t-on-click="() => this.sendInput('-')">+/-</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('0')">0</button>
-            <button class="input-button px-4 number-char btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput(decimalSeparator)">
-                <t t-esc="decimalSeparator" />
-            </button>
-            <button class="input-button px-4 numpad-backspace btn btn-light w-100 rounded-0 py-3 fw-bolder" t-on-click="() => this.sendInput('Backspace')">
-                <img style="pointer-events: none;" src="/point_of_sale/static/src/img/backspace.png"
-                     width="24" height="21" alt="Backspace" />
-            </button>
-        </div>
-    </t>
-
-</templates>
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js b/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
index 4799edc2ec3..fa543699c6d 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
@@ -16,7 +16,7 @@ import { usePos } from "@point_of_sale/app/store/pos_hook";
 import { Component, onMounted, useState } from "@odoo/owl";
 import { ErrorBarcodePopup } from "@point_of_sale/app/barcode/error_popup/barcode_error_popup";
 
-import { NumpadWidget } from "@point_of_sale/app/screens/product_screen/numpad/numpad";
+import { Numpad } from "@point_of_sale/app/generic_components/numpad/numpad";
 import { OrderWidget } from "@point_of_sale/app/screens/product_screen/order/order";
 import { ProductsWidget } from "@point_of_sale/app/screens/product_screen/product_list/product_list";
 import { ActionpadWidget } from "@point_of_sale/app/screens/product_screen/action_pad/action_pad";
@@ -25,7 +25,7 @@ export class ProductScreen extends ControlButtonsMixin(Component) {
     static template = "point_of_sale.ProductScreen";
     static components = {
         ActionpadWidget,
-        NumpadWidget,
+        Numpad,
         OrderWidget,
         ProductsWidget,
     };
@@ -63,6 +63,40 @@ export class ProductScreen extends ControlButtonsMixin(Component) {
     onMounted() {
         this.pos.openCashControl();
     }
+    getNumpadButtons() {
+        return [
+            { value: "1" },
+            { value: "2" },
+            { value: "3" },
+            { value: "quantity", text: "Qty" },
+            { value: "4" },
+            { value: "5" },
+            { value: "6" },
+            { value: "discount", text: "% Disc", disabled: !this.pos.config.manual_discount },
+            { value: "7" },
+            { value: "8" },
+            { value: "9" },
+            { value: "price", text: "Price", disabled: !this.pos.cashierHasPriceControlRights() },
+            { value: "-", text: "+/-" },
+            { value: "0" },
+            { value: this.env.services.localization.decimalPoint },
+            // Unicode: https://www.compart.com/en/unicode/U+232B
+            { value: "Backspace", text: "⌫" },
+        ].map((button) => ({
+            ...button,
+            class: this.pos.numpadMode === button.value ? "active border-primary" : "",
+        }));
+    }
+    onNumpadClick(buttonValue) {
+        if (["quantity", "discount", "price"].includes(buttonValue)) {
+            this.numberBuffer.capture();
+            this.numberBuffer.reset();
+            this.pos.numpadMode = buttonValue;
+            return;
+        }
+        this.numberBuffer.sendKey(buttonValue);
+    }
+
     /**
      * To be overridden by modules that checks availability of
      * connected scale.
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.xml b/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.xml
index 443cd749be0..828113c17e7 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.xml
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.xml
@@ -20,9 +20,7 @@
                             actionName="constructor.numpadActionName"
                             actionType="'payment'"
                             onClickMore.bind="displayAllControlPopup" />
-                        <NumpadWidget
-                            updateSelectedOrderline.bind="updateSelectedOrderline"
-                            activeMode="pos.numpadMode" />
+                        <Numpad buttons="getNumpadButtons()" onClick.bind="onNumpadClick" class="'w-100'"/>
                     </div>
                 </div>
             </div>
diff --git a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
index a9b1697bba2..e6495f4728c 100644
--- a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
@@ -12,12 +12,12 @@ import { ConfirmPopup } from "@point_of_sale/app/utils/confirm_popup/confirm_pop
 
 import { ActionpadWidget } from "@point_of_sale/app/screens/product_screen/action_pad/action_pad";
 import { InvoiceButton } from "@point_of_sale/app/screens/ticket_screen/invoice_button/invoice_button";
-import { NumpadWidget } from "@point_of_sale/app/screens/product_screen/numpad/numpad";
 import { OrderDetails } from "@point_of_sale/app/screens/ticket_screen/order_details/order_details";
 import { ReprintReceiptButton } from "@point_of_sale/app/screens/ticket_screen/reprint_receipt_button/reprint_receipt_button";
 import { SearchBar } from "@point_of_sale/app/screens/ticket_screen/search_bar/search_bar";
 import { usePos } from "@point_of_sale/app/store/pos_hook";
 import { Component, onMounted, useState } from "@odoo/owl";
+import { Numpad } from "@point_of_sale/app/generic_components/numpad/numpad";
 
 const { DateTime } = luxon;
 
@@ -27,10 +27,10 @@ export class TicketScreen extends Component {
     static components = {
         ActionpadWidget,
         InvoiceButton,
-        NumpadWidget,
         OrderDetails,
         ReprintReceiptButton,
         SearchBar,
+        Numpad,
     };
     static defaultProps = {
         destinationOrder: null,
@@ -85,6 +85,26 @@ export class TicketScreen extends Component {
             await this._fetchSyncedOrders();
         }
     }
+    getNumpadButtons() {
+        return [
+            { value: "1" },
+            { value: "2" },
+            { value: "3" },
+            { value: "quantity", text: "Qty", class: "active border-primary" },
+            { value: "4" },
+            { value: "5" },
+            { value: "6" },
+            { value: "discount", text: "% Disc", disabled: true },
+            { value: "7" },
+            { value: "8" },
+            { value: "9" },
+            { value: "price", text: "Price", disabled: true },
+            { value: "-", text: "+/-", disabled: true },
+            { value: "0" },
+            { value: this.env.services.localization.decimalPoint },
+            { value: "Backspace", text: "⌫" },
+        ];
+    }
     async onSearch(search) {
         Object.assign(this._state.ui.searchDetails, search);
         if (this._state.ui.filter == "SYNCED") {
diff --git a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.xml b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.xml
index 4e04302a4fe..bbb4a911217 100644
--- a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.xml
+++ b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.xml
@@ -135,11 +135,7 @@
                                     actionType="'refund'"
                                     actionToTrigger.bind="onDoRefund"
                                     isActionButtonHighlighted="getHasItemsToRefund()" />
-                                <NumpadWidget
-                                    disabledModes="['price', 'discount']"
-                                    setNumpadMode="() => {}"
-                                    activeMode="_selectedOrderlineId and 'quantity'"
-                                    disableSign="true" />
+                                <Numpad buttons="getNumpadButtons()" class="'max-width-325px'"/>
                             </div>
                         </div>
                     </t>
diff --git a/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.js b/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.js
index ea32ce67566..d3888ed0bc0 100644
--- a/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.js
+++ b/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.js
@@ -4,9 +4,11 @@ import { _t } from "@web/core/l10n/translation";
 import { AbstractAwaitablePopup } from "@point_of_sale/app/popup/abstract_awaitable_popup";
 import { useService } from "@web/core/utils/hooks";
 import { useState, useRef, onMounted } from "@odoo/owl";
+import { Numpad } from "@point_of_sale/app/generic_components/numpad/numpad";
 
 export class NumberPopup extends AbstractAwaitablePopup {
     static template = "point_of_sale.NumberPopup";
+    static components = { Numpad };
     static defaultProps = {
         confirmText: _t("Confirm"),
         cancelText: _t("Discard"),
@@ -33,7 +35,6 @@ export class NumberPopup extends AbstractAwaitablePopup {
      */
     setup() {
         super.setup();
-        this.localization = useService("localization");
         let startingBuffer = "";
         let startingPayload = null;
         if (typeof this.props.startingValue === "number" && this.props.startingValue > 0) {
@@ -62,8 +63,26 @@ export class NumberPopup extends AbstractAwaitablePopup {
             this.inputRef.el.focus();
         }
     }
-    get decimalSeparator() {
-        return this.localization.decimalPoint;
+    getNumpadButtons() {
+        const { isPassword, cheap } = this.props;
+        return [
+            { value: "1" },
+            { value: "2" },
+            { value: "3" },
+            ...(!isPassword ? [{ value: cheap ? "+1" : "+10" }] : []),
+            { value: "4" },
+            { value: "5" },
+            { value: "6" },
+            ...(!isPassword ? [{ value: cheap ? "+2" : "+20" }] : []),
+            { value: "7" },
+            { value: "8" },
+            { value: "9" },
+            ...(!isPassword ? [{ value: "-" }] : []),
+            { value: "Delete", text: "C" },
+            { value: "0" },
+            ...(!isPassword ? [{ value: this.env.services.localization.decimalPoint }] : []),
+            { value: "Backspace", text: "⌫" },
+        ];
     }
     get inputBuffer() {
         if (this.state.buffer === null) {
@@ -80,9 +99,6 @@ export class NumberPopup extends AbstractAwaitablePopup {
             super.confirm();
         }
     }
-    sendInput(key) {
-        this.numberBuffer.sendKey(key);
-    }
     getPayload() {
         let startingPayload = null;
         if (typeof this.props.startingValue === "number" && this.props.startingValue > 0) {
diff --git a/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.scss b/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.scss
deleted file mode 100644
index 238dc9864e2..00000000000
--- a/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.popup-numpad .input-button, 
-.popup-numpad .mode-button {
-    height: 50px;
-    width: 50px;
-}
diff --git a/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.xml b/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.xml
index 965c9bfa54b..01756d7214f 100644
--- a/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.xml
+++ b/addons/point_of_sale/static/src/app/utils/input_popups/number_popup.xml
@@ -13,48 +13,7 @@
                     <span t-if="props.inputSuffix"><t t-esc="props.inputSuffix" /></span>
                 </div>
             </div>
-            <div class="popup-numpad px-5 my-3">
-                <!-- FIXME POSREF do we really need to hardcode all of these? -->                                             
-                <div class="row">
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('1')">1</button>
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('2')">2</button>
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('3')">3</button>
-                    <t t-if="!props.isPassword and props.cheap">
-                        <button class="mode-button add btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('+1')">+1</button>
-                    </t>
-                    <t t-if="!props.isPassword and !props.cheap">
-                        <button class="mode-button add btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('+10')">+10</button>
-                    </t>
-                </div>
-                <div class="row">
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('4')">4</button>
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('5')">5</button>
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('6')">6</button>
-                    <t t-if="!props.isPassword and props.cheap">
-                        <button class="mode-button add btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('+2')">+2</button>
-                    </t>
-                    <t t-if="!props.isPassword and !props.cheap">
-                        <button class="mode-button add btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('+20')">+20</button>
-                    </t>
-                </div>
-                <div class="row">
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('7')">7</button>
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('8')">8</button>
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('9')">9</button>
-                    <button t-if="!props.isPassword" class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('-')">-</button>
-                </div>
-                <div class="row">
-                    <button class="col-3 input-button numpad-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('Delete')">C</button>
-                    <button class="col-3 input-button number-char btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('0')">0</button>
-                    <button t-if="!props.isPassword" class="col-3 input-button number-char dot btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput(decimalSeparator)">
-                        <t t-esc="decimalSeparator" /></button>
-                    <button class="col-3 input-button numpad-backspace btn btn-secondary p-0 rounded-circle m-1 fw-bolder" t-on-mousedown.prevent="() => this.sendInput('Backspace')">
-                        <img style="pointer-events: none;"
-                                src="/point_of_sale/static/src/img/backspace.png" width="24"
-                                height="21" alt="Backspace" />
-                    </button>
-                </div>
-            </div>
+            <Numpad buttons="getNumpadButtons()" class="'mx-auto my-3 w-75 max-width-325px'"/>
             <footer class="footer centered modal-footer justify-content-center">
                 <button class="button confirm highlight btn btn-lg btn-primary" t-on-mousedown.prevent="confirm">
                         <span><t t-esc="props.confirmText" /></span>
diff --git a/addons/point_of_sale/static/src/img/backspace.png b/addons/point_of_sale/static/src/img/backspace.png
deleted file mode 100644
index 705051d925e75da92078fcff3aeea61aad4694f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5970
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
T*+JTOOASCpL0!H|4jJ|z#dk->

diff --git a/addons/point_of_sale/static/tests/tours/FixedPriceNegativeQty.tour.js b/addons/point_of_sale/static/tests/tours/FixedPriceNegativeQty.tour.js
index 47d7f1bed3a..d57faa1cade 100644
--- a/addons/point_of_sale/static/tests/tours/FixedPriceNegativeQty.tour.js
+++ b/addons/point_of_sale/static/tests/tours/FixedPriceNegativeQty.tour.js
@@ -19,7 +19,7 @@ registry
         
         ProductScreen.do.clickDisplayedProduct("Zero Amount Product");
         ProductScreen.check.selectedOrderlineHas("Zero Amount Product", "1.0", "1.0");
-        ProductScreen.do.pressNumpad("+/- 1");
+        ProductScreen.do.pressNumpad("+/-", "1");
         ProductScreen.check.selectedOrderlineHas("Zero Amount Product", "-1.0", "-1.0");
         
         ProductScreen.do.clickPayButton();
diff --git a/addons/point_of_sale/static/tests/tours/PaymentScreen.tour.js b/addons/point_of_sale/static/tests/tours/PaymentScreen.tour.js
index 35edc59a3be..c92dde95604 100644
--- a/addons/point_of_sale/static/tests/tours/PaymentScreen.tour.js
+++ b/addons/point_of_sale/static/tests/tours/PaymentScreen.tour.js
@@ -28,7 +28,7 @@ registry
             PaymentScreen.check.changeIs("0.0");
             PaymentScreen.check.validateButtonIsHighlighted(false);
             // remove the selected paymentline with multiple backspace presses
-            PaymentScreen.do.pressNumpad("Backspace Backspace");
+            PaymentScreen.do.pressNumpad("⌫ ⌫");
             PaymentScreen.do.fillPaymentLineAmountMobile("Cash", "0");
             PaymentScreen.check.selectedPaymentlineHas("Cash", "0.00");
             PaymentScreen.do.clickPaymentlineDelButton("Cash", "0", true);
diff --git a/addons/point_of_sale/static/tests/tours/PosComboTour.js b/addons/point_of_sale/static/tests/tours/PosComboTour.js
index 41514390a2d..0772690d8aa 100644
--- a/addons/point_of_sale/static/tests/tours/PosComboTour.js
+++ b/addons/point_of_sale/static/tests/tours/PosComboTour.js
@@ -66,7 +66,7 @@ registry.category("web_tour.tours").add("PosComboPriceTaxIncludedTour", {
         ...ErrorPopup.do.clickConfirm(),
 
         // check that removing a combo product removes all the combo products
-        ...ProductScreen.do.pressNumpad("Backspace"),
+        ...ProductScreen.do.pressNumpad("⌫"),
         ...ProductScreen.check.orderIsEmpty(),
 
         ...ProductScreen.do.clickDisplayedProduct("Office Combo"),
diff --git a/addons/point_of_sale/static/tests/tours/ProductScreen.tour.js b/addons/point_of_sale/static/tests/tours/ProductScreen.tour.js
index 9c9c0619991..57526beca19 100644
--- a/addons/point_of_sale/static/tests/tours/ProductScreen.tour.js
+++ b/addons/point_of_sale/static/tests/tours/ProductScreen.tour.js
@@ -34,11 +34,11 @@ registry.category("web_tour.tours").add("ProductScreenTour", {
         // Check effects of clicking numpad buttons
         ProductScreen.do.clickOrderline("Letter Tray", "1");
         ProductScreen.check.selectedOrderlineHas("Letter Tray", "1.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Letter Tray", "0.0", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "3", "15.30");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "0.0", "0.0");
         ProductScreen.do.pressNumpad("1");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "1.0", "5.1");
@@ -46,21 +46,21 @@ registry.category("web_tour.tours").add("ProductScreenTour", {
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "12.0", "61.2");
         ProductScreen.do.pressNumpad("3");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "123.0", "627.3");
-        ProductScreen.do.pressNumpad(". 5");
+        ProductScreen.do.pressNumpad(".", "5");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "123.5", "629.85");
         ProductScreen.do.pressNumpad("Price");
         ProductScreen.check.modeIsActive("Price");
         ProductScreen.do.pressNumpad("1");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "123.5", "123.5");
-        ProductScreen.do.pressNumpad("1 .");
+        ProductScreen.do.pressNumpad("1", ".");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "123.5", "1,358.5");
-        ProductScreen.do.pressNumpad("Disc");
-        ProductScreen.check.modeIsActive("Disc");
-        ProductScreen.do.pressNumpad("5 .");
+        ProductScreen.do.pressNumpad("% Disc");
+        ProductScreen.check.modeIsActive("% Disc");
+        ProductScreen.do.pressNumpad("5", ".");
         ProductScreen.check.selectedOrderlineHas("Desk Organizer", "123.5", "1,290.58");
         ProductScreen.do.pressNumpad("Qty");
-        ProductScreen.do.pressNumpad("Backspace");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.orderIsEmpty();
 
         // Check different subcategories
@@ -85,13 +85,13 @@ registry.category("web_tour.tours").add("ProductScreenTour", {
         ProductScreen.check.selectedOrderlineHas("Wall Shelf Unit", "1.0");
         ProductScreen.do.pressNumpad("2");
         ProductScreen.check.selectedOrderlineHas("Wall Shelf Unit", "2.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Wall Shelf Unit", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "2.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.orderIsEmpty();
 
         // Add multiple orderlines then delete each of them until empty
@@ -102,31 +102,31 @@ registry.category("web_tour.tours").add("ProductScreenTour", {
         ProductScreen.do.clickDisplayedProduct("Monitor Stand");
         ProductScreen.do.clickOrderline("Whiteboard Pen", "1.0");
         ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Monitor Stand", "1.0");
         ProductScreen.do.clickOrderline("Wall Shelf Unit", "1.0");
         ProductScreen.check.selectedOrderlineHas("Wall Shelf Unit", "1.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Wall Shelf Unit", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Monitor Stand", "1.0");
         ProductScreen.do.clickOrderline("Small Shelf", "1.0");
         ProductScreen.check.selectedOrderlineHas("Small Shelf", "1.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Small Shelf", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Monitor Stand", "1.0");
         ProductScreen.do.clickOrderline("Magnetic Board", "1.0");
         ProductScreen.check.selectedOrderlineHas("Magnetic Board", "1.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Magnetic Board", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Monitor Stand", "1.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.selectedOrderlineHas("Monitor Stand", "0.0");
-        ProductScreen.do.pressNumpad("Backspace");
+        ProductScreen.do.pressNumpad("⌫");
         ProductScreen.check.orderIsEmpty();
 
         // Test OrderlineCustomerNoteButton
diff --git a/addons/point_of_sale/static/tests/tours/TicketScreen.tour.js b/addons/point_of_sale/static/tests/tours/TicketScreen.tour.js
index 7e47b963b60..ad36aae9ab7 100644
--- a/addons/point_of_sale/static/tests/tours/TicketScreen.tour.js
+++ b/addons/point_of_sale/static/tests/tours/TicketScreen.tour.js
@@ -116,7 +116,6 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
         TicketScreen.do.clickBackToMainTicketScreen();
         // When going back, the ticket screen should be in its previous state.
         TicketScreen.check.filterIs("Paid");
-
         // Test refund //
         TicketScreen.do.clickDiscard();
         ProductScreen.check.isShown();
@@ -127,7 +126,7 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
         TicketScreen.do.selectOrder("-0005");
         TicketScreen.check.partnerIs("Colleen Diaz");
         TicketScreen.do.clickOrderline("Desk Pad");
-        TicketScreen.do.pressNumpad("3");
+        ProductScreen.do.pressNumpad("3");
         // Error should show because 2 is more than the number
         // that can be refunded.
         ErrorPopup.do.clickConfirm();
@@ -138,7 +137,7 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
         ProductScreen.do.clickRefund();
         TicketScreen.do.selectOrder("-0005");
         TicketScreen.do.clickOrderline("Desk Pad");
-        TicketScreen.do.pressNumpad("1");
+        ProductScreen.do.pressNumpad("1");
         TicketScreen.check.toRefundTextContains("To Refund: 1.00");
         TicketScreen.do.confirmRefund();
         ProductScreen.do.goBackToMainScreen();
@@ -150,10 +149,10 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
         ErrorPopup.do.clickConfirm();
         // Change the refund line quantity to -3 -- not allowed
         // so error popup.
-        ProductScreen.do.pressNumpad("+/- 3");
+        ProductScreen.do.pressNumpad("+/-", "3");
         ErrorPopup.do.clickConfirm();
         // Change the refund line quantity to -2 -- allowed.
-        ProductScreen.do.pressNumpad("+/- 2");
+        ProductScreen.do.pressNumpad("+/-", "2");
         ProductScreen.check.selectedOrderlineHas("Desk Pad", "-2.00");
         // Check if the amount being refunded changed to 2.
         ProductScreen.do.clickRefund();
diff --git a/addons/point_of_sale/static/tests/tours/acceptance_tour.js b/addons/point_of_sale/static/tests/tours/acceptance_tour.js
index bc0db66ba1d..e7cee296c99 100644
--- a/addons/point_of_sale/static/tests/tours/acceptance_tour.js
+++ b/addons/point_of_sale/static/tests/tours/acceptance_tour.js
@@ -1,6 +1,7 @@
 /** @odoo-module */
 
 import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods";
+import { Numpad } from "@point_of_sale/../tests/tours/helpers/NumpadTourMethods";
 import { registry } from "@web/core/registry";
 
 function add_product_to_order(product_name) {
@@ -66,13 +67,7 @@ function set_fiscal_position_on_order(fp_name) {
 }
 
 function press_payment_numpad(val) {
-    return [
-        {
-            content: `press ${val} on payment screen numpad`,
-            trigger: `.payment-numpad .input-button:contains("${val}"):visible`,
-            mobile: false,
-        },
-    ];
+    return [{ ...Numpad.click(val), mobile: false }];
 }
 
 function fillPaymentLineAmountMobile(lineName, keys) {
@@ -107,10 +102,7 @@ function press_product_numpad(val) {
             trigger: ".btn-switchpane:contains('Review')",
             mobile: true,
         },
-        {
-            content: `press ${val} on product screen numpad`,
-            trigger: `.numpad .input-button:contains("${val}"):visible`,
-        },
+        Numpad.click(val),
         {
             content: "go back to the products",
             trigger: ".floor-button",
diff --git a/addons/point_of_sale/static/tests/tours/helpers/NumberPopupTourMethods.js b/addons/point_of_sale/static/tests/tours/helpers/NumberPopupTourMethods.js
index bd6da251b1d..70e684c304a 100644
--- a/addons/point_of_sale/static/tests/tours/helpers/NumberPopupTourMethods.js
+++ b/addons/point_of_sale/static/tests/tours/helpers/NumberPopupTourMethods.js
@@ -1,6 +1,7 @@
 /** @odoo-module */
 
 import { createTourMethods } from "@point_of_sale/../tests/tours/helpers/utils";
+import { Numpad } from "@point_of_sale/../tests/tours/helpers/NumpadTourMethods";
 
 class Do {
     /**
@@ -10,34 +11,11 @@ class Do {
      * @param {String} keys space-separated input keys
      */
     pressNumpad(keys) {
-        const numberChars = "0 1 2 3 4 5 6 7 8 9 C".split(" ");
-        const modeButtons = "+1 +10 +2 +20 +5 +50".split(" ");
-        const decimalSeparators = ", .".split(" ");
-        function generateStep(key) {
-            let trigger;
-            if (numberChars.includes(key)) {
-                trigger = `.popup-numpad .number-char:contains("${key}")`;
-            } else if (modeButtons.includes(key)) {
-                trigger = `.popup-numpad .mode-button:contains("${key}")`;
-            } else if (key === "Backspace") {
-                trigger = `.popup-numpad .numpad-backspace`;
-            } else if (decimalSeparators.includes(key)) {
-                trigger = `.popup-numpad .number-char.dot`;
-            }
-            return {
-                content: `'${key}' pressed in numpad`,
-                trigger,
-                mobile: false,
-            };
-        }
-        return keys.split(" ").map(generateStep);
+        return keys.split(" ").map((key) => Numpad.click(key, { mobile: false }));
     }
     enterValue(keys) {
-        const numpadKeys = keys.split('').join(' ');
-        return [
-            ...this.pressNumpad(numpadKeys),
-            ...this.fillPopupValue(keys)
-        ];
+        const numpadKeys = keys.split("").join(" ");
+        return [...this.pressNumpad(numpadKeys), ...this.fillPopupValue(keys)];
     }
     fillPopupValue(keys) {
         return [
@@ -60,7 +38,7 @@ class Do {
                 content: "click confirm button",
                 trigger: ".popup .footer .confirm",
                 mobile: true,
-            }
+            },
         ];
     }
 }
diff --git a/addons/point_of_sale/static/tests/tours/helpers/NumpadTourMethods.js b/addons/point_of_sale/static/tests/tours/helpers/NumpadTourMethods.js
new file mode 100644
index 00000000000..4f0eb677ba7
--- /dev/null
+++ b/addons/point_of_sale/static/tests/tours/helpers/NumpadTourMethods.js
@@ -0,0 +1,20 @@
+/** @odoo-module */
+
+const buttonTriger = (buttonValue) => `div.numpad.row button.col:contains("${buttonValue}")`;
+export const Numpad = {
+    click: (buttonValue, options = {}) => ({
+        content: `click numpad button: ${buttonValue}`,
+        trigger: buttonTriger(buttonValue),
+        run: () => {
+            [...$(buttonTriger(buttonValue))]
+                .filter((el) => el.innerHTML == buttonValue)[0]
+                ?.click();
+        },
+        mobile: options.mobile,
+    }),
+    isActive: (buttonValue) => ({
+        content: `check if --${buttonValue}-- mode is activated`,
+        trigger: `${buttonTriger(buttonValue)}.active`,
+        isCheck: true,
+    }),
+};
diff --git a/addons/point_of_sale/static/tests/tours/helpers/PaymentScreenTourMethods.js b/addons/point_of_sale/static/tests/tours/helpers/PaymentScreenTourMethods.js
index 2c106a9f0f4..8f956b04a4f 100644
--- a/addons/point_of_sale/static/tests/tours/helpers/PaymentScreenTourMethods.js
+++ b/addons/point_of_sale/static/tests/tours/helpers/PaymentScreenTourMethods.js
@@ -1,6 +1,7 @@
 /** @odoo-module */
 
 import { createTourMethods } from "@point_of_sale/../tests/tours/helpers/utils";
+import { Numpad } from "@point_of_sale/../tests/tours/helpers/NumpadTourMethods";
 
 class Do {
     clickPaymentMethod(name) {
@@ -86,24 +87,7 @@ class Do {
      * @param {String} keys space-separated numpad keys
      */
     pressNumpad(keys) {
-        const numberChars = ". +/- 0 1 2 3 4 5 6 7 8 9".split(" ");
-        const modeButtons = "+10 +20 +50".split(" ");
-        function generateStep(key) {
-            let trigger;
-            if (numberChars.includes(key)) {
-                trigger = `.payment-numpad .number-char:contains("${key}")`;
-            } else if (modeButtons.includes(key)) {
-                trigger = `.payment-numpad .mode-button:contains("${key}")`;
-            } else if (key === "Backspace") {
-                trigger = `.payment-numpad .number-char img[alt="Backspace"]`;
-            }
-            return {
-                content: `'${key}' pressed in payment numpad`,
-                trigger,
-                mobile: false,
-            };
-        }
-        return keys.split(" ").map(generateStep);
+        return keys.split(" ").map((key) => Numpad.click(key, { mobile: false }));
     }
 
     clickBack() {
diff --git a/addons/point_of_sale/static/tests/tours/helpers/ProductScreenTourMethods.js b/addons/point_of_sale/static/tests/tours/helpers/ProductScreenTourMethods.js
index 85bad9776ca..11b645d68e6 100644
--- a/addons/point_of_sale/static/tests/tours/helpers/ProductScreenTourMethods.js
+++ b/addons/point_of_sale/static/tests/tours/helpers/ProductScreenTourMethods.js
@@ -2,7 +2,7 @@
 
 import { createTourMethods } from "@point_of_sale/../tests/tours/helpers/utils";
 import { TextAreaPopup } from "@point_of_sale/../tests/tours/helpers/TextAreaPopupTourMethods";
-
+import { Numpad } from "@point_of_sale/../tests/tours/helpers/NumpadTourMethods";
 class Do {
     clickDisplayedProduct(name) {
         return [
@@ -70,34 +70,16 @@ class Do {
      * NOTE: Maximum of 2 characters because NumberBuffer only allows 2 consecutive
      * fast inputs. Fast inputs is the case in tours.
      *
-     * @param {String} keys space-separated numpad keys
+     * @param {...String} keys space-separated numpad keys
      */
-    pressNumpad(keys) {
-        const numberChars = ". 0 1 2 3 4 5 6 7 8 9".split(" ");
-        const modeButtons = "Qty Price Disc".split(" ");
-        function generateStep(key) {
-            let trigger;
-            if (numberChars.includes(key)) {
-                trigger = `.numpad .number-char:contains("${key}")`;
-            } else if (modeButtons.includes(key)) {
-                trigger = `.numpad .mode-button:contains("${key}")`;
-            } else if (key === "Backspace") {
-                trigger = `.numpad .numpad-backspace`;
-            } else if (key === "+/-") {
-                trigger = `.numpad .numpad-minus`;
-            }
-            return {
-                content: `'${key}' pressed in product screen numpad`,
-                trigger,
-            };
-        }
+    pressNumpad(...keys) {
         return [
             {
                 content: "click review button",
                 trigger: ".btn-switchpane:contains('Review')",
                 mobile: true,
             },
-            ...keys.split(" ").map(generateStep),
+            ...keys.map(Numpad.click),
             {
                 content: "go back to the products",
                 trigger: ".pos-rightheader .floor-button",
@@ -456,11 +438,7 @@ class Check {
                 trigger: ".btn-switchpane:contains('Review')",
                 mobile: true,
             },
-            {
-                content: `'${mode}' is active`,
-                trigger: `.numpad button.selected-mode:contains('${mode}')`,
-                run: function () {},
-            },
+            Numpad.isActive(mode),
             {
                 content: "go back to the products",
                 trigger: ".pos-rightheader .floor-button",
@@ -576,20 +554,27 @@ class Execute {
      */
     addOrderline(productName, quantity = 1, unitPrice = undefined, expectedTotal = undefined) {
         const res = this._do.clickDisplayedProduct(productName);
+        const mapKey = (key) => {
+            if (key === "-") {
+                return "+/-";
+            }
+            return key;
+        };
+        const numpadWrite = (val) =>
+            val
+                .toString()
+                .split("")
+                .flatMap((key) => this._do.pressNumpad(mapKey(key)));
         res.push(...this._check.selectedOrderlineHas(productName, "1.00"));
         if (unitPrice) {
             res.push(...this._do.pressNumpad("Price"));
             res.push(...this._check.modeIsActive("Price"));
-            res.push(...this._do.pressNumpad(unitPrice.toString().split("").join(" ")));
+            res.push(...numpadWrite(unitPrice));
             res.push(...this._do.pressNumpad("Qty"));
             res.push(...this._check.modeIsActive("Qty"));
         }
-        for (const char of quantity.toString() == "1" ? "" : quantity.toString()) {
-            if (".0123456789".includes(char)) {
-                res.push(...this._do.pressNumpad(char));
-            } else if ("-".includes(char)) {
-                res.push(...this._do.pressNumpad("+/-"));
-            }
+        if (quantity.toString() !== "1") {
+            res.push(...numpadWrite(quantity));
         }
         if (expectedTotal) {
             res.push(...this._check.selectedOrderlineHas(productName, quantity, expectedTotal));
diff --git a/addons/point_of_sale/static/tests/tours/helpers/TicketScreenTourMethods.js b/addons/point_of_sale/static/tests/tours/helpers/TicketScreenTourMethods.js
index 06b64254503..a678abb2166 100644
--- a/addons/point_of_sale/static/tests/tours/helpers/TicketScreenTourMethods.js
+++ b/addons/point_of_sale/static/tests/tours/helpers/TicketScreenTourMethods.js
@@ -150,31 +150,6 @@ class Do {
             },
         ];
     }
-    pressNumpad(key) {
-        let trigger;
-        if (".0123456789".includes(key)) {
-            trigger = `.numpad .number-char:contains("${key}")`;
-        } else if (key === "Backspace") {
-            trigger = `.numpad .numpad-backspace`;
-        } else if (key === "+/-") {
-            trigger = `.numpad .numpad-minus`;
-        }
-        return [
-            {
-                content: "click review button",
-                trigger: ".btn-switchpane:contains('Review')",
-                mobile: true,
-            },
-            {
-                trigger,
-            },
-            {
-                content: "go back",
-                trigger: ".pos-rightheader .floor-button",
-                mobile: true,
-            },
-        ];
-    }
     confirmRefund() {
         return [
             {
diff --git a/addons/point_of_sale/static/tests/tours/pricelist_tour.js b/addons/point_of_sale/static/tests/tours/pricelist_tour.js
index c4bfcb6a76e..2e515684c50 100644
--- a/addons/point_of_sale/static/tests/tours/pricelist_tour.js
+++ b/addons/point_of_sale/static/tests/tours/pricelist_tour.js
@@ -5,6 +5,7 @@ import { registry } from "@web/core/registry";
 import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods";
 import { roundDecimals as round_di } from "@web/core/utils/numbers";
 import { nbsp } from "@web/core/utils/strings";
+import { Numpad } from "./helpers/NumpadTourMethods";
 
 function assert(condition, message) {
     if (!condition) {
@@ -211,10 +212,7 @@ steps = steps.concat([
         content: "select fixed pricelist",
         trigger: ".selection-item:contains('min_quantity ordering')",
     },
-    {
-        content: "change qty to 2 kg",
-        trigger: ".numpad button.input-button:visible:contains('2')",
-    },
+    Numpad.click("2"),
     {
         content: "qty of Wall Shelf line should be 2",
         trigger:
@@ -250,19 +248,9 @@ steps = steps.concat([
             ".order-container .orderlines .orderline.selected .product-name:contains('Small Shelf') ~ .info-list .info em:contains('1.0')",
         run: function () {},
     },
-    {
-        content: "change to price mode",
-        trigger: ".numpad button:contains('Price')",
-    },
-    {
-        content: "make sure price mode is activated",
-        trigger: ".numpad button.selected-mode:contains('Price')",
-        run: function () {},
-    },
-    {
-        content: "manually override the unit price of these shelf to $5",
-        trigger: ".numpad button.input-button:visible:contains('5')",
-    },
+    Numpad.click("Price"),
+    Numpad.isActive("Price"),
+    Numpad.click("5"),
     {
         content: "Small Shelf line should be selected with unit price of 5",
         trigger:
@@ -270,15 +258,8 @@ steps = steps.concat([
         extra_trigger:
             ".order-container .orderlines .orderline.selected .product-name:contains('Small Shelf') ~ .price:contains('5.0')",
     },
-    {
-        content: "change back to qty mode",
-        trigger: ".numpad button:contains('Qty')",
-    },
-    {
-        content: "make sure qty mode is activated",
-        trigger: ".numpad button.selected-mode:contains('Qty')",
-        run: function () {},
-    },
+    Numpad.click("Qty"),
+    Numpad.isActive("Qty"),
     {
         content: "click more button",
         trigger: ".mobile-more-button",
diff --git a/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js b/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js
index 344ddf1e503..2a367793936 100644
--- a/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js
+++ b/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js
@@ -91,7 +91,7 @@ registry
             ProductScreen.do.clickRefund();
             TicketScreen.do.selectOrder("-0001");
             TicketScreen.do.clickOrderline("Magnetic Board");
-            TicketScreen.do.pressNumpad("1");
+            ProductScreen.do.pressNumpad("1");
             TicketScreen.do.confirmRefund();
             ProductScreen.check.isShown();
             ProductScreen.check.selectedOrderlineHas("Magnetic Board", "-1.00");
diff --git a/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js b/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js
index 99adaf466f1..6750cbf6010 100644
--- a/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js
+++ b/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js
@@ -25,7 +25,7 @@ registry
             ProductScreen.check.selectedOrderlineHas("Gift Card");
             ProductScreen.do.pressNumpad("Price");
             ProductScreen.check.modeIsActive("Price");
-            ProductScreen.do.pressNumpad("1 0");
+            ProductScreen.do.pressNumpad("1", "0");
             PosLoyalty.check.orderTotalIs("10.00");
             PosLoyalty.exec.finalizeOrder("Cash", "10");
             // One card for gift_card_1.
@@ -34,7 +34,7 @@ registry
             ProductScreen.check.selectedOrderlineHas("Gift Card");
             ProductScreen.do.pressNumpad("Price");
             ProductScreen.check.modeIsActive("Price");
-            ProductScreen.do.pressNumpad("2 0");
+            ProductScreen.do.pressNumpad("2", "0");
             PosLoyalty.check.orderTotalIs("20.00");
             PosLoyalty.exec.finalizeOrder("Cash", "20");
             // Top up ewallet_1 for AAAAAAA.
@@ -46,7 +46,7 @@ registry
             ProductScreen.do.clickCustomer("AAAAAAA");
             ProductScreen.do.pressNumpad("Price");
             ProductScreen.check.modeIsActive("Price");
-            ProductScreen.do.pressNumpad("3 0");
+            ProductScreen.do.pressNumpad("3", "0");
             PosLoyalty.check.orderTotalIs("30.00");
             PosLoyalty.exec.finalizeOrder("Cash", "30");
             // Top up ewallet_2 for AAAAAAA.
@@ -56,7 +56,7 @@ registry
             ProductScreen.do.clickCustomer("AAAAAAA");
             ProductScreen.do.pressNumpad("Price");
             ProductScreen.check.modeIsActive("Price");
-            ProductScreen.do.pressNumpad("4 0");
+            ProductScreen.do.pressNumpad("4", "0");
             PosLoyalty.check.orderTotalIs("40.00");
             PosLoyalty.exec.finalizeOrder("Cash", "40");
             // Top up ewallet_1 for BBBBBBB.
diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js
index 6c77bf69902..bec6a15c66f 100644
--- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js
+++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js
@@ -5,184 +5,177 @@ import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScre
 import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils";
 import { registry } from "@web/core/registry";
 
+registry.category("web_tour.tours").add("PosLoyaltyLoyaltyProgram1", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyLoyaltyProgram1", { 
-        test: true, 
-        url: "/pos/web", 
-        steps: () => {
-            startSteps();
-            
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
-            
-            // Order1: Generates 2 points.
-            ProductScreen.exec.addOrderline("Whiteboard Pen", "2");
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner AAA");
-            PosLoyalty.check.orderTotalIs("6.40");
-            PosLoyalty.exec.finalizeOrder("Cash", "10");
-            
-            // Order2: Consumes points to get free product.
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner AAA");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "2.00");
-            // At this point, Test Partner AAA has 4 points.
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "3.00");
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            PosLoyalty.check.orderTotalIs("6.40");
-            PosLoyalty.exec.finalizeOrder("Cash", "10");
-            
-            // Order3: Generate 4 points.
-            // - Initially gets free product, but was removed automatically by changing the
-            //   number of items to zero.
-            // - It's impossible to checked here if the free product reward is really removed
-            //   so we check in the backend the number of orders that consumed the reward.
-            ProductScreen.exec.addOrderline("Whiteboard Pen", "4");
-            PosLoyalty.check.orderTotalIs("12.80");
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner AAA");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.do.pressNumpad("Backspace");
-            // At this point, the reward line should have been automatically removed
-            // because there is not enough points to purchase it. Unfortunately, we
-            // can't check that here.
-            PosLoyalty.check.orderTotalIs("0.00");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "2.00");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "3.00");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "4.00");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            
-            PosLoyalty.check.orderTotalIs("12.80");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
 
-            return getSteps(); 
-        } 
-    });
+        // Order1: Generates 2 points.
+        ProductScreen.exec.addOrderline("Whiteboard Pen", "2");
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner AAA");
+        PosLoyalty.check.orderTotalIs("6.40");
+        PosLoyalty.exec.finalizeOrder("Cash", "10");
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyLoyaltyProgram2", { 
-        test: true, 
-        url: "/pos/web", 
-        steps: () => {
-            startSteps();
-            
-            ProductScreen.do.clickHomeCategory();
-            
-            // Order1: Immediately set the customer to Test Partner AAA which has 4 points.
-            // - He has enough points to purchase a free product but since there is still
-            //   no product in the order, reward button should not yet be highlighted.
-            // - Furthermore, clicking the reward product should not add it as reward product.
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner AAA");
-            // No item in the order, so reward button is off.
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            PosLoyalty.check.orderTotalIs("3.20");
-            PosLoyalty.exec.finalizeOrder("Cash", "10");
-            
-            // Order2: Generate 4 points for Test Partner CCC.
-            // - Reference: Order2_CCC
-            // - But set Test Partner BBB first as the customer.
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner BBB");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "2.00");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "3.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "4.00");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner CCC");
-            PosLoyalty.check.customerIs("Test Partner CCC");
-            PosLoyalty.check.orderTotalIs("12.80");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
-            
-            // Order3: Generate 3 points for Test Partner BBB.
-            // - Reference: Order3_BBB
-            // - But set Test Partner CCC first as the customer.
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner CCC");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.exec.addOrderline("Whiteboard Pen", "3");
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner BBB");
-            PosLoyalty.check.customerIs("Test Partner BBB");
-            PosLoyalty.check.orderTotalIs("9.60");
-            PosLoyalty.exec.finalizeOrder("Cash", "10");
-            
-            // Order4: Should not have reward because the customer will be removed.
-            // - Reference: Order4_no_reward
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("Test Partner CCC");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            PosLoyalty.do.claimReward("Free Product - Whiteboard Pen");
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
-            ProductScreen.do.clickPartnerButton();
-            // This deselects the customer.
-            PosLoyalty.do.unselectPartner();
-            PosLoyalty.check.customerIs("Customer");
-            PosLoyalty.check.orderTotalIs("6.40");
-            PosLoyalty.exec.finalizeOrder("Cash", "10");
+        // Order2: Consumes points to get free product.
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner AAA");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "2.00");
+        // At this point, Test Partner AAA has 4 points.
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "3.00");
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        PosLoyalty.check.orderTotalIs("6.40");
+        PosLoyalty.exec.finalizeOrder("Cash", "10");
 
-            return getSteps(); 
-        } 
-    });
+        // Order3: Generate 4 points.
+        // - Initially gets free product, but was removed automatically by changing the
+        //   number of items to zero.
+        // - It's impossible to checked here if the free product reward is really removed
+        //   so we check in the backend the number of orders that consumed the reward.
+        ProductScreen.exec.addOrderline("Whiteboard Pen", "4");
+        PosLoyalty.check.orderTotalIs("12.80");
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner AAA");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.do.pressNumpad("⌫");
+        // At this point, the reward line should have been automatically removed
+        // because there is not enough points to purchase it. Unfortunately, we
+        // can't check that here.
+        PosLoyalty.check.orderTotalIs("0.00");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "2.00");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "3.00");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "4.00");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyLoyaltyProgram3", { 
-        test: true, 
-        url: "/pos/web", 
-        steps: () => {
-            startSteps();
-            
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
-            
-            // Generates 10.2 points and use points to get the reward product with zero sale price
-            ProductScreen.exec.addOrderline('Desk Organizer', '2');
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer('Test Partner AAA');
-            
-            // At this point, the free_product program is triggered.
-            // The reward button should be highlighted.
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            PosLoyalty.do.claimReward("Free Product - Whiteboard Pen");
-            PosLoyalty.check.hasRewardLine('Free Product - Whiteboard Pen', '0.0', '1.00');
-            
-            PosLoyalty.check.orderTotalIs('10.2');
-            PosLoyalty.exec.finalizeOrder('Cash', '10.2');
+        PosLoyalty.check.orderTotalIs("12.80");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
 
-            return getSteps(); 
-        } 
-    });
+        return getSteps();
+    },
+});
+
+registry.category("web_tour.tours").add("PosLoyaltyLoyaltyProgram2", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
+
+        ProductScreen.do.clickHomeCategory();
+
+        // Order1: Immediately set the customer to Test Partner AAA which has 4 points.
+        // - He has enough points to purchase a free product but since there is still
+        //   no product in the order, reward button should not yet be highlighted.
+        // - Furthermore, clicking the reward product should not add it as reward product.
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner AAA");
+        // No item in the order, so reward button is off.
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        PosLoyalty.check.orderTotalIs("3.20");
+        PosLoyalty.exec.finalizeOrder("Cash", "10");
+
+        // Order2: Generate 4 points for Test Partner CCC.
+        // - Reference: Order2_CCC
+        // - But set Test Partner BBB first as the customer.
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner BBB");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "2.00");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "3.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "4.00");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner CCC");
+        PosLoyalty.check.customerIs("Test Partner CCC");
+        PosLoyalty.check.orderTotalIs("12.80");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
+
+        // Order3: Generate 3 points for Test Partner BBB.
+        // - Reference: Order3_BBB
+        // - But set Test Partner CCC first as the customer.
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner CCC");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.exec.addOrderline("Whiteboard Pen", "3");
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner BBB");
+        PosLoyalty.check.customerIs("Test Partner BBB");
+        PosLoyalty.check.orderTotalIs("9.60");
+        PosLoyalty.exec.finalizeOrder("Cash", "10");
+
+        // Order4: Should not have reward because the customer will be removed.
+        // - Reference: Order4_no_reward
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        ProductScreen.check.selectedOrderlineHas("Whiteboard Pen", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner CCC");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        PosLoyalty.do.claimReward("Free Product - Whiteboard Pen");
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
+        ProductScreen.do.clickPartnerButton();
+        // This deselects the customer.
+        PosLoyalty.do.unselectPartner();
+        PosLoyalty.check.customerIs("Customer");
+        PosLoyalty.check.orderTotalIs("6.40");
+        PosLoyalty.exec.finalizeOrder("Cash", "10");
+
+        return getSteps();
+    },
+});
+
+registry.category("web_tour.tours").add("PosLoyaltyLoyaltyProgram3", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
+
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
+
+        // Generates 10.2 points and use points to get the reward product with zero sale price
+        ProductScreen.exec.addOrderline("Desk Organizer", "2");
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("Test Partner AAA");
+
+        // At this point, the free_product program is triggered.
+        // The reward button should be highlighted.
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        PosLoyalty.do.claimReward("Free Product - Whiteboard Pen");
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "0.0", "1.00");
+
+        PosLoyalty.check.orderTotalIs("10.2");
+        PosLoyalty.exec.finalizeOrder("Cash", "10.2");
+
+        return getSteps();
+    },
+});
diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js
index 8e5332294b8..aea3766ea04 100644
--- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js
+++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js
@@ -6,205 +6,195 @@ import { SelectionPopup } from "@point_of_sale/../tests/tours/helpers/SelectionP
 import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils";
 import { registry } from "@web/core/registry";
 
+registry.category("web_tour.tours").add("PosLoyaltyFreeProductTour", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyFreeProductTour", { 
-        test: true, 
-        url: "/pos/web", 
-        steps: () => {
-            startSteps();
-            
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
-            
-            ProductScreen.exec.addOrderline("Desk Organizer", "2");
-            
-            // At this point, the free_product program is triggered.
-            // The reward button should be highlighted.
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            // Since the reward button is highlighted, clicking the reward product should be added as reward.
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            ProductScreen.check.selectedOrderlineHas("Desk Organizer", "3.00");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-5.10", "1.00");
-            // In the succeeding 2 clicks on the product, it is considered as a regular product.
-            // In the third click, the product will be added as reward.
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            ProductScreen.check.selectedOrderlineHas("Desk Organizer", "6.00");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-10.20", "2.00");
-            
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            PosLoyalty.check.orderTotalIs("25.50");
-            // Finalize order that consumed a reward.
-            PosLoyalty.exec.finalizeOrder("Cash", "30");
-            
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            ProductScreen.check.selectedOrderlineHas("Desk Organizer", "1.00");
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            ProductScreen.check.selectedOrderlineHas("Desk Organizer", "2.00");
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-5.10", "1.00");
-            ProductScreen.do.pressNumpad("Backspace");
-            ProductScreen.check.selectedOrderlineHas("Desk Organizer", "0.00");
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            ProductScreen.check.selectedOrderlineHas("Desk Organizer", "1.00");
-            ProductScreen.do.clickDisplayedProduct("Desk Organizer");
-            ProductScreen.check.selectedOrderlineHas("Desk Organizer", "2.00");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            // Finalize order but without the reward.
-            // This step is important. When syncing the order, no reward should be synced.
-            PosLoyalty.check.orderTotalIs("10.20");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
-            
-            ProductScreen.exec.addOrderline("Magnetic Board", "2");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.do.clickDisplayedProduct("Magnetic Board");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
-            ProductScreen.do.clickOrderline("Magnetic Board", "3.00");
-            ProductScreen.check.selectedOrderlineHas("Magnetic Board", "3.00");
-            ProductScreen.do.pressNumpad("6");
-            ProductScreen.check.selectedOrderlineHas("Magnetic Board", "6.00");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            PosLoyalty.do.claimReward("Free Product - Whiteboard Pen");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-6.40", "2.00");
-            // Finalize order that consumed a reward.
-            PosLoyalty.check.orderTotalIs("11.88");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
-            
-            ProductScreen.exec.addOrderline("Magnetic Board", "6");
-            ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            
-            ProductScreen.do.clickOrderline("Magnetic Board", "6.00");
-            ProductScreen.do.pressNumpad("Backspace");
-            // At this point, the reward should have been removed.
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.check.selectedOrderlineHas("Magnetic Board", "0.00");
-            ProductScreen.do.clickDisplayedProduct("Magnetic Board");
-            ProductScreen.check.selectedOrderlineHas("Magnetic Board", "1.00");
-            ProductScreen.do.clickDisplayedProduct("Magnetic Board");
-            ProductScreen.check.selectedOrderlineHas("Magnetic Board", "2.00");
-            ProductScreen.do.clickDisplayedProduct("Magnetic Board");
-            ProductScreen.check.selectedOrderlineHas("Magnetic Board", "3.00");
-            PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            
-            PosLoyalty.check.orderTotalIs("5.94");
-            PosLoyalty.exec.finalizeOrder("Cash", "10");
-            
-            // Promotion: 2 items of shelves, get desk_pad/monitor_stand free
-            // This is the 5th order.
-            ProductScreen.do.clickDisplayedProduct("Wall Shelf Unit");
-            ProductScreen.check.selectedOrderlineHas("Wall Shelf Unit", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.do.clickDisplayedProduct("Small Shelf");
-            ProductScreen.check.selectedOrderlineHas("Small Shelf", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            // Click reward product. Should be automatically added as reward.
-            ProductScreen.do.clickDisplayedProduct("Desk Pad");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            PosLoyalty.check.hasRewardLine("Free Product", "-1.98", "1.00");
-            // Remove the reward line. The next steps will check if cashier
-            // can select from the different reward products.
-            ProductScreen.do.pressNumpad("Backspace");
-            ProductScreen.do.pressNumpad("Backspace");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            PosLoyalty.do.claimReward("Free Product - [Desk Pad, Monitor Stand]");
-            SelectionPopup.check.hasSelectionItem("Monitor Stand");
-            SelectionPopup.check.hasSelectionItem("Desk Pad");
-            SelectionPopup.do.clickItem("Desk Pad");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            PosLoyalty.check.hasRewardLine("Free Product", "-1.98", "1.00");
-            ProductScreen.do.pressNumpad("Backspace");
-            ProductScreen.do.pressNumpad("Backspace");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            PosLoyalty.do.claimReward("Free Product - [Desk Pad, Monitor Stand]");
-            SelectionPopup.check.hasSelectionItem("Monitor Stand");
-            SelectionPopup.check.hasSelectionItem("Desk Pad");
-            SelectionPopup.do.clickItem("Monitor Stand");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            ProductScreen.check.selectedOrderlineHas("Monitor Stand", "1.00", "3.19");
-            PosLoyalty.check.hasRewardLine("Free Product", "-3.19", "1.00");
-            PosLoyalty.check.orderTotalIs("4.81");
-            PosLoyalty.exec.finalizeOrder("Cash", "10");
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
 
-            return getSteps(); 
-        }
-    });
+        ProductScreen.exec.addOrderline("Desk Organizer", "2");
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyFreeProductTour2", { 
-        test: true, 
-        url: "/pos/web", 
-        steps: () => {
-            startSteps();
-            
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
-            
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer("AAA Partner");
-            ProductScreen.exec.addOrderline("Test Product A", "1");
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            PosLoyalty.do.clickRewardButton();
-            SelectionPopup.do.clickItem("Free Product - Test Product A");
-            PosLoyalty.check.hasRewardLine("Free Product - Test Product A", "-11.50", "1.00");
-            PosLoyalty.check.isRewardButtonHighlighted(false);
-            return getSteps(); 
-        }
-    });
+        // At this point, the free_product program is triggered.
+        // The reward button should be highlighted.
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        // Since the reward button is highlighted, clicking the reward product should be added as reward.
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        ProductScreen.check.selectedOrderlineHas("Desk Organizer", "3.00");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-5.10", "1.00");
+        // In the succeeding 2 clicks on the product, it is considered as a regular product.
+        // In the third click, the product will be added as reward.
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        ProductScreen.check.selectedOrderlineHas("Desk Organizer", "6.00");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-10.20", "2.00");
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltySpecificDiscountTour", { 
-        test: true, 
-        url: "/pos/web", 
-        steps: () => {
-            startSteps();
-            
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
-            
-            ProductScreen.do.clickDisplayedProduct('Test Product A');
-            ProductScreen.check.selectedOrderlineHas('Test Product A', '1.00', '40.00');
-            ProductScreen.do.clickDisplayedProduct('Test Product B');
-            ProductScreen.check.selectedOrderlineHas('Test Product B', '1.00', '40.00');
-            PosLoyalty.do.clickRewardButton();
-            SelectionPopup.do.clickItem("$ 10 per order on specific products");
-            PosLoyalty.check.hasRewardLine('$ 10 per order on specific products', '-10.00', '1.00');
-            PosLoyalty.check.orderTotalIs('60.00');
-            return getSteps(); 
-        } 
-    });
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        PosLoyalty.check.orderTotalIs("25.50");
+        // Finalize order that consumed a reward.
+        PosLoyalty.exec.finalizeOrder("Cash", "30");
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltySpecificDiscountWithFreeProductTour", { 
-        test: true, 
-        url: "/pos/web", 
-        steps: () => {
-            startSteps();
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        ProductScreen.check.selectedOrderlineHas("Desk Organizer", "1.00");
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        ProductScreen.check.selectedOrderlineHas("Desk Organizer", "2.00");
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-5.10", "1.00");
+        ProductScreen.do.pressNumpad("⌫");
+        ProductScreen.check.selectedOrderlineHas("Desk Organizer", "0.00");
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        ProductScreen.check.selectedOrderlineHas("Desk Organizer", "1.00");
+        ProductScreen.do.clickDisplayedProduct("Desk Organizer");
+        ProductScreen.check.selectedOrderlineHas("Desk Organizer", "2.00");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        // Finalize order but without the reward.
+        // This step is important. When syncing the order, no reward should be synced.
+        PosLoyalty.check.orderTotalIs("10.20");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
 
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
+        ProductScreen.exec.addOrderline("Magnetic Board", "2");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.do.clickDisplayedProduct("Magnetic Board");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
+        ProductScreen.do.clickOrderline("Magnetic Board", "3.00");
+        ProductScreen.check.selectedOrderlineHas("Magnetic Board", "3.00");
+        ProductScreen.do.pressNumpad("6");
+        ProductScreen.check.selectedOrderlineHas("Magnetic Board", "6.00");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        PosLoyalty.do.claimReward("Free Product - Whiteboard Pen");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-6.40", "2.00");
+        // Finalize order that consumed a reward.
+        PosLoyalty.check.orderTotalIs("11.88");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
 
-            ProductScreen.do.clickDisplayedProduct('Test Product A');
-            ProductScreen.do.clickDisplayedProduct('Test Product C');
-            PosLoyalty.check.orderTotalIs('130.00');
-            PosLoyalty.check.isRewardButtonHighlighted(true);
-            PosLoyalty.do.clickRewardButton();
-            PosLoyalty.check.orderTotalIs('130.00');
-            return getSteps(); 
-        } 
-    });
-    
\ No newline at end of file
+        ProductScreen.exec.addOrderline("Magnetic Board", "6");
+        ProductScreen.do.clickDisplayedProduct("Whiteboard Pen");
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+
+        ProductScreen.do.clickOrderline("Magnetic Board", "6.00");
+        ProductScreen.do.pressNumpad("⌫");
+        // At this point, the reward should have been removed.
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.check.selectedOrderlineHas("Magnetic Board", "0.00");
+        ProductScreen.do.clickDisplayedProduct("Magnetic Board");
+        ProductScreen.check.selectedOrderlineHas("Magnetic Board", "1.00");
+        ProductScreen.do.clickDisplayedProduct("Magnetic Board");
+        ProductScreen.check.selectedOrderlineHas("Magnetic Board", "2.00");
+        ProductScreen.do.clickDisplayedProduct("Magnetic Board");
+        ProductScreen.check.selectedOrderlineHas("Magnetic Board", "3.00");
+        PosLoyalty.check.hasRewardLine("Free Product - Whiteboard Pen", "-3.20", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+
+        PosLoyalty.check.orderTotalIs("5.94");
+        PosLoyalty.exec.finalizeOrder("Cash", "10");
+
+        // Promotion: 2 items of shelves, get desk_pad/monitor_stand free
+        // This is the 5th order.
+        ProductScreen.do.clickDisplayedProduct("Wall Shelf Unit");
+        ProductScreen.check.selectedOrderlineHas("Wall Shelf Unit", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.do.clickDisplayedProduct("Small Shelf");
+        ProductScreen.check.selectedOrderlineHas("Small Shelf", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        // Click reward product. Should be automatically added as reward.
+        ProductScreen.do.clickDisplayedProduct("Desk Pad");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        PosLoyalty.check.hasRewardLine("Free Product", "-1.98", "1.00");
+        // Remove the reward line. The next steps will check if cashier
+        // can select from the different reward products.
+        ProductScreen.do.pressNumpad("⌫");
+        ProductScreen.do.pressNumpad("⌫");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        PosLoyalty.do.claimReward("Free Product - [Desk Pad, Monitor Stand]");
+        SelectionPopup.check.hasSelectionItem("Monitor Stand");
+        SelectionPopup.check.hasSelectionItem("Desk Pad");
+        SelectionPopup.do.clickItem("Desk Pad");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        PosLoyalty.check.hasRewardLine("Free Product", "-1.98", "1.00");
+        ProductScreen.do.pressNumpad("⌫");
+        ProductScreen.do.pressNumpad("⌫");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        PosLoyalty.do.claimReward("Free Product - [Desk Pad, Monitor Stand]");
+        SelectionPopup.check.hasSelectionItem("Monitor Stand");
+        SelectionPopup.check.hasSelectionItem("Desk Pad");
+        SelectionPopup.do.clickItem("Monitor Stand");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        ProductScreen.check.selectedOrderlineHas("Monitor Stand", "1.00", "3.19");
+        PosLoyalty.check.hasRewardLine("Free Product", "-3.19", "1.00");
+        PosLoyalty.check.orderTotalIs("4.81");
+        PosLoyalty.exec.finalizeOrder("Cash", "10");
+
+        return getSteps();
+    },
+});
+
+registry.category("web_tour.tours").add("PosLoyaltyFreeProductTour2", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
+
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
+
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("AAA Partner");
+        ProductScreen.exec.addOrderline("Test Product A", "1");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        PosLoyalty.do.clickRewardButton();
+        SelectionPopup.do.clickItem("Free Product - Test Product A");
+        PosLoyalty.check.hasRewardLine("Free Product - Test Product A", "-11.50", "1.00");
+        PosLoyalty.check.isRewardButtonHighlighted(false);
+        return getSteps();
+    },
+});
+
+registry.category("web_tour.tours").add("PosLoyaltySpecificDiscountTour", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
+
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
+
+        ProductScreen.do.clickDisplayedProduct("Test Product A");
+        ProductScreen.check.selectedOrderlineHas("Test Product A", "1.00", "40.00");
+        ProductScreen.do.clickDisplayedProduct("Test Product B");
+        ProductScreen.check.selectedOrderlineHas("Test Product B", "1.00", "40.00");
+        PosLoyalty.do.clickRewardButton();
+        SelectionPopup.do.clickItem("$ 10 per order on specific products");
+        PosLoyalty.check.hasRewardLine("$ 10 per order on specific products", "-10.00", "1.00");
+        PosLoyalty.check.orderTotalIs("60.00");
+        return getSteps();
+    },
+});
+
+registry.category("web_tour.tours").add("PosLoyaltySpecificDiscountWithFreeProductTour", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
+
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
+
+        ProductScreen.do.clickDisplayedProduct("Test Product A");
+        ProductScreen.do.clickDisplayedProduct("Test Product C");
+        PosLoyalty.check.orderTotalIs("130.00");
+        PosLoyalty.check.isRewardButtonHighlighted(true);
+        PosLoyalty.do.clickRewardButton();
+        PosLoyalty.check.orderTotalIs("130.00");
+        return getSteps();
+    },
+});
diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js
index 126c02c9503..d38564fc65b 100644
--- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js
+++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js
@@ -6,277 +6,261 @@ import { SelectionPopup } from "@point_of_sale/../tests/tours/helpers/SelectionP
 import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils";
 import { registry } from "@web/core/registry";
 
+registry.category("web_tour.tours").add("PosLoyaltyTour1", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        // --- PoS Loyalty Tour Basic Part 1 ---
+        // Generate coupons for PosLoyaltyTour2.
+        startSteps();
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyTour1", {
-        test: true,
-        url: "/pos/web",
-        steps: () => {
-            // --- PoS Loyalty Tour Basic Part 1 ---
-            // Generate coupons for PosLoyaltyTour2.
-            startSteps();
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
 
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
+        // basic order
+        // just accept the automatically applied promo program
+        // applied programs:
+        //   - on cheapest product
+        ProductScreen.exec.addOrderline("Whiteboard Pen", "5");
+        PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-2.88");
+        PosLoyalty.do.selectRewardLine("on the cheapest product");
+        PosLoyalty.check.orderTotalIs("13.12");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
 
-            // basic order
-            // just accept the automatically applied promo program
-            // applied programs:
-            //   - on cheapest product
-            ProductScreen.exec.addOrderline("Whiteboard Pen", "5");
-            PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-2.88");
-            PosLoyalty.do.selectRewardLine("on the cheapest product");
-            PosLoyalty.check.orderTotalIs("13.12");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
+        // remove the reward from auto promo program
+        // no applied programs
+        ProductScreen.exec.addOrderline("Whiteboard Pen", "6");
+        PosLoyalty.check.hasRewardLine("on the cheapest product", "-2.88");
+        PosLoyalty.check.orderTotalIs("16.32");
+        PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
+        PosLoyalty.check.orderTotalIs("19.2");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
 
-            // remove the reward from auto promo program
-            // no applied programs
-            ProductScreen.exec.addOrderline("Whiteboard Pen", "6");
-            PosLoyalty.check.hasRewardLine("on the cheapest product", "-2.88");
-            PosLoyalty.check.orderTotalIs("16.32");
-            PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
-            PosLoyalty.check.orderTotalIs("19.2");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
+        // order with coupon code from coupon program
+        // applied programs:
+        //   - coupon program
+        ProductScreen.exec.addOrderline("Desk Organizer", "9");
+        PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.59");
+        PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
+        PosLoyalty.check.orderTotalIs("45.90");
+        PosLoyalty.do.enterCode("invalid_code");
+        PosLoyalty.check.notificationMessageContains("invalid_code");
+        PosLoyalty.do.enterCode("1234");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-15.30");
+        PosLoyalty.exec.finalizeOrder("Cash", "50");
 
-            // order with coupon code from coupon program
-            // applied programs:
-            //   - coupon program
-            ProductScreen.exec.addOrderline("Desk Organizer", "9");
-            PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.59");
-            PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
-            PosLoyalty.check.orderTotalIs("45.90");
-            PosLoyalty.do.enterCode("invalid_code");
-            PosLoyalty.check.notificationMessageContains("invalid_code");
-            PosLoyalty.do.enterCode("1234");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-15.30");
-            PosLoyalty.exec.finalizeOrder("Cash", "50");
+        // Use coupon but eventually remove the reward
+        // applied programs:
+        //   - on cheapest product
+        ProductScreen.exec.addOrderline("Letter Tray", "4");
+        ProductScreen.exec.addOrderline("Desk Organizer", "9");
+        PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-4.75");
+        PosLoyalty.check.orderTotalIs("62.27");
+        PosLoyalty.do.enterCode("5678");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-15.30");
+        PosLoyalty.check.orderTotalIs("46.97");
+        PosLoyalty.exec.removeRewardLine("Free Product");
+        PosLoyalty.check.orderTotalIs("62.27");
+        PosLoyalty.exec.finalizeOrder("Cash", "90");
 
-            // Use coupon but eventually remove the reward
-            // applied programs:
-            //   - on cheapest product
-            ProductScreen.exec.addOrderline("Letter Tray", "4");
-            ProductScreen.exec.addOrderline("Desk Organizer", "9");
-            PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-4.75");
-            PosLoyalty.check.orderTotalIs("62.27");
-            PosLoyalty.do.enterCode("5678");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-15.30");
-            PosLoyalty.check.orderTotalIs("46.97");
-            PosLoyalty.exec.removeRewardLine("Free Product");
-            PosLoyalty.check.orderTotalIs("62.27");
-            PosLoyalty.exec.finalizeOrder("Cash", "90");
+        // specific product discount
+        // applied programs:
+        //   - on cheapest product
+        //   - on specific products
+        ProductScreen.exec.addOrderline("Magnetic Board", "10"); // 1.98
+        ProductScreen.exec.addOrderline("Desk Organizer", "3"); // 5.1
+        ProductScreen.exec.addOrderline("Letter Tray", "4"); // 4.8 tax 10%
+        PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-1.78");
+        PosLoyalty.check.orderTotalIs("54.44");
+        PosLoyalty.do.enterCode("promocode");
+        PosLoyalty.check.hasRewardLine("50% on specific products", "-16.66"); // 17.55 - 1.78*0.5
+        PosLoyalty.check.orderTotalIs("37.78");
+        PosLoyalty.exec.finalizeOrder("Cash", "50");
+        return getSteps();
+    },
+});
 
-            // specific product discount
-            // applied programs:
-            //   - on cheapest product
-            //   - on specific products
-            ProductScreen.exec.addOrderline("Magnetic Board", "10"); // 1.98
-            ProductScreen.exec.addOrderline("Desk Organizer", "3"); // 5.1
-            ProductScreen.exec.addOrderline("Letter Tray", "4"); // 4.8 tax 10%
-            PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-1.78");
-            PosLoyalty.check.orderTotalIs("54.44");
-            PosLoyalty.do.enterCode("promocode");
-            PosLoyalty.check.hasRewardLine("50% on specific products", "-16.66"); // 17.55 - 1.78*0.5
-            PosLoyalty.check.orderTotalIs("37.78");
-            PosLoyalty.exec.finalizeOrder("Cash", "50");
-            return getSteps();
-        }
-    });
+registry.category("web_tour.tours").add("PosLoyaltyTour2", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        // --- PoS Loyalty Tour Basic Part 2 ---
+        // Using the coupons generated from PosLoyaltyTour1.
+        startSteps();
 
+        ProductScreen.do.clickHomeCategory();
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyTour2", {
-        test: true,
-        url: "/pos/web",
-        steps: () => {
-            // --- PoS Loyalty Tour Basic Part 2 ---
-            // Using the coupons generated from PosLoyaltyTour1.
-            startSteps();
+        // Test that global discount and cheapest product discounts can be accumulated.
+        // Applied programs:
+        //   - global discount
+        //   - on cheapest discount
+        ProductScreen.exec.addOrderline("Desk Organizer", "10"); // 5.1
+        PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.59");
+        ProductScreen.exec.addOrderline("Letter Tray", "4"); // 4.8 tax 10%
+        PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.75");
+        PosLoyalty.do.enterCode("123456");
+        PosLoyalty.check.hasRewardLine("10% on your order", "-5.10");
+        PosLoyalty.check.hasRewardLine("10% on your order", "-1.64");
+        PosLoyalty.check.orderTotalIs("60.63"); //SUBTOTAL
+        PosLoyalty.exec.finalizeOrder("Cash", "70");
 
-            ProductScreen.do.clickHomeCategory();
+        // Scanning coupon twice.
+        // Also apply global discount on top of free product to check if the
+        // calculated discount is correct.
+        // Applied programs:
+        //  - coupon program (free product)
+        //  - global discount
+        //  - on cheapest discount
+        ProductScreen.exec.addOrderline("Desk Organizer", "11"); // 5.1 per item
+        PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-4.59");
+        PosLoyalty.check.orderTotalIs("51.51");
+        // add global discount and the discount will be replaced
+        PosLoyalty.do.enterCode("345678");
+        PosLoyalty.check.hasRewardLine("10% on your order", "-5.15");
+        // add free product coupon (for qty=11, free=4)
+        // the discount should change after having free products
+        // it should go back to cheapest discount as it is higher
+        PosLoyalty.do.enterCode("5678");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-20.40");
+        PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-4.59");
+        // set quantity to 18
+        // free qty stays the same since the amount of points on the card only allows for 4 free products
+        ProductScreen.do.pressNumpad("⌫", "8");
+        PosLoyalty.check.hasRewardLine("10% on your order", "-6.68");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-20.40");
+        // scan the code again and check notification
+        PosLoyalty.do.enterCode("5678");
+        PosLoyalty.check.orderTotalIs("60.13");
+        PosLoyalty.exec.finalizeOrder("Cash", "65");
 
-            // Test that global discount and cheapest product discounts can be accumulated.
-            // Applied programs:
-            //   - global discount
-            //   - on cheapest discount
-            ProductScreen.exec.addOrderline("Desk Organizer", "10"); // 5.1
-            PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.59");
-            ProductScreen.exec.addOrderline("Letter Tray", "4"); // 4.8 tax 10%
-            PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.75");
-            PosLoyalty.do.enterCode("123456");
-            PosLoyalty.check.hasRewardLine("10% on your order", "-5.10");
-            PosLoyalty.check.hasRewardLine("10% on your order", "-1.64");
-            PosLoyalty.check.orderTotalIs("60.63"); //SUBTOTAL
-            PosLoyalty.exec.finalizeOrder("Cash", "70");
+        // Specific products discount (with promocode) and free product (1357)
+        // Applied programs:
+        //   - discount on specific products
+        //   - free product
+        ProductScreen.exec.addOrderline("Desk Organizer", "6"); // 5.1 per item
+        PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.59");
+        PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
+        PosLoyalty.do.enterCode("promocode");
+        PosLoyalty.check.hasRewardLine("50% on specific products", "-15.30");
+        PosLoyalty.do.enterCode("1357");
+        PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-10.20");
+        PosLoyalty.check.hasRewardLine("50% on specific products", "-10.20");
+        PosLoyalty.check.orderTotalIs("10.20");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
 
-            // Scanning coupon twice.
-            // Also apply global discount on top of free product to check if the
-            // calculated discount is correct.
-            // Applied programs:
-            //  - coupon program (free product)
-            //  - global discount
-            //  - on cheapest discount
-            ProductScreen.exec.addOrderline("Desk Organizer", "11"); // 5.1 per item
-            PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-4.59");
-            PosLoyalty.check.orderTotalIs("51.51");
-            // add global discount and the discount will be replaced
-            PosLoyalty.do.enterCode("345678");
-            PosLoyalty.check.hasRewardLine("10% on your order", "-5.15");
-            // add free product coupon (for qty=11, free=4)
-            // the discount should change after having free products
-            // it should go back to cheapest discount as it is higher
-            PosLoyalty.do.enterCode("5678");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-20.40");
-            PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-4.59");
-            // set quantity to 18
-            // free qty stays the same since the amount of points on the card only allows for 4 free products
-            ProductScreen.do.pressNumpad("Backspace 8");
-            PosLoyalty.check.hasRewardLine("10% on your order", "-6.68");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-20.40");
-            // scan the code again and check notification
-            PosLoyalty.do.enterCode("5678");
-            PosLoyalty.check.orderTotalIs("60.13");
-            PosLoyalty.exec.finalizeOrder("Cash", "65");
+        // Check reset program
+        // Enter two codes and reset the programs.
+        // The codes should be checked afterwards. They should return to new.
+        // Applied programs:
+        //   - cheapest product
+        ProductScreen.exec.addOrderline("Monitor Stand", "6"); // 3.19 per item
+        PosLoyalty.do.enterCode("098765");
+        PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-2.87");
+        PosLoyalty.check.hasRewardLine("10% on your order", "-1.63");
+        PosLoyalty.check.orderTotalIs("14.64");
+        PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
+        PosLoyalty.check.hasRewardLine("10% on your order", "-1.91");
+        PosLoyalty.check.orderTotalIs("17.23");
+        PosLoyalty.do.resetActivePrograms();
+        PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-2.87");
+        PosLoyalty.check.orderTotalIs("16.27");
+        PosLoyalty.exec.finalizeOrder("Cash", "20");
+        return getSteps();
+    },
+});
 
-            // Specific products discount (with promocode) and free product (1357)
-            // Applied programs:
-            //   - discount on specific products
-            //   - free product
-            ProductScreen.exec.addOrderline("Desk Organizer", "6"); // 5.1 per item
-            PosLoyalty.check.hasRewardLine("on the cheapest product", "-4.59");
-            PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
-            PosLoyalty.do.enterCode("promocode");
-            PosLoyalty.check.hasRewardLine("50% on specific products", "-15.30");
-            PosLoyalty.do.enterCode("1357");
-            PosLoyalty.check.hasRewardLine("Free Product - Desk Organizer", "-10.20");
-            PosLoyalty.check.hasRewardLine("50% on specific products", "-10.20");
-            PosLoyalty.check.orderTotalIs("10.20");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
+registry.category("web_tour.tours").add("PosLoyaltyTour3", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        // --- PoS Loyalty Tour Basic Part 3 ---
 
-            // Check reset program
-            // Enter two codes and reset the programs.
-            // The codes should be checked afterwards. They should return to new.
-            // Applied programs:
-            //   - cheapest product
-            ProductScreen.exec.addOrderline("Monitor Stand", "6"); // 3.19 per item
-            PosLoyalty.do.enterCode("098765");
-            PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-2.87");
-            PosLoyalty.check.hasRewardLine("10% on your order", "-1.63");
-            PosLoyalty.check.orderTotalIs("14.64");
-            PosLoyalty.exec.removeRewardLine("90% on the cheapest product");
-            PosLoyalty.check.hasRewardLine("10% on your order", "-1.91");
-            PosLoyalty.check.orderTotalIs("17.23");
-            PosLoyalty.do.resetActivePrograms();
-            PosLoyalty.check.hasRewardLine("90% on the cheapest product", "-2.87");
-            PosLoyalty.check.orderTotalIs("16.27");
-            PosLoyalty.exec.finalizeOrder("Cash", "20");
-            return getSteps();
-        }
-    });
+        startSteps();
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyTour3", {
-        test: true,
-        url: "/pos/web",
-        steps: () => {
-            // --- PoS Loyalty Tour Basic Part 3 ---
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
 
-            startSteps();
+        ProductScreen.do.clickDisplayedProduct("Promo Product");
+        PosLoyalty.check.orderTotalIs("34.50");
+        ProductScreen.do.clickDisplayedProduct("Product B");
+        PosLoyalty.check.hasRewardLine("100% on specific products", "25.00");
+        ProductScreen.do.clickDisplayedProduct("Product A");
+        PosLoyalty.check.hasRewardLine("100% on specific products", "15.00");
+        PosLoyalty.check.orderTotalIs("34.50");
+        ProductScreen.do.clickDisplayedProduct("Product A");
+        PosLoyalty.check.hasRewardLine("100% on specific products", "21.82");
+        PosLoyalty.check.hasRewardLine("100% on specific products", "18.18");
+        PosLoyalty.check.orderTotalIs("49.50");
 
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
+        return getSteps();
+    },
+});
 
-            ProductScreen.do.clickDisplayedProduct("Promo Product");
-            PosLoyalty.check.orderTotalIs("34.50");
-            ProductScreen.do.clickDisplayedProduct("Product B");
-            PosLoyalty.check.hasRewardLine("100% on specific products", "25.00");
-            ProductScreen.do.clickDisplayedProduct("Product A");
-            PosLoyalty.check.hasRewardLine("100% on specific products", "15.00");
-            PosLoyalty.check.orderTotalIs("34.50");
-            ProductScreen.do.clickDisplayedProduct("Product A");
-            PosLoyalty.check.hasRewardLine("100% on specific products", "21.82");
-            PosLoyalty.check.hasRewardLine("100% on specific products", "18.18");
-            PosLoyalty.check.orderTotalIs("49.50");
+registry.category("web_tour.tours").add("PosLoyaltyTour4", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
 
-            return getSteps();
-        }
-    });
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyTour4", {
-        test: true,
-        url: "/pos/web",
-        steps: () => {
-            startSteps();
+        ProductScreen.exec.addOrderline("Test Product 1", "1");
+        ProductScreen.exec.addOrderline("Test Product 2", "1");
+        ProductScreen.do.selectPriceList("Public Pricelist");
+        PosLoyalty.do.enterCode("abcda");
+        PosLoyalty.check.orderTotalIs("0.00");
+        ProductScreen.do.selectPriceList("Test multi-currency");
+        PosLoyalty.check.orderTotalIs("0.00");
+        return getSteps();
+    },
+});
 
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
+registry.category("web_tour.tours").add("PosCouponTour5", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        startSteps();
 
-            ProductScreen.exec.addOrderline("Test Product 1", "1");
-            ProductScreen.exec.addOrderline("Test Product 2", "1");
-            ProductScreen.do.selectPriceList("Public Pricelist");
-            PosLoyalty.do.enterCode("abcda");
-            PosLoyalty.check.orderTotalIs("0.00");
-            ProductScreen.do.selectPriceList("Test multi-currency");
-            PosLoyalty.check.orderTotalIs("0.00");
-            return getSteps();
-        }
-    });
+        ProductScreen.do.clickHomeCategory();
 
-registry
-    .category("web_tour.tours")
-    .add("PosCouponTour5", {
-        test: true,
-        url: "/pos/web",
-        steps: () => {
-            startSteps();
-
-            ProductScreen.do.clickHomeCategory();
-
-            ProductScreen.exec.addOrderline("Test Product 1", "1.00", "100");
-            PosLoyalty.do.clickDiscountButton();
-            PosLoyalty.do.clickConfirmButton();
-            ProductScreen.check.totalAmountIs("92.00");
-            return getSteps();
-        }
-    });
+        ProductScreen.exec.addOrderline("Test Product 1", "1.00", "100");
+        PosLoyalty.do.clickDiscountButton();
+        PosLoyalty.do.clickConfirmButton();
+        ProductScreen.check.totalAmountIs("92.00");
+        return getSteps();
+    },
+});
 
 //transform the last tour to match the new format
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyTour6", {
-        test: true,
-        url: "/pos/web",
-        steps: () => {
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
+registry.category("web_tour.tours").add("PosLoyaltyTour6", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
 
-            ProductScreen.do.clickPartnerButton();
-            ProductScreen.do.clickCustomer('AAA Partner');
-            ProductScreen.do.clickDisplayedProduct('Test Product A');
-            PosLoyalty.do.clickRewardButton();
-            SelectionPopup.do.clickItem("$ 1 per point on your order");
-            ProductScreen.check.totalAmountIs('138.50');
-            return getSteps();
-        }
-    });
+        ProductScreen.do.clickPartnerButton();
+        ProductScreen.do.clickCustomer("AAA Partner");
+        ProductScreen.do.clickDisplayedProduct("Test Product A");
+        PosLoyalty.do.clickRewardButton();
+        SelectionPopup.do.clickItem("$ 1 per point on your order");
+        ProductScreen.check.totalAmountIs("138.50");
+        return getSteps();
+    },
+});
 
-registry
-    .category("web_tour.tours")
-    .add("PosLoyaltyTour7", {
-        test: true,
-        url: "/pos/web",
-        steps: () => {
-            ProductScreen.do.confirmOpeningPopup();
-            ProductScreen.do.clickHomeCategory();
+registry.category("web_tour.tours").add("PosLoyaltyTour7", {
+    test: true,
+    url: "/pos/web",
+    steps: () => {
+        ProductScreen.do.confirmOpeningPopup();
+        ProductScreen.do.clickHomeCategory();
 
-            ProductScreen.exec.addOrderline('Test Product', '1');
-            PosLoyalty.check.orderTotalIs('100');
-            PosLoyalty.do.enterCode('abcda');
-            PosLoyalty.check.orderTotalIs('90');
-            return getSteps();
-        }
-    });
+        ProductScreen.exec.addOrderline("Test Product", "1");
+        PosLoyalty.check.orderTotalIs("100");
+        PosLoyalty.do.enterCode("abcda");
+        PosLoyalty.check.orderTotalIs("90");
+        return getSteps();
+    },
+});
diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyTourMethods.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTourMethods.js
index fc907192ca4..7e52346f790 100644
--- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyTourMethods.js
+++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTourMethods.js
@@ -193,7 +193,7 @@ class Execute {
     removeRewardLine(name) {
         return [
             ...this.do.selectRewardLine(name),
-            ...ProductScreen.do.pressNumpad("Backspace"),
+            ...ProductScreen.do.pressNumpad("⌫"),
             ...Chrome.do.confirmPopup(),
         ];
     }
diff --git a/addons/pos_restaurant/static/tests/tours/FloorScreen.tour.js b/addons/pos_restaurant/static/tests/tours/FloorScreen.tour.js
index 7b806c72ec2..7a8045d3dde 100644
--- a/addons/pos_restaurant/static/tests/tours/FloorScreen.tour.js
+++ b/addons/pos_restaurant/static/tests/tours/FloorScreen.tour.js
@@ -8,121 +8,119 @@ import { ProductScreen } from "@pos_restaurant/../tests/tours/helpers/ProductScr
 import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils";
 import { registry } from "@web/core/registry";
 
-registry
-    .category("web_tour.tours")
-    .add("FloorScreenTour", { 
-        test: true, 
-        url: "/pos/ui", 
-        steps: () => {
-            // signal to start generating steps
-            // when finished, steps can be taken from getSteps
-            startSteps();
-            
-            // check floors if they contain their corresponding tables
-            FloorScreen.check.selectedFloorIs("Main Floor");
-            FloorScreen.check.hasTable("2");
-            FloorScreen.check.hasTable("4");
-            FloorScreen.check.hasTable("5");
-            FloorScreen.do.clickFloor("Second Floor");
-            FloorScreen.check.hasTable("3");
-            FloorScreen.check.hasTable("1");
-            
-            // clicking table in active mode does not open product screen
-            // instead, table is selected
-            FloorScreen.do.clickEdit();
-            FloorScreen.do.clickTable("3");
-            FloorScreen.check.selectedTableIs("3");
-            FloorScreen.do.clickTable("1");
-            FloorScreen.check.selectedTableIs("1");
-            
-            // test add table
-            FloorScreen.do.clickFloor("Main Floor");
-            FloorScreen.do.clickAddTable();
-            FloorScreen.check.selectedTableIs("1");
-            FloorScreen.do.clickRename();
-            TextInputPopup.check.isShown();
-            TextInputPopup.do.inputText("100");
-            TextInputPopup.do.clickConfirm();
-            FloorScreen.do.clickTable("100");
-            FloorScreen.check.selectedTableIs("100");
-            
-            // test duplicate table
-            FloorScreen.do.clickDuplicate();
-            // the name is the first number available on the floor
-            FloorScreen.check.selectedTableIs("1");
-            FloorScreen.do.clickRename();
-            TextInputPopup.check.isShown();
-            TextInputPopup.do.inputText("1111");
-            TextInputPopup.do.clickConfirm();
-            FloorScreen.do.clickTable("1111");
-            FloorScreen.check.selectedTableIs("1111");
-            
-            // switch floor, switch back and check if
-            // the new tables are still there
-            FloorScreen.do.clickFloor("Second Floor");
-            FloorScreen.check.hasTable("3");
-            FloorScreen.check.hasTable("1");
-            
-            //test duplicate multiple tables
-            FloorScreen.do.clickTable("1");
-            FloorScreen.check.selectedTableIs("1");
-            FloorScreen.do.ctrlClickTable("3");
-            FloorScreen.check.selectedTableIs("3");
-            FloorScreen.do.clickDuplicate();
-            FloorScreen.check.selectedTableIs("2");
-            FloorScreen.check.selectedTableIs("4");
-            
-            //test delete multiple tables
-            FloorScreen.do.clickTrash();
-            Chrome.do.confirmPopup();
-            
-            FloorScreen.do.clickFloor("Main Floor");
-            FloorScreen.check.hasTable("2");
-            FloorScreen.check.hasTable("4");
-            FloorScreen.check.hasTable("5");
-            FloorScreen.check.hasTable("100");
-            FloorScreen.check.hasTable("1111");
-            
-            // test delete table
-            FloorScreen.do.clickTable("2");
-            FloorScreen.check.selectedTableIs("2");
-            FloorScreen.do.clickTrash();
-            Chrome.do.confirmPopup();
-            
-            // change number of seats
-            FloorScreen.do.clickTable("4");
-            FloorScreen.check.selectedTableIs("4");
-            FloorScreen.do.clickSeats();
-            NumberPopup.do.pressNumpad("Backspace 9");
-            NumberPopup.do.fillPopupValue("9");
-            NumberPopup.check.inputShownIs("9");
-            NumberPopup.do.clickConfirm();
-            FloorScreen.check.tableSeatIs("4", "9");
-            
-            // change number of seat when the input is already selected
-            FloorScreen.do.clickTable("4");
-            FloorScreen.check.selectedTableIs("4");
-            FloorScreen.do.clickSeats();
-            NumberPopup.do.enterValue("15");
-            NumberPopup.check.inputShownIs("15");
-            NumberPopup.do.clickConfirm();
-            FloorScreen.check.tableSeatIs("4", "15");
-            
-            // change shape
-            FloorScreen.do.clickTable("4");
-            FloorScreen.do.changeShapeTo("round");
-            
-            // Opening product screen in main floor should go back to main floor
-            FloorScreen.do.closeEdit();
-            FloorScreen.check.tableIsNotSelected("4");
-            FloorScreen.do.clickTable("4");
-            ProductScreen.check.isShown();
-            Chrome.do.backToFloor();
-            
-            // Opening product screen in second floor should go back to second floor
-            FloorScreen.do.clickFloor("Second Floor");
-            FloorScreen.check.hasTable("3");
-            FloorScreen.do.clickTable("3");
-            return getSteps(); 
-        } 
-    });
+registry.category("web_tour.tours").add("FloorScreenTour", {
+    test: true,
+    url: "/pos/ui",
+    steps: () => {
+        // signal to start generating steps
+        // when finished, steps can be taken from getSteps
+        startSteps();
+
+        // check floors if they contain their corresponding tables
+        FloorScreen.check.selectedFloorIs("Main Floor");
+        FloorScreen.check.hasTable("2");
+        FloorScreen.check.hasTable("4");
+        FloorScreen.check.hasTable("5");
+        FloorScreen.do.clickFloor("Second Floor");
+        FloorScreen.check.hasTable("3");
+        FloorScreen.check.hasTable("1");
+
+        // clicking table in active mode does not open product screen
+        // instead, table is selected
+        FloorScreen.do.clickEdit();
+        FloorScreen.do.clickTable("3");
+        FloorScreen.check.selectedTableIs("3");
+        FloorScreen.do.clickTable("1");
+        FloorScreen.check.selectedTableIs("1");
+
+        // test add table
+        FloorScreen.do.clickFloor("Main Floor");
+        FloorScreen.do.clickAddTable();
+        FloorScreen.check.selectedTableIs("1");
+        FloorScreen.do.clickRename();
+        TextInputPopup.check.isShown();
+        TextInputPopup.do.inputText("100");
+        TextInputPopup.do.clickConfirm();
+        FloorScreen.do.clickTable("100");
+        FloorScreen.check.selectedTableIs("100");
+
+        // test duplicate table
+        FloorScreen.do.clickDuplicate();
+        // the name is the first number available on the floor
+        FloorScreen.check.selectedTableIs("1");
+        FloorScreen.do.clickRename();
+        TextInputPopup.check.isShown();
+        TextInputPopup.do.inputText("1111");
+        TextInputPopup.do.clickConfirm();
+        FloorScreen.do.clickTable("1111");
+        FloorScreen.check.selectedTableIs("1111");
+
+        // switch floor, switch back and check if
+        // the new tables are still there
+        FloorScreen.do.clickFloor("Second Floor");
+        FloorScreen.check.hasTable("3");
+        FloorScreen.check.hasTable("1");
+
+        //test duplicate multiple tables
+        FloorScreen.do.clickTable("1");
+        FloorScreen.check.selectedTableIs("1");
+        FloorScreen.do.ctrlClickTable("3");
+        FloorScreen.check.selectedTableIs("3");
+        FloorScreen.do.clickDuplicate();
+        FloorScreen.check.selectedTableIs("2");
+        FloorScreen.check.selectedTableIs("4");
+
+        //test delete multiple tables
+        FloorScreen.do.clickTrash();
+        Chrome.do.confirmPopup();
+
+        FloorScreen.do.clickFloor("Main Floor");
+        FloorScreen.check.hasTable("2");
+        FloorScreen.check.hasTable("4");
+        FloorScreen.check.hasTable("5");
+        FloorScreen.check.hasTable("100");
+        FloorScreen.check.hasTable("1111");
+
+        // test delete table
+        FloorScreen.do.clickTable("2");
+        FloorScreen.check.selectedTableIs("2");
+        FloorScreen.do.clickTrash();
+        Chrome.do.confirmPopup();
+
+        // change number of seats
+        FloorScreen.do.clickTable("4");
+        FloorScreen.check.selectedTableIs("4");
+        FloorScreen.do.clickSeats();
+        NumberPopup.do.pressNumpad("⌫ 9");
+        NumberPopup.do.fillPopupValue("9");
+        NumberPopup.check.inputShownIs("9");
+        NumberPopup.do.clickConfirm();
+        FloorScreen.check.tableSeatIs("4", "9");
+
+        // change number of seat when the input is already selected
+        FloorScreen.do.clickTable("4");
+        FloorScreen.check.selectedTableIs("4");
+        FloorScreen.do.clickSeats();
+        NumberPopup.do.enterValue("15");
+        NumberPopup.check.inputShownIs("15");
+        NumberPopup.do.clickConfirm();
+        FloorScreen.check.tableSeatIs("4", "15");
+
+        // change shape
+        FloorScreen.do.clickTable("4");
+        FloorScreen.do.changeShapeTo("round");
+
+        // Opening product screen in main floor should go back to main floor
+        FloorScreen.do.closeEdit();
+        FloorScreen.check.tableIsNotSelected("4");
+        FloorScreen.do.clickTable("4");
+        ProductScreen.check.isShown();
+        Chrome.do.backToFloor();
+
+        // Opening product screen in second floor should go back to second floor
+        FloorScreen.do.clickFloor("Second Floor");
+        FloorScreen.check.hasTable("3");
+        FloorScreen.do.clickTable("3");
+        return getSteps();
+    },
+});
diff --git a/addons/pos_restaurant/static/tests/tours/Refund.tour.js b/addons/pos_restaurant/static/tests/tours/Refund.tour.js
index 4c70b419639..88e34cac48b 100644
--- a/addons/pos_restaurant/static/tests/tours/Refund.tour.js
+++ b/addons/pos_restaurant/static/tests/tours/Refund.tour.js
@@ -12,8 +12,6 @@ registry.category("web_tour.tours").add("RefundStayCurrentTableTour", {
     test: true,
     url: "/pos/ui",
     steps: () => {
-        // signal to start generating steps
-        // when finished, steps can be taken from getSteps
         startSteps();
         ProductScreen.do.confirmOpeningPopup();
 
@@ -31,13 +29,13 @@ registry.category("web_tour.tours").add("RefundStayCurrentTableTour", {
         PaymentScreen.do.clickValidate();
         ReceiptScreen.do.clickNextOrder();
 
-        // Go to another table and refund one of the product
+        // Go to another table and refund one of the products
         FloorScreen.do.clickTable("4");
         ProductScreen.check.orderIsEmpty();
         ProductScreen.do.clickRefund();
         TicketScreen.do.selectOrder("-0001");
         TicketScreen.do.clickOrderline("Coca-Cola");
-        TicketScreen.do.pressNumpad("2");
+        ProductScreen.do.pressNumpad("2");
         TicketScreen.check.toRefundTextContains("To Refund: 2.00");
         TicketScreen.do.confirmRefund();
         ProductScreen.check.isShown();
diff --git a/addons/pos_sale/static/tests/helpers/ProductScreenTourMethods.js b/addons/pos_sale/static/tests/helpers/ProductScreenTourMethods.js
index 89d8ffb4eee..6af79f5c8b2 100644
--- a/addons/pos_sale/static/tests/helpers/ProductScreenTourMethods.js
+++ b/addons/pos_sale/static/tests/helpers/ProductScreenTourMethods.js
@@ -50,7 +50,7 @@ class DoExt extends Do {
             },
             {
                 content: `click on +10 button`,
-                trigger: `.mode-button.add:contains('+10')`,
+                trigger: `div.numpad.row button.col:contains("+10")`,
             },
             {
                 content: `click on ok button`,
diff --git a/addons/pos_sale/static/tests/tours/PosSaleTour.js b/addons/pos_sale/static/tests/tours/PosSaleTour.js
index 5947dde96ab..a9c58f45713 100644
--- a/addons/pos_sale/static/tests/tours/PosSaleTour.js
+++ b/addons/pos_sale/static/tests/tours/PosSaleTour.js
@@ -22,7 +22,7 @@ registry
             ProductScreen.do.clickQuotationButton();
             ProductScreen.do.selectFirstOrder();
             ProductScreen.check.selectedOrderlineHas('Pizza Chicken', 9);
-            ProductScreen.do.pressNumpad('Qty 2'); // Change the quantity of the product to 2
+            ProductScreen.do.pressNumpad('Qty', '2'); // Change the quantity of the product to 2
             ProductScreen.check.selectedOrderlineHas('Pizza Chicken', 2);
             ProductScreen.do.clickPayButton();
             PaymentScreen.do.clickPaymentMethod('Bank');
@@ -76,7 +76,7 @@ registry
             ProductScreen.do.clickOrderline("Product A", "1");
             ProductScreen.check.selectedOrderlineHas('Product A', '1.00');
             ProductScreen.do.clickOrderline("Product B", "1");
-            ProductScreen.do.pressNumpad('Qty 0');
+            ProductScreen.do.pressNumpad("Qty", "0");
             ProductScreen.check.selectedOrderlineHas('Product B', '0.00');
             ProductScreen.do.clickPayButton();
             PaymentScreen.do.clickPaymentMethod('Bank');
@@ -106,7 +106,7 @@ registry
             TicketScreen.check.filterIs('Paid');
             TicketScreen.do.selectOrder('-0001');
             TicketScreen.do.clickOrderline('Down Payment');
-            TicketScreen.do.pressNumpad('1');
+            ProductScreen.do.pressNumpad('1');
             TicketScreen.do.confirmRefund();
             ProductScreen.do.clickPayButton();
             PaymentScreen.do.clickPaymentMethod('Cash');