From 808a73742c030a71ce39a2abff32401f4f65155a Mon Sep 17 00:00:00 2001
From: "David Monnom (moda)" <moda@odoo.com>
Date: Thu, 20 Jul 2023 07:46:18 +0000
Subject: [PATCH] [IMP] pos_self_order: improve qr code PDF

In order to improve the self order user experience, QR code generation
has been improved. Now, the user can reset the access_token linked to
the QR code and then regenerate them, he can also redownload the QR code
whenever he wishes.

The content of the QR code PDF has also been changed. Now, for each
table a QR code is generated and inserted in the PDF with the name of
the table and its unique identifier (access_token).

closes odoo/odoo#129100

Taskid: 3377335
Related: odoo/upgrade#4958
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
---
 addons/pos_self_order/models/pos_config.py    |  83 ++++--------
 .../pos_self_order/models/pos_restaurant.py   |  24 ----
 .../models/res_config_settings.py             |  17 ++-
 .../static/img/default_qrcode_odoo.png        | Bin 0 -> 16408 bytes
 .../static/src/self_order_service.js          |   4 +-
 addons/pos_self_order/views/qr_code.xml       | 125 ++++++++----------
 .../views/res_config_settings_views.xml       |   5 +-
 7 files changed, 102 insertions(+), 156 deletions(-)
 create mode 100644 addons/pos_self_order/static/img/default_qrcode_odoo.png

diff --git a/addons/pos_self_order/models/pos_config.py b/addons/pos_self_order/models/pos_config.py
index 82177da1e38..844170d39b5 100644
--- a/addons/pos_self_order/models/pos_config.py
+++ b/addons/pos_self_order/models/pos_config.py
@@ -188,65 +188,34 @@ class PosConfig(models.Model):
             "has_active_session": self.has_active_session,
         }
 
-    def _generate_data_for_qr_codes_page(self, cols: int = 4) -> Dict[str, List[Dict]]:
-        """
-        :cols: the number of qr codes per row
-        """
+    def _get_qr_code_data(self):
         self.ensure_one()
-        return {
-            "floors": self._split_qr_codes_list(
-                self._get_qr_codes_info(cols * cols),
-                cols,
-            )
-        }
 
-    def _get_qr_codes_info(self, total_number: int) -> List[Dict]:
-        """
-        total_number: the number of qr codes to generate (in the case where we don't have
-                floor management)
-        return: a list of dictionaries with the following keys:
-            - name: the name of the floor
-            - tables: a list of dictionaries with the following keys:
-                - id: the id of the table
-                - url: the url of the table
-                - name?: the name of the table
-        """
-        self.ensure_one()
+        table_qr_code = []
         if self.self_order_table_mode:
-            return self.floor_ids._get_data_for_qr_codes_page(self._get_self_order_url)
-        else:
-            return self._get_default_qr_codes(total_number, self._get_self_order_url)
+            table_qr_code.extend([{
+                    'name': floor.name,
+                    'type': 'table',
+                    'tables': [
+                        {
+                            'identifier': table.identifier,
+                            'id': table.id,
+                            'name': table.name,
+                            'url': self._get_self_order_url(table.id),
+                        }
+                        for table in floor.table_ids.filtered("active")
+                    ]
+                }
+                for floor in self.floor_ids]
+            )
 
-    def _split_qr_codes_list(self, floors: List[Dict], cols: int) -> List[Dict]:
-        """
-        :floors: the list of floors
-        :cols: the number of qr codes per row
-        """
-        self.ensure_one()
-        return [
-            {
-                "name": floor.get("name"),
-                "rows_of_tables": list(split_every(cols, floor["tables"], list)),
-            }
-            for floor in floors
-        ]
+        table_qr_code.extend([{
+            'name': 'Generic',
+            'type': 'default',
+            'tables': [{
+                'id': i,
+                'url': self._get_self_order_url(),
+            } for i in range(0, 11)]
+        }])
 
-    def _get_default_qr_codes(
-        self, number: int, url: Callable[[Optional[int]], str]
-    ) -> List[Dict]:
-        """
-        :number: the number of qr codes to generate
-        :url: a function that takes a table id and returns the url of the table
-        """
-        self.ensure_one()
-        return [
-            {
-                "tables": [
-                    {
-                        "id": 0,
-                        "url": url(),
-                    }
-                ]
-                * number,
-            }
-        ]
+        return table_qr_code
diff --git a/addons/pos_self_order/models/pos_restaurant.py b/addons/pos_self_order/models/pos_restaurant.py
index 4efce62bb6c..ed195c428e9 100644
--- a/addons/pos_self_order/models/pos_restaurant.py
+++ b/addons/pos_self_order/models/pos_restaurant.py
@@ -7,19 +7,6 @@ from typing import Dict, Callable, List, Optional
 from odoo import api, fields, models
 
 
-class RestaurantFloor(models.Model):
-    _inherit = "restaurant.floor"
-
-    def _get_data_for_qr_codes_page(self, url: Callable):
-        return [
-            {
-                "name": floor.name,
-                "tables": floor.table_ids.filtered("active")._get_data_for_qr_codes_page(url),
-            }
-            for floor in self
-        ]
-
-
 class RestaurantTable(models.Model):
     _inherit = "restaurant.table"
 
@@ -35,17 +22,6 @@ class RestaurantTable(models.Model):
         self.ensure_one()
         return self.read(["name", "identifier"])[0]
 
-    def _get_data_for_qr_codes_page(self, url: Callable[[Optional[int]], str]) -> List[Dict]:
-        return [
-            {
-                'identifier': table.identifier,
-                'id': table.id,
-                'name': table.name,
-                'url': url(table.id),
-            }
-            for table in self
-        ]
-
     @staticmethod
     def _get_identifier():
         return uuid.uuid4().hex[:8]
diff --git a/addons/pos_self_order/models/res_config_settings.py b/addons/pos_self_order/models/res_config_settings.py
index 1b3933de7ac..690de0e0ae9 100644
--- a/addons/pos_self_order/models/res_config_settings.py
+++ b/addons/pos_self_order/models/res_config_settings.py
@@ -2,6 +2,7 @@
 
 from odoo import models, fields, api, _
 from odoo.exceptions import UserError
+from odoo.tools.misc import split_every
 
 
 class ResConfigSettings(models.TransientModel):
@@ -71,13 +72,21 @@ class ResConfigSettings(models.TransientModel):
         """
         Generate the data needed to print the QR codes page
         """
-        if len(self.pos_config_id.floor_ids.table_ids) == 0:
-            raise UserError(_("Before you can create QR codes, you need to create tables for the restaurant."))
-
         return self.env.ref("pos_self_order.report_self_order_qr_codes_page").report_action(
-            [], data=self.pos_config_id._generate_data_for_qr_codes_page(cols=3)
+            [], data={'floors': [
+                {
+                    "name": floor.get("name"),
+                    "type": floor.get("type"),
+                    "table_rows": list(split_every(3, floor["tables"], list)),
+                }
+                for floor in self.pos_config_id._get_qr_code_data()
+            ]}
         )
 
     def preview_self_order_app(self):
         self.ensure_one()
         return self.pos_config_id.preview_self_order_app()
+
+    def update_access_tokens(self):
+        self.ensure_one()
+        self.pos_config_id._update_access_token()
diff --git a/addons/pos_self_order/static/img/default_qrcode_odoo.png b/addons/pos_self_order/static/img/default_qrcode_odoo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d54e63aebf84ee83dd5b79fb1a53510b105e134
GIT binary patch
literal 16408
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
Tt^A<sH<*-|ylAzsLBRh5fug2h

literal 0
HcmV?d00001

diff --git a/addons/pos_self_order/static/src/self_order_service.js b/addons/pos_self_order/static/src/self_order_service.js
index 87d56bf52e9..5db2e5f1b69 100644
--- a/addons/pos_self_order/static/src/self_order_service.js
+++ b/addons/pos_self_order/static/src/self_order_service.js
@@ -282,7 +282,9 @@ export class SelfOrder {
         const order = this.orders.filter((o) => o.access_token === access_token);
         let message = _t("Your order status has been changed");
 
-        if (order.length !== 1) {
+        if (order.length === 0) {
+            throw new Error("Warning, no order with this access_token");
+        } else if (order.length !== 1) {
             throw new Error("Warning, two orders with the same access_token");
         } else {
             order[0].state = state;
diff --git a/addons/pos_self_order/views/qr_code.xml b/addons/pos_self_order/views/qr_code.xml
index 925a3f04a06..f2fdfc31525 100644
--- a/addons/pos_self_order/views/qr_code.xml
+++ b/addons/pos_self_order/views/qr_code.xml
@@ -19,77 +19,66 @@
     </data>
 
     <template id="qr_codes_page">
-        <t t-call="web.basic_layout">
-            <div class="page">
-                <h1 class="text-center">
-                    QR Code Menu
-                </h1>
-                <!-- There is a very annoying problem here:
-                wkhtmltopdf does not handle flex-wrap. ( at least not in this version )
-                This makes it so the bootstrap grid system does not work.
-                We have to do a workaround -->
-
-                <t t-foreach="floors" t-as="floor">
-                <!-- MDN states that "page-break-after" has been replaced by "break-after",
-                but "break-after" is not supported in this version of wkhtmltopdf so we 
-                have to keep using "page-break-after" -->
-                    <div style="page-break-after: always;">
-                        <h3 t-if="floor.get('name')" t-out="floor['name']" class="mb-5"/>
-                        <div
-                            t-foreach="floor['rows_of_tables']"
-                            t-as="row_of_tables"
-                            class="d-flex"
-                            >
-                            <t t-foreach="row_of_tables"
-                                t-as="table"
-                                t-call="pos_self_order.qr_code"
-                                />
-                        </div>
-                    </div>
-                </t>
-            </div>
-        </t>
-    </template>
-
-    <template id="qr_code">
-        <t t-set="qr_code_size" t-value="180"/>
-        <div style="padding: 0px 40px; margin-bottom:40px; page-break-inside: avoid;">
-            <!-- This page-break-inside does not seem to work;
+        <!-- This page-break-inside does not seem to work;
             It would be nice to have the qr codes so the title is never on
             a different page then the qr code itself -->
-            <h4 class="fw-bold text-center"
-                style="margin-top: 20px"
-                t-if="table['id']"
-                >
-                Table: <t t-esc="table['name']"/>
-            </h4>
-            <div class="p-3">
-                <div class="mt-1 mb-4 position-relative top-0 start-0">
-                    <img t-att-src="'/report/barcode/QR/%s?width=%s&amp;height=%s&amp;barLevel=H' %(table['url'], qr_code_size, qr_code_size)"
-                        class="position-relative top-0 start-0"
-                    />
-                    <t t-call="pos_self_order.first_letter_of_odoo_logo_svg"/>
-                </div>
+        <t t-set="qr_code_size" t-value="190"/>
+        <t t-call="web.basic_layout">
+            <div style="display: flex; align-items: center; padding: 0 20px; margin-bottom: 35px;  padding-left: 0; margin-left: 0;">
+                <img src="/pos_self_order/static/img/default_qrcode_odoo.png" style="width: 100px; height: 100px; margin-right: 25px;"/>
+                <h2 stlye="color: #714C67;">Place the QR codes on your tables,<br/>
+                    so your customer scan it to order</h2>
             </div>
-        </div>
-    </template>
 
-    <template id="first_letter_of_odoo_logo_svg">
-        <svg
-            class="position-absolute top-50 start-50"
-            style="-webkit-transform: translate(-50%, -50%);"
-            t-att-width="qr_code_size/4"
-            t-att-height="qr_code_size/4"
-            viewBox="0 0 120 120" fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-        >
-            <g>
-                <rect width="120" height="120" rx="33" fill="white"/>
-                <g>
-                    <path d="M60 110C87.6142 110 110 87.6142 110 60C110 32.3858 87.6142 10 60 10C32.3858 10 10 32.3858 10 60C10 87.6142 32.3858 110 60 110Z" fill="#9C5789"/>
-                    <path d="M59.5166 89.6961C75.8029 89.6961 89.0055 76.4935 89.0055 60.2072C89.0055 43.9209 75.8029 30.7182 59.5166 30.7182C43.2303 30.7182 30.0276 43.9209 30.0276 60.2072C30.0276 76.4935 43.2303 89.6961 59.5166 89.6961Z" fill="white"/>
-                </g>
-            </g>
-        </svg>
+            <div>
+                <h3 style="color: #0C7285">How to use</h3>
+                <p>The below QR codes are predefined with a table number. One per table configured in your floor plan.</p>
+                <p>Want to customise table stand ? Either use any of the below QR codes as-is in your composition
+                or generate new ones with the online tool of your choice. Retrieve a URL by scanning the related QR code.</p>
+            </div>
+
+            <!-- Table with access token -->
+            <t t-if="floors" t-foreach="floors" t-as="floor">
+                <div t-att-style="'page-break-before: always;' if floor.get('type') == 'default' else ''">
+                    <div t-if="floor.get('type') == 'default'" class="margin-bottom: 50px; page-break-before: always;">
+                        <h3 style="color: #0C7285">Generic QR codes</h3>
+                        <p>When one QR code is enough everywhere. If used in self-ordering, customer will be asked to enter the
+                        table number before he can place an order.</p>
+                        <p>Want to customise table stand ? Either use any of the below QR codes as-is in your composition
+                        or generate new ones with the online tool of your choice. Retrieve a URL by scanning the related QR code.</p>
+                    </div>
+                    <h4 t-if="floor.get('name')" t-out="floor['name']" class="mb-3 mt-5"/>
+                    <table style="border: none; border-collapse: collapse; width: 100%;">
+                        <tbody style="border: none;">
+                            <tr t-foreach="floor.get('table_rows')" t-as="row" style="border: none;">
+                                <td t-foreach="row" t-as="table" style="width: 33%; text-align:center; border: none;">
+                                    <div class="mb-3" style="page-break-inside: avoid">
+                                        <h4 class="fw-bold text-center" t-if="table.get('name')">
+                                            Table: <t t-esc="table['name']"/>
+                                        </h4>
+                                        <div class="mt-1 mb-1 position-relative top-0 start-0">
+                                            <img t-att-src="'/report/barcode/QR/%s?width=%s&amp;height=%s&amp;barLevel=H' %(table['url'], qr_code_size, qr_code_size)" class="position-relative top-0 start-0" />
+                                            <svg class="position-absolute top-50 start-50" style="-webkit-transform: translate(-50%, -50%);" t-att-width="qr_code_size/4" t-att-height="qr_code_size/4" viewBox="0 0 120 120" fill="none"
+                                                xmlns="http://www.w3.org/2000/svg">
+                                                <g>
+                                                    <rect width="120" height="120" rx="33" fill="white"/>
+                                                    <g>
+                                                        <path d="M60 110C87.6142 110 110 87.6142 110 60C110 32.3858 87.6142 10 60 10C32.3858 10 10 32.3858 10 60C10 87.6142 32.3858 110 60 110Z" fill="#9C5789"/>
+                                                        <path d="M59.5166 89.6961C75.8029 89.6961 89.0055 76.4935 89.0055 60.2072C89.0055 43.9209 75.8029 30.7182 59.5166 30.7182C43.2303 30.7182 30.0276 43.9209 30.0276 60.2072C30.0276 76.4935 43.2303 89.6961 59.5166 89.6961Z" fill="white"/>
+                                                    </g>
+                                                </g>
+                                            </svg>
+                                        </div>
+                                        <h6 class="fw-bold text-center mb-3" t-if="table.get('identifier')">
+                                            (<t t-esc="table['identifier']"/>)
+                                        </h6>
+                                    </div>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </t>
+        </t>
     </template>
 </odoo>
diff --git a/addons/pos_self_order/views/res_config_settings_views.xml b/addons/pos_self_order/views/res_config_settings_views.xml
index ebacaa30341..e28718dec64 100644
--- a/addons/pos_self_order/views/res_config_settings_views.xml
+++ b/addons/pos_self_order/views/res_config_settings_views.xml
@@ -8,11 +8,12 @@
             <setting id="iface_orderline_notes" position="after">
                 <setting string="QR Code Menu" help="Allow customers to see the menu from their phone">
                     <field name="pos_self_order_view_mode"/>
-                    <div class="content-group d-flex" invisible="not pos_self_order_view_mode">
+                    <div class="content-group d-flex gap-5" invisible="not pos_self_order_view_mode">
                         <div class="d-flex flex-column align-items-start w-50">
                             <button class="btn-link p-0" icon="oi-arrow-right" name="pos_self_order.custom_link_action" type="action" string="Configure Buttons"/>
-                            <button class="btn-link p-0" icon="oi-arrow-right" name="generate_qr_codes_page" type="object" string="Generate QR Codes"/>
                             <button class="btn-link p-0" icon="oi-arrow-right" name="preview_self_order_app" type="object" string="Preview"/>
+                            <button class="btn-link p-0" icon="oi-arrow-right" name="generate_qr_codes_page" type="object" string="Print QR Codes"/>
+                            <button groups="base.group_no_one" class="btn-link p-0" icon="oi-arrow-right" name="update_access_tokens" type="object" string="Reset QR Codes"/>
                         </div>
                         <div class="d-flex flex-column align-items-start w-50">
                             <div class="d-flex flex-column align-items-start">