diff --git a/src/pretix/plugins/wallet/models.py b/src/pretix/plugins/wallet/models.py index 5934cc2734..fba3373cce 100644 --- a/src/pretix/plugins/wallet/models.py +++ b/src/pretix/plugins/wallet/models.py @@ -142,7 +142,7 @@ class GoogleWalletInstance(models.Model): resource = models.CharField() identifier = models.CharField() data = models.JSONField() - usages = models.IntegerField() + usages = models.IntegerField(default=0) updated_at = models.DateTimeField(auto_now=True) class Meta: diff --git a/src/pretix/plugins/wallet/styles/base.py b/src/pretix/plugins/wallet/styles/base.py index b29041cad7..bdf6cc6daa 100644 --- a/src/pretix/plugins/wallet/styles/base.py +++ b/src/pretix/plugins/wallet/styles/base.py @@ -37,8 +37,10 @@ class WalletPlatform: ) return platform_layout - def generate(self, position): - return self.get_layout(position).pass_layout.generate(position) + def generate(self, position, layout): + if not layout: + layout = self.get_layout(position).pass_layout + return layout.generate(position) class LayoutContext(TypedDict): diff --git a/src/pretix/plugins/wallet/styles/google_wallet.py b/src/pretix/plugins/wallet/styles/google_wallet.py index 6e2b42d788..459965d02b 100644 --- a/src/pretix/plugins/wallet/styles/google_wallet.py +++ b/src/pretix/plugins/wallet/styles/google_wallet.py @@ -332,7 +332,7 @@ class EventTicketObject(BaseGoogleWalletObject): def ticket_number(self, ticket_number: str): self.data["ticket_number"] = ticket_number - def valid_time_interval(self, start: datetime | None, end: datetime | None): + def valid_time_interval(self, start: datetime.datetime | None, end: datetime.datetime | None): self.data.setdefault("validTimeInterval", {}) if start: self.data["validTimeInterval"]["start"] = {"date": start.isoformat()} diff --git a/src/pretix/plugins/wallet/views/google.py b/src/pretix/plugins/wallet/views/google.py index 0f4202f4bb..8c55d16f4b 100644 --- a/src/pretix/plugins/wallet/views/google.py +++ b/src/pretix/plugins/wallet/views/google.py @@ -10,7 +10,7 @@ from pretix.plugins.wallet.styles.google_wallet import ( GooglePaySignatureManager, Resource, ) -logger = logging.getLogger("pretix.plugins.wallet.apple") +logger = logging.getLogger("pretix.plugins.wallet.google") class CallbackView(APIView): @@ -22,7 +22,7 @@ class CallbackView(APIView): webhook_json = GooglePaySignatureManager( request.event.settings.wallet_google_issuer_id ).unseal(request.data) - print(webhook_json) + object = ( GoogleWalletInstance.objects.select_for_update(of=OF_SELF) .filter(