fix: Make charge signature of all payment providers consistent

Author: sveneberth

src/viur/shop/payment_providers/amazon_pay.py

@@ -1,10 +1,11 @@
-import typing as t
+import typing as t  # noqa
 
 from viur.core import current, errors, exposed
 from viur.core.skeleton import SkeletonInstance
-
+from viur.shop.types import *
 from . import PaymentProviderAbstract
 from ..globals import SHOP_LOGGER
+from ..skeletons import OrderSkel
 
 logger = SHOP_LOGGER.getChild(__name__)
 
@@ -72,7 +73,11 @@ def get_checkout_start_data(
             "sandbox": self.sandbox,
         }
 
-    def charge(self):
+    def charge(
+        self,
+        order_skel: SkeletonInstance_T[OrderSkel],
+        payment: t.Any | None = None,
+    ) -> tuple[SkeletonInstance_T[OrderSkel], t.Any]:
         raise errors.NotImplemented()
 
     def check_payment_state(

src/viur/shop/payment_providers/invoice.py

@@ -32,7 +32,11 @@ def checkout(
         order_skel = self._append_payment_to_order_skel(order_skel)
         return None
 
-    def charge(self) -> None:
+    def charge(
+        self,
+        order_skel: SkeletonInstance_T[OrderSkel],
+        payment: t.Any | None = None,
+    ) -> tuple[SkeletonInstance_T[OrderSkel], t.Any]:
         # An invoice cannot be charged, The user has to do this on his own
         raise IllegalOperationError("An invoice cannot be charged")
 

src/viur/shop/payment_providers/paypal_checkout.py

@@ -143,7 +143,11 @@ def checkout(
 
         return ApiHelper.json_serialize(order.body, should_encode=False)
 
-    def charge(self):
+    def charge(
+        self,
+        order_skel: SkeletonInstance_T[OrderSkel],
+        payment: t.Any | None = None,
+    ) -> tuple[SkeletonInstance_T[OrderSkel], t.Any]:
         raise errors.NotImplemented()
 
     def check_payment_state(

src/viur/shop/payment_providers/prepayment.py

@@ -36,7 +36,11 @@ def checkout(
         order_skel = self._append_payment_to_order_skel(order_skel)
         return None
 
-    def charge(self) -> None:
+    def charge(
+        self,
+        order_skel: SkeletonInstance_T[OrderSkel],
+        payment: t.Any | None = None,
+    ) -> tuple[SkeletonInstance_T[OrderSkel], t.Any]:
         # An invoice cannot be charged, The user has to do this on his own
         raise IllegalOperationError("A prepayment cannot be charged")
 

src/viur/shop/payment_providers/unzer_abstract.py

@@ -238,8 +238,12 @@ def can_order(
 
         return errs
 
-    def charge(self):
-        raise errors.NotImplemented()
+    def charge(
+        self,
+        order_skel: SkeletonInstance_T[OrderSkel],
+        payment: t.Any | None = None,
+    ) -> tuple[SkeletonInstance_T[OrderSkel], t.Any]:
+        raise errors.NotImplemented(f"charge method not implemented in {type(self)}")
 
     def get_order_by_pay_id(
         self,