Merge pull request #507 from AndreWohnsland/dev

Skip sumup on free cocktails

Author: AndreWohnsland

src/api/internal/sumup_payment.py

@@ -14,6 +14,18 @@
 _logger = LoggerHandler("sumup_payment")
 
 
+def requires_sumup_payment(cocktail: Cocktail) -> bool:
+    """Check if cocktail price requires a SumUp checkout."""
+    return _get_price_in_cents(cocktail) > 0
+
+
+def _get_price_in_cents(cocktail: Cocktail) -> int:
+    """Calculate the cocktail price in cents for SumUp."""
+    multiplier = cfg.PAYMENT_VIRGIN_MULTIPLIER / 100 if cocktail.is_virgin else 1.0
+    price = cocktail.current_price(cfg.PAYMENT_PRICE_ROUNDING, price_multiplier=multiplier)
+    return int(price * 100)
+
+
 class SumupPaymentHandler:
     """Handler for SumUp payment operations."""
 
@@ -38,11 +50,7 @@ async def start_payment_flow(self, cocktail: Cocktail) -> None:
         shared.cocktail_status.status = PrepareResult.WAITING_FOR_PAYMENT
         self._payment_cancelled = False
 
-        # Calculate price
-        multiplier = cfg.PAYMENT_VIRGIN_MULTIPLIER / 100 if cocktail.is_virgin else 1.0
-        price = cocktail.current_price(cfg.PAYMENT_PRICE_ROUNDING, price_multiplier=multiplier)
-        # SumUp uses minor units (cents), so multiply by 100
-        value_in_cents = int(price * 100)
+        price_in_cents = _get_price_in_cents(cocktail)
 
         reader_id = cfg.PAYMENT_SUMUP_TERMINAL_ID
         if not reader_id:
@@ -54,7 +62,7 @@ async def start_payment_flow(self, cocktail: Cocktail) -> None:
         # Trigger checkout on terminal
         checkout_result = self.sumup_service.trigger_checkout(
             reader_id=reader_id,
-            value=value_in_cents,
+            value=price_in_cents,
             description=f"CocktailBerry: {cocktail.name}",
         )
 

src/api/routers/cocktails.py

@@ -17,6 +17,7 @@
 from src.api.api_config import Tags
 from src.api.internal.nfc_payment import get_nfc_payment_handler
 from src.api.internal.payment import PaymentHandler, get_payment_handler
+from src.api.internal.sumup_payment import requires_sumup_payment
 from src.api.internal.utils import (
     calculate_cocktail_volume_and_concentration,
     map_cocktail,
@@ -137,6 +138,10 @@ async def prepare_cocktail(
         shared.selected_team = request.selected_team
         shared.team_member_name = request.team_member_name
     if cfg.payment_enabled:
+        # SumUp cannot be called with 0 price
+        if cfg.sumup_payment and not requires_sumup_payment(cocktail):
+            background_tasks.add_task(maker.prepare_cocktail, cocktail)
+            return CocktailStatus(status=PrepareResult.IN_PROGRESS)
         background_tasks.add_task(payment_handler.start_payment_flow, cocktail)
         return CocktailStatus(status=PrepareResult.WAITING_FOR_PAYMENT)
     background_tasks.add_task(maker.prepare_cocktail, cocktail)

src/ui/setup_available_window.py

@@ -42,7 +42,7 @@ def _accepted_clicked(self) -> None:
         """Write the new availability into the DB."""
         DB_COMMANDER.delete_existing_handadd_ingredient()
         ingredient_names = [
-            self.LWVorhanden.item(i).text()  # ty:ignore[possibly-missing-attribute] # pyright: ignore[reportOptionalMemberAccess]
+            self.LWVorhanden.item(i).text()  # pyright: ignore[reportOptionalMemberAccess]  # ty:ignore[possibly-missing-attribute]
             for i in range(self.LWVorhanden.count())
         ]
         # only add ingredients if there are any

src/ui/shared.py

@@ -83,21 +83,23 @@ def qt_payment_flow(cocktail: Cocktail) -> CocktailBooking:
             return cocktailberry_payment_flow(cocktail)
 
 
-def sumup_payment_flow(cocktail: Cocktail) -> CocktailBooking:
+def sumup_payment_flow(cocktail: Cocktail) -> CocktailBooking:  # noqa: PLR0911
     """Run the SumUp payment flow for qt."""
-    sumup_service = SumupPaymentService(
-        api_key=cfg.PAYMENT_SUMUP_API_KEY,
-        merchant_code=cfg.PAYMENT_SUMUP_MERCHANT_CODE,
-    )
+    multiplier = cfg.PAYMENT_VIRGIN_MULTIPLIER / 100 if cocktail.is_virgin else 1.0
+    price = cocktail.current_price(cfg.PAYMENT_PRICE_ROUNDING, price_multiplier=multiplier)
+    value_in_cents = int(price * 100)
+    if value_in_cents <= 0:
+        _logger.info(f"Skipping SumUp checkout for free cocktail '{cocktail.name}'")
+        return CocktailBooking.inactive()
 
     reader_id = cfg.PAYMENT_SUMUP_TERMINAL_ID
     if not reader_id:
         return CocktailBooking.sumup_no_terminal()
 
-    # Calculate price
-    multiplier = cfg.PAYMENT_VIRGIN_MULTIPLIER / 100 if cocktail.is_virgin else 1.0
-    price = cocktail.current_price(cfg.PAYMENT_PRICE_ROUNDING, price_multiplier=multiplier)
-    value_in_cents = int(price * 100)
+    sumup_service = SumupPaymentService(
+        api_key=cfg.PAYMENT_SUMUP_API_KEY,
+        merchant_code=cfg.PAYMENT_SUMUP_MERCHANT_CODE,
+    )
 
     # Trigger checkout on terminal
     checkout_result = sumup_service.trigger_checkout(