printer-core 0.0.13__tar.gz → 1.0.0__tar.gz

{printer_core-0.0.13 → printer_core-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: printer-core
-Version: 0.0.13
+Version: 1.0.0
 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.13 → printer_core-1.0.0}/printer_core/algorithms/products_modifiers_multiprinter.py

@@ -2,6 +2,7 @@ from typing import Any
 
 from printer_core.entities import KitchenProductLine, PrintProductData, PrintRequestData, PrinterData
 from printer_core.formatters.discount_formatter import DiscountFormatter
+from printer_core.utils.product_price_presenter import prepare_product_price
 
 
 class ProductsModifiersMultiPrinter:
@@ -19,6 +20,7 @@ class ProductsModifiersMultiPrinter:
         for product in products:
             if product.printer == []:
                 continue
+            displayed_product, displayed_price = prepare_product_price(request, product)
             printers = product.printer
             if printers is None:
                 if main_printer is None:
@@ -26,24 +28,24 @@ class ProductsModifiersMultiPrinter:
                 printers = [self._resolve_printer(main_printer)]
             for actual_printer in printers:
                 printer_payload = self._resolve_printer(actual_printer)
-                name = product.product_name
+                name = displayed_product.product_name
                 if kitchen_ticket_settings.show_price_per_unit and not request.all_discounted:
-                    name += self._formatter.format(product, request.currency or "")
+                    name += self._formatter.format(displayed_product, request.currency or "")
                 line = KitchenProductLine(
                     name=name,
-                    qty=int(product.qty),
-                    option=product.option,
+                    qty=int(displayed_product.qty),
+                    option=displayed_product.option,
                     printer_r=printer_payload.name,
                     printer_w=printer_payload.printer_width,
-                    details=product.details or "",
-                    order=product.order or "",
+                    details=displayed_product.details or "",
+                    order=displayed_product.order or "",
                     tpv=printer_payload.tpv,
-                    order_readable=product.order_readable or "",
+                    order_readable=displayed_product.order_readable or "",
                 )
                 if kitchen_ticket_settings.show_price_per_unit:
                     line = line.model_copy(update={
-                        "price": product.importe,
-                        "unitary_price": product.product_price,
+                        "price": displayed_price,
+                        "unitary_price": displayed_product.product_price,
                     })
                 list_products_own_printer.append(line)
         return list_products_own_printer

{printer_core-0.0.13 → printer_core-1.0.0}/printer_core/algorithms/products_modifiers_multiprinter_family.py

@@ -2,6 +2,7 @@ from typing import Any
 
 from printer_core.entities import KitchenProductLine, PrintProductData, PrintRequestData, PrinterData
 from printer_core.formatters.discount_formatter import DiscountFormatter
+from printer_core.utils.product_price_presenter import prepare_product_price
 
 
 class ProductsModifiersMultiprinterFamily:
@@ -14,27 +15,28 @@ class ProductsModifiersMultiprinterFamily:
                        request: PrintRequestData,
                        kitchen_ticket_settings: Any,
                        ) -> None:
+        displayed_product, displayed_price = prepare_product_price(request, product)
         for actual_printer in product.printer or []:
             printer_payload = self._resolve_printer(actual_printer)
-            name_with_discount: str = product.product_name
+            name_with_discount: str = displayed_product.product_name
             if not request.all_discounted:
-                name_with_discount += self._formatter.format(product, request.currency or "")
+                name_with_discount += self._formatter.format(displayed_product, request.currency or "")
             line = KitchenProductLine(
                 name=name_with_discount,
-                qty=int(product.qty),
-                option=product.option,
+                qty=int(displayed_product.qty),
+                option=displayed_product.option,
                 printer_r=printer_payload.name,
                 printer_w=printer_payload.printer_width,
-                details=product.details or "",
-                order=product.order or "",
+                details=displayed_product.details or "",
+                order=displayed_product.order or "",
                 tpv=printer_payload.tpv,
-                order_readable=product.order_readable or "",
+                order_readable=displayed_product.order_readable or "",
             )
 
             if kitchen_ticket_settings.show_price_per_unit:
                 line = line.model_copy(update={
-                    "price": product.importe,
-                    "unitary_price": product.product_price,
+                    "price": displayed_price,
+                    "unitary_price": displayed_product.product_price,
                 })
 
             list_products_own_printer.append(line)

{printer_core-0.0.13 → printer_core-1.0.0}/printer_core/algorithms/products_modifiers_unique_ticket.py

@@ -1,5 +1,6 @@
 from printer_core.entities import ClientTicketProduct, PrintProductData, PrintRequestData
 from printer_core.formatters.discount_formatter import DiscountFormatter
+from printer_core.utils.product_price_presenter import prepare_product_price
 
 
 class ProductsModifiersUniqueTicket:
@@ -16,16 +17,17 @@ class ProductsModifiersUniqueTicket:
     def build(self, request: PrintRequestData, products: list[PrintProductData]) -> list[ClientTicketProduct]:
         list_products_in_same_printers: list[ClientTicketProduct] = []
         for product in products:
+            displayed_product, displayed_price = prepare_product_price(request, product)
             with_discount = ""
             if not request.all_discounted:
-                with_discount = self._formatter.format(product, request.currency or "")
-            product_name = product.product_name + with_discount
+                with_discount = self._formatter.format(displayed_product, request.currency or "")
+            product_name = displayed_product.product_name + with_discount
             list_products_in_same_printers.append(ClientTicketProduct(
                 name=product_name,
-                qty=int(product.qty),
-                option=product.option,
-                price=str(product.importe),
-                unitary_price=str(product.product_price),
+                qty=int(displayed_product.qty),
+                option=displayed_product.option,
+                price=str(displayed_price),
+                unitary_price=str(displayed_product.product_price),
             ))
         if request.price_domicile_service:
             list_products_in_same_printers.append(ClientTicketProduct(

{printer_core-0.0.13 → printer_core-1.0.0}/printer_core/builders/client_ticket_builder.py

@@ -13,6 +13,7 @@ from printer_core.entities import (
     PrinterData,
 )
 from printer_core.ports import Clock
+from printer_core.utils.product_price_presenter import prepare_product_price
 
 
 class ClientTicketBuilder:
@@ -69,16 +70,17 @@ class ClientTicketBuilder:
         list_products: list[ClientTicketProduct] = []
         currency_symbol = self._currency_symbol_resolver(request.currency or "")
         for product in products:
+            displayed_product, displayed_price = prepare_product_price(request, product)
             with_discount = ""
             if not request.all_discounted:
-                with_discount = self._format_discount(product, currency_symbol)
-            product_name = product.product_name + with_discount
+                with_discount = self._format_discount(displayed_product, currency_symbol)
+            product_name = displayed_product.product_name + with_discount
             list_products.append(ClientTicketProduct(
                 name=product_name,
-                qty=int(product.qty),
-                option=product.option,
-                price=str(product.importe),
-                unitary_price=str(product.product_price),
+                qty=int(displayed_product.qty),
+                option=displayed_product.option,
+                price=str(displayed_price),
+                unitary_price=str(displayed_product.product_price),
             ))
         if request.price_domicile_service:
             list_products.append(ClientTicketProduct(
@@ -96,7 +98,8 @@ class ClientTicketBuilder:
 
     def _format_discount(self, product: PrintProductData, currency_symbol: str) -> str:
         if product.discount_type == "number":
-            return f" (Dto {product.total_price}{currency_symbol})"
+            total = Decimal(str(product.importe)) - Decimal(str(product.total_price))
+            return f" (Dto {total}{currency_symbol})"
         if product.discount_type == "percent" and product.discount:
             total = Decimal(str(product.importe)) - Decimal(str(product.total_price))
             return f" (Dto {product.discount.value}% {total}{currency_symbol})"

{printer_core-0.0.13 → printer_core-1.0.0}/printer_core/formatters/discount_formatter.py

@@ -10,7 +10,8 @@ class DiscountFormatter:
     def format(self, product: PrintProductData, currency_code: str) -> str:
         currency_symbol = self._currency_symbol_resolver(currency_code)
         if product.discount_type == "number":
-            return f" (Dto {product.total_price}{currency_symbol})"
+            total = Decimal(str(product.importe)) - Decimal(str(product.total_price))
+            return f" (Dto {total}{currency_symbol})"
         if product.discount_type == "percent" and product.discount:
             total = Decimal(str(product.importe)) - Decimal(str(product.total_price))
             return f" (Dto {product.discount.value}% {total}{currency_symbol})"

{printer_core-0.0.13 → printer_core-1.0.0}/printer_core/tests/unitaries/test_client_ticket_builder.py

@@ -60,7 +60,66 @@ class ClientTicketBuilderTest(unittest.TestCase):
         )
 
         self.assertIn("Dto 10% 10€", payloads[0].data.products[0].name)
-        self.assertEqual(payloads[0].data.products[0].price, "100")
+        self.assertEqual(payloads[0].data.products[0].price, "90")
+
+    def test_discounted_product_consolidates_option_prices_without_mutating_input(self):
+        builder = ClientTicketBuilder(currency_symbol_resolver=lambda _: "€")
+        product = make_product(
+            total_price="14.25",
+            product_price="10.00",
+            importe="10.00",
+            discount_type="percent",
+            discount=DiscountData(value="5", type="percent"),
+            option=[{
+                "id": 7,
+                "name": "Extra queso",
+                "qty": 1,
+                "price": "5.00",
+                "unitary_price": "5.00",
+            }],
+        )
+
+        payload = builder.build(
+            request=make_request(),
+            products=[product],
+            printer=make_printer(),
+            ticket_settings=make_ticket_settings(),
+            tpv_key="TPV1",
+        )[0]
+
+        printed = payload.data.products[0]
+        self.assertEqual(printed.name, "Burger (Dto 5% 0.75€)")
+        self.assertEqual(printed.price, "14.25")
+        self.assertEqual(printed.unitary_price, "10.00")
+        self.assertEqual(printed.option[0]["price"], None)
+        self.assertEqual(printed.option[0]["unitary_price"], None)
+        self.assertEqual(product.option[0]["price"], "5.00")
+
+    def test_global_discount_preserves_current_product_and_option_prices(self):
+        product = make_product(
+            total_price="14.25",
+            importe="10.00",
+            discount_type="percent",
+            discount=DiscountData(value="5", type="percent"),
+            option=[{
+                "name": "Extra queso",
+                "qty": 1,
+                "price": "5.00",
+                "unitary_price": "5.00",
+            }],
+        )
+
+        printed = ClientTicketBuilder().build(
+            request=make_request(all_discounted=True),
+            products=[product],
+            printer=make_printer(),
+            ticket_settings=make_ticket_settings(),
+            tpv_key="TPV1",
+        )[0].data.products[0]
+
+        self.assertEqual(printed.name, "Burger")
+        self.assertEqual(printed.price, "10.00")
+        self.assertEqual(printed.option[0]["price"], "5.00")
 
     def test_build_adds_domicile_service_line(self):
         builder = ClientTicketBuilder(domicile_service_label="Service")

{printer_core-0.0.13 → printer_core-1.0.0}/printer_core/tests/unitaries/test_discount_formatter.py

@@ -8,11 +8,11 @@ from printer_core.tests.unitaries.helpers import make_product
 class DiscountFormatterTest(unittest.TestCase):
     def test_format_number_discount(self):
         formatter = DiscountFormatter(currency_symbol_resolver=lambda _: "€")
-        product = make_product(total_price="5.00", discount_type="number")
+        product = make_product(total_price="5.00", importe="7.00", discount_type="number")
 
         result = formatter.format(product, "EUR")
 
-        self.assertEqual(result, " (Dto 5.00€)")
+        self.assertEqual(result, " (Dto 2.00€)")
 
     def test_format_percent_discount(self):
         formatter = DiscountFormatter(currency_symbol_resolver=lambda _: "€")

{printer_core-0.0.13 → printer_core-1.0.0}/printer_core/tests/unitaries/test_products_modifiers.py

@@ -1,5 +1,6 @@
 import unittest
 
+from printer_core.entities import DiscountData
 from printer_core.algorithms.products_modifiers_multiprinter import ProductsModifiersMultiPrinter
 from printer_core.algorithms.products_modifiers_multiprinter_family import ProductsModifiersMultiprinterFamily
 from printer_core.algorithms.products_modifiers_unique_ticket import ProductsModifiersUniqueTicket
@@ -59,6 +60,33 @@ class ProductsModifiersMultiPrinterTest(unittest.TestCase):
         self.assertEqual(lines[0].price, "8.00")
         self.assertEqual(lines[0].unitary_price, "4.00")
 
+    def test_discounted_product_uses_total_and_hides_option_prices(self):
+        service = ProductsModifiersMultiPrinter(DiscountFormatter(lambda _: "€"))
+        product = make_product(
+            total_price="14.25",
+            importe="10.00",
+            discount_type="percent",
+            discount=DiscountData(value="5", type="percent"),
+            option=[{
+                "name": "Extra queso",
+                "qty": 1,
+                "price": "5.00",
+                "unitary_price": "5.00",
+            }],
+        )
+
+        line = service.build(
+            make_request(),
+            [product],
+            make_kitchen_settings(show_price_per_unit=True),
+            make_printer(),
+        )[0]
+
+        self.assertEqual(line.name, "Burger (Dto 5% 0.75€)")
+        self.assertEqual(line.price, "14.25")
+        self.assertEqual(line.option[0]["price"], None)
+        self.assertEqual(line.option[0]["unitary_price"], None)
+
 
 class ProductsModifiersMultiprinterFamilyTest(unittest.TestCase):
     def test_append_product_adds_lines(self):
@@ -92,6 +120,34 @@ class ProductsModifiersMultiprinterFamilyTest(unittest.TestCase):
         self.assertEqual(lines[0].price, "6.00")
         self.assertEqual(lines[0].unitary_price, "3.00")
 
+    def test_discounted_product_uses_total_and_hides_option_prices(self):
+        service = ProductsModifiersMultiprinterFamily(DiscountFormatter(lambda _: "€"))
+        product = make_product(
+            printer=[make_printer()],
+            total_price="14.25",
+            importe="10.00",
+            discount_type="percent",
+            discount=DiscountData(value="5", type="percent"),
+            option=[{
+                "name": "Extra queso",
+                "qty": 1,
+                "price": "5.00",
+                "unitary_price": "5.00",
+            }],
+        )
+        lines = []
+
+        service.append_product(
+            lines,
+            product,
+            make_request(),
+            make_kitchen_settings(show_price_per_unit=True),
+        )
+
+        self.assertEqual(lines[0].price, "14.25")
+        self.assertEqual(lines[0].option[0]["price"], None)
+        self.assertEqual(lines[0].option[0]["unitary_price"], None)
+
 
 class ProductsModifiersUniqueTicketTest(unittest.TestCase):
     def test_build_appends_domicile_service(self):
@@ -134,3 +190,25 @@ class ProductsModifiersUniqueTicketTest(unittest.TestCase):
         lines = service.build(make_request(all_discounted=True), [product])
 
         self.assertEqual(lines[0].price, "5.00")
+
+    def test_discounted_product_uses_total_and_hides_option_prices(self):
+        service = ProductsModifiersUniqueTicket(DiscountFormatter(lambda _: "€"))
+        product = make_product(
+            total_price="13.00",
+            importe="10.00",
+            discount_type="number",
+            discount=DiscountData(value="2", type="number"),
+            option=[{
+                "name": "Extra queso",
+                "qty": 1,
+                "price": "5.00",
+                "unitary_price": "5.00",
+            }],
+        )
+
+        line = service.build(make_request(), [product])[0]
+
+        self.assertEqual(line.name, "Burger (Dto 2.00€)")
+        self.assertEqual(line.price, "13.00")
+        self.assertEqual(line.option[0]["price"], None)
+        self.assertEqual(line.option[0]["unitary_price"], None)

printer_core-1.0.0/printer_core/utils/product_price_presenter.py

@@ -0,0 +1,32 @@
+from copy import deepcopy
+from decimal import Decimal
+from typing import Any
+
+from printer_core.entities import PrintProductData, PrintRequestData
+
+
+def prepare_product_price(
+    request: PrintRequestData,
+    product: PrintProductData,
+) -> tuple[PrintProductData, Any]:
+    """Return a display copy and its total without mutating print-job data."""
+    if request.all_discounted or not product.discount or not product.discount_type:
+        return product, product.importe
+
+    options = deepcopy(product.option)
+    options_total = Decimal("0")
+    if isinstance(options, list):
+        for option in options:
+            if not isinstance(option, dict):
+                continue
+            if option.get("price") is not None:
+                options_total += Decimal(str(option["price"]))
+            option["price"] = None
+            option["unitary_price"] = None
+
+    gross_price = Decimal(str(product.importe or 0)) + options_total
+    presented = product.model_copy(update={
+        "importe": gross_price,
+        "option": options,
+    })
+    return presented, product.total_price

{printer_core-0.0.13 → printer_core-1.0.0}/pyproject.toml

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