printer-core 0.0.7__tar.gz → 0.0.9__tar.gz

{printer_core-0.0.7 → printer_core-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: printer-core
-Version: 0.0.7
+Version: 0.0.9
 Summary: Foodeo Printer Core Domain.
 Project-URL: Homepage, https://github.com/Foodeo/printer-core
 Project-URL: Repository, https://github.com/Foodeo/printer-core

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/algorithms/products_modifiers_unique_ticket.py

@@ -3,9 +3,15 @@ from printer_core.formatters.discount_formatter import DiscountFormatter
 
 
 class ProductsModifiersUniqueTicket:
-    def __init__(self, formatter: DiscountFormatter, domicile_service_label: str = "Domicile Service"):
+    def __init__(
+        self,
+        formatter: DiscountFormatter,
+        domicile_service_label: str = "Domicile Service",
+        reservation_payment_label: str = "Reservation Payment",
+    ):
         self._formatter = formatter
         self._domicile_service_label = domicile_service_label
+        self._reservation_payment_label = reservation_payment_label
 
     def build(self, request: PrintRequestData, products: list[PrintProductData]) -> list[ClientTicketProduct]:
         list_products_in_same_printers: list[ClientTicketProduct] = []
@@ -27,4 +33,10 @@ class ProductsModifiersUniqueTicket:
                 qty=1,
                 price=str(request.price_domicile_service),
             ))
+        if request.reservation_payment_amount:
+            list_products_in_same_printers.append(ClientTicketProduct(
+                name=self._reservation_payment_label,
+                qty=1,
+                price=str(request.reservation_payment_amount),
+            ))
         return list_products_in_same_printers

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/builders/client_ticket_builder.py

@@ -18,10 +18,12 @@ class ClientTicketBuilder:
     def __init__(self,
                  currency_symbol_resolver: Callable[[str], str] | None = None,
                  domicile_service_label: str = "Domicile Service",
+                 reservation_payment_label: str = "Reservation Payment",
                  clock: Clock | None = None
                  ):
         self._currency_symbol_resolver = currency_symbol_resolver or (lambda _: "")
         self._domicile_service_label = domicile_service_label
+        self._reservation_payment_label = reservation_payment_label
         self._clock = clock or SystemClock()
 
     def build(self,
@@ -83,6 +85,12 @@ class ClientTicketBuilder:
                 qty=1,
                 price=str(request.price_domicile_service),
             ))
+        if request.reservation_payment_amount:
+            list_products.append(ClientTicketProduct(
+                name=self._reservation_payment_label,
+                qty=1,
+                price=str(request.reservation_payment_amount),
+            ))
         return list_products
 
     def _format_discount(self, product: PrintProductData, currency_symbol: str) -> str:

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/entities/print_models.py

@@ -177,6 +177,7 @@ class PrintRequestData(BaseModel):
     payed_with: str | None = None
     fiskalyData: FiskalyData | None = None
     price_domicile_service: Any | None = None
+    reservation_payment_amount: Any | None = None
     price_per_person: str | None = None
     is_rectified: bool = False
 

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/services/flows/client.py

@@ -25,10 +25,12 @@ class ClientPrintFlow:
         print_settings_builder: PrintSettingsBuilder,
         currency_symbol_resolver: Callable[[str], str],
         domicile_service_label: str,
+        reservation_payment_label: str,
     ):
         self._gateway = gateway
         self._currency_symbol_resolver = currency_symbol_resolver
         self._domicile_service_label = domicile_service_label
+        self._reservation_payment_label = reservation_payment_label
         self._context_builder = TicketContextBuilder(
             header_provider=header_provider,
             print_settings_builder=print_settings_builder,
@@ -74,6 +76,7 @@ class ClientPrintFlow:
         ticket_builder = ClientTicketBuilder(
             currency_symbol_resolver=self._currency_symbol_resolver,
             domicile_service_label=self._domicile_service_label,
+            reservation_payment_label=self._reservation_payment_label,
         )
         return ticket_builder.build(
             request=request,

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/services/flows/kitchen.py

@@ -10,7 +10,6 @@ from printer_core.entities import (
     PrintProductData,
     PrintRequestData,
     PrinterData,
-    ProductsGroup,
 )
 from printer_core.ports import FamilyCategoryProvider, HeaderProvider, PrinterGateway, PrintSettingsBuilder
 from printer_core.services.multi_printer_family_service import MultiPrinterFamilyService
@@ -74,7 +73,6 @@ class KitchenPrintFlow:
                 gateway=self._gateway,
                 currency_symbol_resolver=self._currency_symbol_resolver,
                 order_by_func=self._noop_order_by,
-                group_products_func=self._noop_group_products,
             )
             return service.build_and_dispatch(
                 request=request,
@@ -88,7 +86,6 @@ class KitchenPrintFlow:
             family_provider=self._family_provider,
             currency_symbol_resolver=self._currency_symbol_resolver,
             order_by_func=self._noop_order_by,
-            group_products_func=self._noop_group_products,
         )
         return service.build_and_dispatch(
             request=request,
@@ -108,6 +105,3 @@ class KitchenPrintFlow:
 
     def _noop_order_by(self, products: list[KitchenProductLine]) -> list[KitchenProductLine]:
         return products
-
-    def _noop_group_products(self, products: list[KitchenProductLine]) -> list[ProductsGroup]:
-        return [ProductsGroup(group="Sin orden", products=products)]

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/services/unique_ticket_service.py

@@ -10,9 +10,11 @@ class UniqueTicketService:
         self,
         currency_symbol_resolver: Callable[[str], str],
         domicile_service_label: str,
+        reservation_payment_label: str,
     ):
         self._currency_symbol_resolver = currency_symbol_resolver
         self._domicile_service_label = domicile_service_label
+        self._reservation_payment_label = reservation_payment_label
 
     def build_payload(
         self,
@@ -24,7 +26,9 @@ class UniqueTicketService:
     ) -> list[ClientTicketPayload]:
         formatter = DiscountFormatter(currency_symbol_resolver=self._currency_symbol_resolver)
         list_products_in_same_printers = ProductsModifiersUniqueTicket(
-            formatter, domicile_service_label=self._domicile_service_label
+            formatter,
+            domicile_service_label=self._domicile_service_label,
+            reservation_payment_label=self._reservation_payment_label,
         ).build(request, products)
 
         ticket_text = getattr(ticket_settings, "ticket_text", "")

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/tests/unitaries/helpers.py

@@ -78,6 +78,7 @@ def make_request(
     all_discounted: bool = False,
     discount: DiscountData | None = None,
     price_domicile_service: str | None = None,
+    reservation_payment_amount: str | None = None,
     **overrides: object,
 ) -> PrintRequestData:
     payload = {
@@ -91,6 +92,7 @@ def make_request(
         "all_discounted": all_discounted,
         "discount": discount,
         "price_domicile_service": price_domicile_service,
+        "reservation_payment_amount": reservation_payment_amount,
         "command_guests": 2,
         "table_name": "T1",
     }

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/tests/unitaries/test_client_ticket_builder.py

@@ -77,6 +77,38 @@ class ClientTicketBuilderTest(unittest.TestCase):
         self.assertEqual(payloads[0].data.products[-1].name, "Service")
         self.assertEqual(payloads[0].data.products[-1].price, "2.00")
 
+    def test_build_adds_reservation_payment_line_when_label_is_configured(self):
+        builder = ClientTicketBuilder(reservation_payment_label="Reservation Payment")
+        request = make_request(reservation_payment_amount="3.50")
+        products = [make_product()]
+
+        payloads = builder.build(
+            request=request,
+            products=products,
+            printer=make_printer(),
+            ticket_settings=make_ticket_settings(),
+            tpv_key="TPV1",
+        )
+
+        self.assertEqual(payloads[0].data.products[-1].name, "Reservation Payment")
+        self.assertEqual(payloads[0].data.products[-1].qty, 1)
+        self.assertEqual(payloads[0].data.products[-1].price, "3.50")
+
+    def test_build_does_not_add_reservation_payment_line_without_amount(self):
+        builder = ClientTicketBuilder(reservation_payment_label="Reservation Payment")
+        request = make_request()
+        products = [make_product()]
+
+        payloads = builder.build(
+            request=request,
+            products=products,
+            printer=make_printer(),
+            ticket_settings=make_ticket_settings(),
+            tpv_key="TPV1",
+        )
+
+        self.assertEqual(len(payloads[0].data.products), 1)
+
     def test_build_does_not_serialize_rectified_flag_when_request_is_rectified(self):
         builder = ClientTicketBuilder()
         request = make_request(is_rectified=True)

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/tests/unitaries/test_flows.py

@@ -1,10 +1,9 @@
+import unittest
 from unittest.mock import patch
 
-import unittest
 from printer_core.entities import PrintChannel
 from printer_core.services.flows.client import ClientPrintFlow
 from printer_core.services.flows.kitchen import KitchenPrintFlow
-
 from printer_core.tests.unitaries.helpers import (
     FakeGateway,
     FakeHeaderProvider,
@@ -95,6 +94,36 @@ class ClientPrintFlowTest(unittest.TestCase):
         payload = gateway.calls[0][1][0]
         self.assertTrue(payload["data"]["is_invoice"])
 
+    def test_execute_adds_reservation_payment_line_when_label_is_configured(self):
+        gateway = FakeGateway()
+        flow = ClientPrintFlow(
+            gateway=gateway,
+            header_provider=FakeHeaderProvider(),
+            print_settings_builder=FakePrintSettingsBuilder(),
+            currency_symbol_resolver=lambda _: "",
+            domicile_service_label="Service",
+            reservation_payment_label="Reservation Payment",
+        )
+        context = type("Ctx", (), {
+            "kitchen_settings": make_kitchen_settings(),
+            "ticket_settings": make_ticket_settings(),
+            "main_printer": make_printer(),
+            "worker": None,
+        })()
+
+        flow.execute(
+            base_request=make_request(reservation_payment_amount="3.50"),
+            products=[make_product()],
+            context=context,
+            channel=PrintChannel.LOCAL,
+            tpv_key="TPV1",
+        )
+
+        payload = gateway.calls[0][1][0]
+        self.assertEqual(payload["data"]["products"][-1]["name"], "Reservation Payment")
+        self.assertEqual(payload["data"]["products"][-1]["qty"], 1)
+        self.assertEqual(payload["data"]["products"][-1]["price"], "3.50")
+
 
 class KitchenPrintFlowTest(unittest.TestCase):
     def test_execute_uses_multi_printer_service(self):
@@ -102,7 +131,7 @@ class KitchenPrintFlowTest(unittest.TestCase):
 
         class DummyService:
             def __init__(self, **kwargs):
-                pass
+                captured["service_kwargs"] = kwargs
 
             def build_and_dispatch(self, request, products, main_printer, ticket_settings, kitchen_ticket_settings):
                 captured["request"] = request
@@ -132,13 +161,14 @@ class KitchenPrintFlowTest(unittest.TestCase):
             )
 
         self.assertEqual(captured["request"].print_by, "categories")
+        self.assertNotIn("group_products_func", captured["service_kwargs"])
 
     def test_execute_uses_family_service_and_skips_print_by(self):
         captured = {}
 
         class DummyFamilyService:
             def __init__(self, **kwargs):
-                pass
+                captured["service_kwargs"] = kwargs
 
             def build_and_dispatch(self, request, products, main_printer, ticket_settings, kitchen_ticket_settings):
                 captured["request"] = request
@@ -168,3 +198,4 @@ class KitchenPrintFlowTest(unittest.TestCase):
             )
 
         self.assertIsNone(captured["request"].print_by)
+        self.assertNotIn("group_products_func", captured["service_kwargs"])

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/tests/unitaries/test_printer_helpers.py

@@ -1,6 +1,6 @@
+import unittest
 from decimal import Decimal
 
-import unittest
 from printer_core.entities import KitchenProductLine
 from printer_core.utils.printer_helpers import build_iva_data, group_products_by_orders, order_products_by_name
 
@@ -52,6 +52,14 @@ class PrinterHelpersTest(unittest.TestCase):
                 printer_w="80",
                 order="not-a-number",
             ),
+            KitchenProductLine(
+                name="E",
+                qty=1,
+                option=None,
+                printer_r="P1",
+                printer_w="80",
+                order="",
+            ),
         ]
 
         grouped = group_products_by_orders(products)
@@ -61,7 +69,7 @@ class PrinterHelpersTest(unittest.TestCase):
         self.assertEqual(grouped[1].group, "Mesa 2")
         self.assertEqual(grouped[1].products[0].order, "2")
         self.assertEqual(grouped[2].group, "Sin orden")
-        self.assertEqual([item.name for item in grouped[2].products], ["C"])
+        self.assertEqual([item.name for item in grouped[2].products], ["C", "D", "E"])
 
     def test_build_iva_data(self):
         data = build_iva_data(Decimal("121.00"), Decimal("21"))

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/tests/unitaries/test_products_modifiers.py

@@ -91,6 +91,18 @@ class ProductsModifiersUniqueTicketTest(unittest.TestCase):
         self.assertEqual(lines[-1].name, "Service")
         self.assertEqual(lines[-1].price, "2.00")
 
+    def test_build_appends_reservation_payment_when_label_is_configured(self):
+        formatter = DiscountFormatter()
+        service = ProductsModifiersUniqueTicket(formatter, reservation_payment_label="Reservation Payment")
+        request = make_request(reservation_payment_amount="3.50")
+        product = make_product()
+
+        lines = service.build(request, [product])
+
+        self.assertEqual(lines[-1].name, "Reservation Payment")
+        self.assertEqual(lines[-1].qty, 1)
+        self.assertEqual(lines[-1].price, "3.50")
+
     def test_build_respects_all_discounted(self):
         formatter = DiscountFormatter()
         service = ProductsModifiersUniqueTicket(formatter)

{printer_core-0.0.7 → printer_core-0.0.9}/printer_core/utils/printer_helpers.py

@@ -13,21 +13,24 @@ def group_products_by_orders(products: list[KitchenProductLine]) -> list[Product
     dict_aux: dict[int, ProductsGroup] = {}
     array_without_order: list[KitchenProductLine] = []
     for product in products:
-        if product.order is not None:
-            try:
-                order_id = int(product.order)
-                product = product.model_copy(update={"order": str(order_id)})
-                if order_id in dict_aux:
-                    dict_aux[order_id].products.append(product)
-                else:
-                    dict_aux[order_id] = ProductsGroup(
-                        group=product.order_readable or "",
-                        products=[product],
-                    )
-            except ValueError:
-                continue
-        else:
+        if product.order in (None, ""):
+            array_without_order.append(product)
+            continue
+
+        try:
+            order_id = int(product.order)
+        except ValueError:
             array_without_order.append(product)
+            continue
+
+        product = product.model_copy(update={"order": str(order_id)})
+        if order_id in dict_aux:
+            dict_aux[order_id].products.append(product)
+        else:
+            dict_aux[order_id] = ProductsGroup(
+                group=product.order_readable or "",
+                products=[product],
+            )
 
     ordered_dict = OrderedDict(sorted(dict_aux.items()))
     list_of_ordered_values: list[ProductsGroup] = list(ordered_dict.values())

{printer_core-0.0.7 → printer_core-0.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "printer-core"
-version = "0.0.7"
+version = "0.0.9"
 description = "Foodeo Printer Core Domain."
 readme = "README.md"
 requires-python = ">=3.10"