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

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

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

@@ -14,13 +14,18 @@ class ProductsModifiersMultiPrinter:
         request: PrintRequestData,
         products: list[PrintProductData],
         kitchen_ticket_settings: Any,
-            main_printer: PrinterData | dict[str, Any] | None,
+        main_printer: PrinterData | dict[str, Any] | None,
+        show_options_price: bool = True,
     ) -> list[KitchenProductLine]:
         list_products_own_printer: list[KitchenProductLine] = []
         for product in products:
             if product.printer == []:
                 continue
-            displayed_product, displayed_price = prepare_product_price(request, product)
+            displayed_product, displayed_price = prepare_product_price(
+                request,
+                product,
+                show_options_price=show_options_price,
+            )
             printers = product.printer
             if printers is None:
                 if main_printer is None:

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

@@ -14,8 +14,13 @@ class ProductsModifiersMultiprinterFamily:
                        product: PrintProductData,
                        request: PrintRequestData,
                        kitchen_ticket_settings: Any,
+                       show_options_price: bool = True,
                        ) -> None:
-        displayed_product, displayed_price = prepare_product_price(request, product)
+        displayed_product, displayed_price = prepare_product_price(
+            request,
+            product,
+            show_options_price=show_options_price,
+        )
         for actual_printer in product.printer or []:
             printer_payload = self._resolve_printer(actual_printer)
             name_with_discount: str = displayed_product.product_name

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

@@ -14,10 +14,19 @@ class ProductsModifiersUniqueTicket:
         self._domicile_service_label = domicile_service_label
         self._reservation_payment_label = reservation_payment_label
 
-    def build(self, request: PrintRequestData, products: list[PrintProductData]) -> list[ClientTicketProduct]:
+    def build(
+        self,
+        request: PrintRequestData,
+        products: list[PrintProductData],
+        show_options_price: bool = True,
+    ) -> list[ClientTicketProduct]:
         list_products_in_same_printers: list[ClientTicketProduct] = []
         for product in products:
-            displayed_product, displayed_price = prepare_product_price(request, product)
+            displayed_product, displayed_price = prepare_product_price(
+                request,
+                product,
+                show_options_price=show_options_price,
+            )
             with_discount = ""
             if not request.all_discounted:
                 with_discount = self._formatter.format(displayed_product, request.currency or "")

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

@@ -40,7 +40,11 @@ class ClientTicketBuilder:
         client_request = ClientTicketData(
             **request.model_dump(exclude={"products", "ticket_text", "is_rectified"}),
             ticket_text=ticket_text,
-            products=self._build_products(request, products),
+            products=self._build_products(
+                request,
+                products,
+                show_options_price=self._get_attr(ticket_settings, "show_options_price", False),
+            ),
         )
 
         if client_request.type in ["domicilio", "recoger"]:
@@ -66,11 +70,16 @@ class ClientTicketBuilder:
         self,
         request: PrintRequestData,
         products: list[PrintProductData],
+        show_options_price: bool = True,
     ) -> list[ClientTicketProduct]:
         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)
+            displayed_product, displayed_price = prepare_product_price(
+                request,
+                product,
+                show_options_price=show_options_price,
+            )
             with_discount = ""
             if not request.all_discounted:
                 with_discount = self._format_discount(displayed_product, currency_symbol)

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/entities/print_models.py

@@ -69,6 +69,7 @@ class IvaData(BaseModel):
     Base: str
     impo: str
     iva: str
+    iva_name: str = "IVA"
 
 
 class FiskalyData(BaseModel):

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/services/multi_printer_family_service.py

@@ -38,7 +38,7 @@ class MultiPrinterFamilyService:
         self,
         request: PrintRequestData,
         products: list[PrintProductData],
-            main_printer: PrinterData | None,
+        main_printer: PrinterData | None,
         ticket_settings: Any,
         kitchen_ticket_settings: Any,
     ) -> list[KitchenTicketPayload]:
@@ -58,7 +58,11 @@ class MultiPrinterFamilyService:
                 if product_with_printer is None:
                     continue
                 family_builder.append_product(
-                    list_products_own_printer, product_with_printer, request, kitchen_ticket_settings
+                    list_products_own_printer,
+                    product_with_printer,
+                    request,
+                    kitchen_ticket_settings,
+                    show_options_price=getattr(ticket_settings, "show_options_price", False),
                 )
             dispatched.extend(self._dispatch_products(
                 list_products_own_printer, request, ticket_settings, kitchen_ticket_settings
@@ -70,7 +74,11 @@ class MultiPrinterFamilyService:
             if product_with_printer is None:
                 continue
             family_builder.append_product(
-                list_products_own_printer, product_with_printer, request, kitchen_ticket_settings
+                list_products_own_printer,
+                product_with_printer,
+                request,
+                kitchen_ticket_settings,
+                show_options_price=getattr(ticket_settings, "show_options_price", False),
             )
 
         dispatched.extend(self._dispatch_products(

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/services/multi_printer_service.py

@@ -27,13 +27,17 @@ class MultiPrinterService:
         self,
         request: PrintRequestData,
         products: list[PrintProductData],
-            main_printer: PrinterData | None,
+        main_printer: PrinterData | None,
         ticket_settings: Any,
         kitchen_ticket_settings: Any,
     ) -> list[KitchenTicketPayload]:
         formatter = DiscountFormatter(currency_symbol_resolver=self._currency_symbol_resolver)
         list_products_own_printer = ProductsModifiersMultiPrinter(formatter).build(
-            request, products, kitchen_ticket_settings, main_printer
+            request,
+            products,
+            kitchen_ticket_settings,
+            main_printer,
+            show_options_price=getattr(ticket_settings, "show_options_price", False),
         )
 
         if (request.order_by or "standard") == "name":

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/services/order_print_service.py

@@ -74,7 +74,11 @@ class OrderPrintService:
             enriched = enriched.model_copy(update={"currency": context.global_settings.currency})
 
         total, enriched = self._compute_total(channel, enriched)
-        iva_data = build_iva_data(total, Decimal(str(context.global_settings.iva)))
+        iva_data = build_iva_data(
+            total,
+            Decimal(str(context.global_settings.iva)),
+            getattr(context.global_settings, "iva_name", "IVA"),
+        )
         enriched = enriched.model_copy(update={"total": str(total), "ivaData": iva_data})
         return enriched
 

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/services/unique_ticket_service.py

@@ -29,7 +29,11 @@ class UniqueTicketService:
             formatter,
             domicile_service_label=self._domicile_service_label,
             reservation_payment_label=self._reservation_payment_label,
-        ).build(request, products)
+        ).build(
+            request,
+            products,
+            show_options_price=getattr(ticket_settings, "show_options_price", False),
+        )
 
         ticket_text = getattr(ticket_settings, "ticket_text", "")
         qty_client_ticket = getattr(ticket_settings, "qty_client_ticket", 1)

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/tests/unitaries/helpers.py

@@ -144,6 +144,7 @@ def make_ticket_settings(
     qty_kitchen_ticket: int = 1,
     qty_client_ticket: int = 1,
     ticket_text: str = "",
+    show_options_price: bool = True,
     **overrides: object,
 ) -> SimpleNamespace:
     payload = {
@@ -151,6 +152,7 @@ def make_ticket_settings(
         "qty_kitchen_ticket": qty_kitchen_ticket,
         "qty_client_ticket": qty_client_ticket,
         "ticket_text": ticket_text,
+        "show_options_price": show_options_price,
     }
     payload.update(overrides)
     return SimpleNamespace(**payload)
@@ -179,6 +181,7 @@ def make_kitchen_settings(
 def make_global_settings(
     currency: str | None = "EUR",
     iva: int = 21,
+    iva_name: str = "IVA",
     use_payment_terminal: bool = False,
     use_cashmatic: bool = False,
     use_cashlogy: bool = False,
@@ -186,6 +189,7 @@ def make_global_settings(
     return SimpleNamespace(
         currency=currency,
         iva=iva,
+        iva_name=iva_name,
         use_payment_terminal=use_payment_terminal,
         use_cashmatic=use_cashmatic,
         use_cashlogy=use_cashlogy,

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

@@ -121,6 +121,31 @@ class ClientTicketBuilderTest(unittest.TestCase):
         self.assertEqual(printed.price, "10.00")
         self.assertEqual(printed.option[0]["price"], "5.00")
 
+    def test_hidden_option_prices_use_product_total_without_mutating_input(self):
+        product = make_product(
+            total_price="15.00",
+            importe="10.00",
+            option=[{
+                "name": "Extra queso",
+                "qty": 1,
+                "price": "5.00",
+                "unitary_price": "5.00",
+            }],
+        )
+
+        printed = ClientTicketBuilder().build(
+            request=make_request(),
+            products=[product],
+            printer=make_printer(),
+            ticket_settings=make_ticket_settings(show_options_price=False),
+            tpv_key="TPV1",
+        )[0].data.products[0]
+
+        self.assertEqual(printed.price, "15.00")
+        self.assertIsNone(printed.option[0]["price"])
+        self.assertIsNone(printed.option[0]["unitary_price"])
+        self.assertEqual(product.option[0]["price"], "5.00")
+
     def test_build_adds_domicile_service_line(self):
         builder = ClientTicketBuilder(domicile_service_label="Service")
         request = make_request(request_type="domicilio", price_domicile_service="2.00")

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/tests/unitaries/test_order_print_service.py

@@ -48,7 +48,7 @@ class OrderPrintServiceTest(unittest.TestCase):
         context = type("Ctx", (), {
             "ticket_settings": make_ticket_settings(ticket_kitchen_local=True, ticket_client_local=True),
             "kitchen_settings": make_kitchen_settings(print_by="categories"),
-            "global_settings": make_global_settings(currency="EUR", iva=21),
+            "global_settings": make_global_settings(currency="EUR", iva=21, iva_name="VAT"),
         })()
 
         result = service.print_job(job, context, PrintChannel.LOCAL)
@@ -60,6 +60,7 @@ class OrderPrintServiceTest(unittest.TestCase):
         self.assertEqual(enriched.currency, "EUR")
         self.assertEqual(enriched.price_domicile_service, None)
         self.assertIsNotNone(enriched.ivaData)
+        self.assertEqual(enriched.ivaData.iva_name, "VAT")
 
     def test_print_job_domicile_total_includes_service_price(self):
         kitchen_flow = FakeFlow(FlowTarget.KITCHEN, return_value=[])

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/tests/unitaries/test_printer_helpers.py

@@ -72,8 +72,9 @@ class PrinterHelpersTest(unittest.TestCase):
         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"))
+        data = build_iva_data(Decimal("121.00"), Decimal("21"), "VAT")
 
         self.assertEqual(data.Base, "100.00")
         self.assertEqual(data.impo, "21.00")
         self.assertEqual(data.iva, "21")
+        self.assertEqual(data.iva_name, "VAT")

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

@@ -87,6 +87,31 @@ class ProductsModifiersMultiPrinterTest(unittest.TestCase):
         self.assertEqual(line.option[0]["price"], None)
         self.assertEqual(line.option[0]["unitary_price"], None)
 
+    def test_hidden_option_prices_use_total_in_category_kitchen_line(self):
+        service = ProductsModifiersMultiPrinter(DiscountFormatter())
+        product = make_product(
+            total_price="15.00",
+            importe="10.00",
+            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(),
+            show_options_price=False,
+        )[0]
+
+        self.assertEqual(line.price, "15.00")
+        self.assertIsNone(line.option[0]["price"])
+        self.assertIsNone(line.option[0]["unitary_price"])
+
 
 class ProductsModifiersMultiprinterFamilyTest(unittest.TestCase):
     def test_append_product_adds_lines(self):
@@ -148,6 +173,33 @@ class ProductsModifiersMultiprinterFamilyTest(unittest.TestCase):
         self.assertEqual(lines[0].option[0]["price"], None)
         self.assertEqual(lines[0].option[0]["unitary_price"], None)
 
+    def test_hidden_option_prices_use_total_in_family_kitchen_line(self):
+        service = ProductsModifiersMultiprinterFamily(DiscountFormatter())
+        product = make_product(
+            printer=[make_printer()],
+            total_price="15.00",
+            importe="10.00",
+            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),
+            show_options_price=False,
+        )
+
+        self.assertEqual(lines[0].price, "15.00")
+        self.assertIsNone(lines[0].option[0]["price"])
+        self.assertIsNone(lines[0].option[0]["unitary_price"])
+
 
 class ProductsModifiersUniqueTicketTest(unittest.TestCase):
     def test_build_appends_domicile_service(self):

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/utils/printer_helpers.py

@@ -38,8 +38,8 @@ def group_products_by_orders(products: list[KitchenProductLine]) -> list[Product
     return list_of_ordered_values
 
 
-def build_iva_data(total: Decimal, iva: Decimal) -> IvaData:
+def build_iva_data(total: Decimal, iva: Decimal, iva_name: str = "IVA") -> IvaData:
     aa: Decimal = Decimal(total)
     iva_value: Decimal = Decimal(str(iva))
     base: Decimal = Decimal(aa / (1 + iva_value / 100)).quantize(Decimal(".01"))
-    return IvaData(Base=str(base), impo=str(aa - base), iva=str(iva_value))
+    return IvaData(Base=str(base), impo=str(aa - base), iva=str(iva_value), iva_name=iva_name)

{printer_core-1.0.0 → printer_core-1.0.2}/printer_core/utils/product_price_presenter.py

@@ -8,9 +8,13 @@ from printer_core.entities import PrintProductData, PrintRequestData
 def prepare_product_price(
     request: PrintRequestData,
     product: PrintProductData,
+    show_options_price: bool = True,
 ) -> 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:
+    has_individual_discount = bool(
+        not request.all_discounted and product.discount and product.discount_type
+    )
+    if show_options_price and not has_individual_discount:
         return product, product.importe
 
     options = deepcopy(product.option)
@@ -24,9 +28,8 @@ def prepare_product_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,
-    })
+    update = {"option": options}
+    if has_individual_discount:
+        update["importe"] = Decimal(str(product.importe or 0)) + options_total
+    presented = product.model_copy(update=update)
     return presented, product.total_price

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

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