[14.0][IMP] shopfloor: package checkout buttons

shopfloor/actions/message.py

@@ -807,3 +807,27 @@ def no_line_to_pack(self):
             "message_type": "warning",
             "body": _("No line to pack found."),
         }
+
+    def invalid_scanned_checkout_object_wo_package(
+        self, scanned_object, package_process_type
+    ):
+        scanned_object_name = {
+            "package": _("a package"),
+            "packaging": _("a packaging"),
+            "delivery_packaging": _("a delivery packaging"),
+        }.get(scanned_object, _("N/A"))
+
+        selection = self.env["shopfloor.menu"]._fields["package_process_type"].selection
+        ppt_name = None
+        for el in selection:
+            if el[0] == package_process_type:
+                ppt_name = el[1]
+                break
+
+        return {
+            "message_type": "error",
+            "body": _(
+                "You scanned {scanned_object_name} which is not allowed"
+                " with the package process type '{ppt_name}'"
+            ).format(scanned_object_name=scanned_object_name, ppt_name=ppt_name),
+        }

shopfloor/data/shopfloor_scenario_data.xml

@@ -43,7 +43,8 @@
 {
     "no_prefill_qty": true,
     "show_oneline_package_content": true,
-    "auto_post_line": true
+    "auto_post_line": true,
+    "package_process_type": true
 }
         </field>
     </record>

shopfloor/models/shopfloor_menu.py

@@ -196,6 +196,17 @@ class ShopfloorMenu(models.Model):
         compute="_compute_auto_post_line_is_possible"
     )
 
+    package_process_type_is_possible = fields.Boolean(
+        compute="_compute_package_process_type_is_possible"
+    )
+    package_process_type = fields.Selection(
+        [
+            ("without_package", "Without Package"),
+            ("with_package", "With Package"),
+        ],
+        "Package Proccess Type",
+    )
+
     @api.onchange("unload_package_at_destination")
     def _onchange_unload_package_at_destination(self):
         # Uncheck pick_pack_same_time when unload_package_at_destination is set to True
@@ -411,3 +422,10 @@ def _compute_allow_alternative_destination_is_possible(self):
             menu.allow_alternative_destination_is_possible = (
                 menu.scenario_id.has_option("allow_alternative_destination")
             )
+
+    @api.depends("scenario_id")
+    def _compute_package_process_type_is_possible(self):
+        for menu in self:
+            menu.package_process_type_is_possible = menu.scenario_id.has_option(
+                "package_process_type"
+            )

shopfloor/services/checkout.py

@@ -83,19 +83,28 @@ def _response_for_manual_selection(self, message=None):
         return self._response(next_state="manual_selection", data=data, message=message)
 
     def _response_for_select_package(self, picking, lines, message=None):
+        with_pack, wo_pack = self._get_allow_package_options()
         return self._response(
             next_state="select_package",
             data={
                 "selected_move_lines": self._data_for_move_lines(lines.sorted()),
                 "picking": self.data.picking(picking),
                 "packing_info": self._data_for_packing_info(picking),
-                "no_package_enabled": not self.options.get(
-                    "checkout__disable_no_package"
-                ),
+                "allow_with_package": with_pack,
+                "allow_without_package": wo_pack,
             },
             message=message,
         )
 
+    def _get_allow_package_options(self):
+        if not self.work.menu.package_process_type:
+            return True, True
+
+        if self.work.menu.package_process_type == "with_package":
+            return True, False
+
+        return False, True
+
     def _data_for_packing_info(self, picking):
         """Return the packing information
 
@@ -913,11 +922,37 @@ def scan_package_action(self, picking_id, selected_line_ids, barcode):
 
         selected_lines = self.env["stock.move.line"].browse(selected_line_ids).exists()
         search_result = self._scan_package_find(picking, barcode)
+
+        message = self._check_scan_package_find_result(search_result)
+        if message:
+            return self._response_for_select_package(
+                picking,
+                selected_lines,
+                message=message,
+            )
+
         result_handler = getattr(
             self, "_scan_package_action_from_" + search_result.type
         )
         return result_handler(picking, selected_lines, search_result.record)
 
+    def _check_scan_package_find_result(self, search_result):
+        ppt = self.work.menu.package_process_type
+        # Currently there is no known way to finish the checkout with a scan. To
+        # process without any package is only possible with a button. In its def
+        # a BadRequest is raised in case no package is not allowed
+        if not ppt or ppt == "with_package":
+            return
+
+        stype = search_result.type
+
+        if ppt == "without_package" and stype in [
+            "package",
+            "packaging",
+            "delivery_packaging",
+        ]:
+            return self.msg_store.invalid_scanned_checkout_object_wo_package(stype, ppt)
+
     def _scan_package_find(self, picking, barcode, search_types=None):
         search = self._actions_for("search")
         search_types = (
@@ -1087,7 +1122,7 @@ def no_package(self, picking_id, selected_line_ids):
         Transitions:
         * select_line: goes back to selection of lines to work on next lines
         """
-        if self.options.get("checkout__disable_no_package"):
+        if self.work.menu.package_process_type == "with_package":
             raise BadRequest("`checkout.no_package` endpoint is not enabled")
         picking = self.env["stock.picking"].browse(picking_id)
         message = self._check_picking_status(picking)
@@ -1562,7 +1597,12 @@ def _states(self):
             "select_package": dict(
                 self._schema_selected_lines,
                 packing_info={"type": "string", "nullable": True},
-                no_package_enabled={
+                allow_with_package={
+                    "type": "boolean",
+                    "nullable": True,
+                    "required": False,
+                },
+                allow_without_package={
                     "type": "boolean",
                     "nullable": True,
                     "required": False,

shopfloor/tests/test_checkout_base.py

@@ -59,7 +59,8 @@ def _assert_select_package_qty_above(self, response, picking):
                 ],
                 "picking": self._picking_summary_data(picking),
                 "packing_info": "",
-                "no_package_enabled": True,
+                "allow_with_package": True,
+                "allow_without_package": True,
             },
             message={
                 "message_type": "warning",

shopfloor/tests/test_checkout_list_delivery_packaging.py

@@ -112,9 +112,8 @@ def test_list_delivery_packaging_not_available(self):
                     self._move_line_data(ml) for ml in selected_lines.sorted()
                 ],
                 "packing_info": self.service._data_for_packing_info(self.picking),
-                "no_package_enabled": not self.service.options.get(
-                    "checkout__disable_no_package"
-                ),
+                "allow_with_package": True,
+                "allow_without_package": True,
             },
             message=self.service.msg_store.no_delivery_packaging_available(),
         )

shopfloor/tests/test_checkout_no_package.py

@@ -66,8 +66,8 @@ def test_no_package_ok(self):
             },
         )
 
-    def test_no_package_disabled(self):
-        self.service.work.options = {"checkout__disable_no_package": True}
+    def test_without_package_disabled(self):
+        self.menu.sudo().package_process_type = "with_package"
         with self.assertRaises(werkzeug.exceptions.BadRequest) as err:
             self.service.dispatch(
                 "no_package",