diff --git a/src/pretix/base/datasync/datasync.py b/src/pretix/base/datasync/datasync.py index dd951e0a39..891ce275ea 100644 --- a/src/pretix/base/datasync/datasync.py +++ b/src/pretix/base/datasync/datasync.py @@ -38,7 +38,7 @@ from pretix.base.datasync.sourcefields import ( EVENT, EVENT_OR_SUBEVENT, ORDER, ORDER_POSITION, get_data_fields, ) from pretix.base.logentrytype_registry import make_link -from pretix.base.models.datasync import OrderSyncLink, OrderSyncQueue +from pretix.base.models.datasync import OrderSyncResult, OrderSyncQueue from pretix.base.signals import EventPluginRegistry, periodic_task from pretix.celery_app import app @@ -309,7 +309,7 @@ class OutboundSyncProvider: mapping=mapping, mapped_objects=mapped_objects, ) - OrderSyncLink.objects.create( + OrderSyncResult.objects.create( order=inputs.get(ORDER), order_position=inputs.get(ORDER_POSITION), sync_provider=self.identifier, external_object_type=info.get('object_type'), external_id_field=info.get('external_id_field'), @@ -332,7 +332,7 @@ class OutboundSyncProvider: "voucher", ) ) - order.synced_objects.filter(sync_provider=self.identifier).delete() + order.sync_results.filter(sync_provider=self.identifier).delete() order_inputs = {ORDER: order, EVENT: self.event} mapped_objects = {} for mapping in self.mappings: diff --git a/src/pretix/base/migrations/0280_ordersync.py b/src/pretix/base/migrations/0280_ordersync.py index 4ca4a29991..c3add1d801 100644 --- a/src/pretix/base/migrations/0280_ordersync.py +++ b/src/pretix/base/migrations/0280_ordersync.py @@ -39,7 +39,7 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name="OrderSyncLink", + name="OrderSyncResult", fields=[ ( "id", @@ -49,19 +49,19 @@ class Migration(migrations.Migration): ), ("sync_provider", models.CharField(max_length=128)), ("external_object_type", models.CharField(max_length=128)), - ("external_pk_name", models.CharField(max_length=128)), - ("external_pk_value", models.CharField(max_length=128)), + ("external_id_field", models.CharField(max_length=128)), + ("id_value", models.CharField(max_length=128)), ("external_link_href", models.CharField(max_length=255, null=True)), ( "external_link_display_name", models.CharField(max_length=255, null=True), ), - ("timestamp", models.DateTimeField(auto_now_add=True)), + ("transmitted", models.DateTimeField(auto_now_add=True)), ( "order", models.ForeignKey( on_delete=django.db.models.deletion.CASCADE, - related_name="synced_objects", + related_name="sync_results", to="pretixbase.order", ), ), @@ -70,7 +70,7 @@ class Migration(migrations.Migration): models.ForeignKey( null=True, on_delete=django.db.models.deletion.CASCADE, - related_name="synced_objects", + related_name="sync_results", to="pretixbase.orderposition", ), ), diff --git a/src/pretix/base/models/datasync.py b/src/pretix/base/models/datasync.py index 620f2ad926..59e7bdada2 100644 --- a/src/pretix/base/models/datasync.py +++ b/src/pretix/base/models/datasync.py @@ -68,20 +68,20 @@ class OrderSyncQueue(models.Model): return self.provider_class.max_attempts -class OrderSyncLink(models.Model): +class OrderSyncResult(models.Model): order = models.ForeignKey( - Order, on_delete=models.CASCADE, related_name="synced_objects" + Order, on_delete=models.CASCADE, related_name="sync_results" ) sync_provider = models.CharField(blank=False, null=False, max_length=128) order_position = models.ForeignKey( - OrderPosition, on_delete=models.CASCADE, related_name="synced_objects", blank=True, null=True, + OrderPosition, on_delete=models.CASCADE, related_name="sync_results", blank=True, null=True, ) external_object_type = models.CharField(blank=False, null=False, max_length=128) external_id_field = models.CharField(blank=False, null=False, max_length=128) id_value = models.CharField(blank=False, null=False, max_length=128) external_link_href = models.CharField(blank=True, null=True, max_length=255) external_link_display_name = models.CharField(blank=True, null=True, max_length=255) - timestamp = models.DateTimeField(blank=False, null=False, auto_now_add=True) + transmitted = models.DateTimeField(blank=False, null=False, auto_now_add=True) class Meta: indexes = [ diff --git a/src/pretix/control/datasync.py b/src/pretix/control/datasync.py index 2387b136b4..43268deed1 100644 --- a/src/pretix/control/datasync.py +++ b/src/pretix/control/datasync.py @@ -45,7 +45,7 @@ def on_control_order_info(sender: Event, request, order: Order, **kwargs): objects = { provider: list(objects) for (provider, objects) - in groupby(order.synced_objects.order_by('sync_provider').all(), key=lambda o: o.sync_provider) + in groupby(order.sync_results.order_by('sync_provider').all(), key=lambda o: o.sync_provider) } providers = [(provider.identifier, provider.display_name, queued.get(provider.identifier), objects.get(provider.identifier)) for provider in providers] diff --git a/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html b/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html index ee962e935d..5e94ad8614 100644 --- a/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html +++ b/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html @@ -56,7 +56,7 @@ {% trans "identified by" %} {{ obj.external_pk_name }} {{ obj.external_pk_value }} {% endif %} -   +   {% empty %}
  • {% trans "No data transmitted." %}