CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Remove hack for gift card exporters, it's not required

Browse Source
This commit is contained in:
Raphael Michel
2022-10-05 09:39:07 +02:00
parent 8f56ab54a4
commit 74e14285ee
1 changed files with 167 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pretix/base/exporters/orderlist.py
View File

@@ -884,7 +884,6 @@ class QuotaListExporter(ListExporter):
return '{}_quotas'.format(self.event.slug) return '{}_quotas'.format(self.event.slug)
def generate_GiftCardTransactionListExporter(organizer): # hackhack
class GiftcardTransactionListExporter(ListExporter): class GiftcardTransactionListExporter(ListExporter):
identifier = 'giftcardtransactionlist' identifier = 'giftcardtransactionlist'
verbose_name = gettext_lazy('Gift card transactions') verbose_name = gettext_lazy('Gift card transactions')
@@ -910,7 +909,7 @@ def generate_GiftCardTransactionListExporter(organizer): # hackhack
def iterate_list(self, form_data): def iterate_list(self, form_data):
qs = GiftCardTransaction.objects.filter( qs = GiftCardTransaction.objects.filter(
card__issuer=organizer, card__issuer=self.organizer,
).order_by('datetime').select_related('card', 'order', 'order__event') ).order_by('datetime').select_related('card', 'order', 'order__event')
if form_data.get('date_from'): if form_data.get('date_from'):
@@ -952,8 +951,7 @@ def generate_GiftCardTransactionListExporter(organizer): # hackhack
yield row yield row
def get_filename(self): def get_filename(self):
return '{}_giftcardtransactions'.format(organizer.slug) return '{}_giftcardtransactions'.format(self.organizer.slug)
return GiftcardTransactionListExporter
class GiftcardRedemptionListExporter(ListExporter): class GiftcardRedemptionListExporter(ListExporter):
@@ -1000,7 +998,6 @@ class GiftcardRedemptionListExporter(ListExporter):
return '{}_giftcardredemptions'.format(self.event.slug) return '{}_giftcardredemptions'.format(self.event.slug)
def generate_GiftCardListExporter(organizer): # hackhack
class GiftcardListExporter(ListExporter): class GiftcardListExporter(ListExporter):
identifier = 'giftcardlist' identifier = 'giftcardlist'
verbose_name = gettext_lazy('Gift cards') verbose_name = gettext_lazy('Gift cards')
@@ -1043,7 +1040,7 @@ def generate_GiftCardListExporter(organizer): # hackhack
card=OuterRef('pk'), card=OuterRef('pk'),
datetime__lte=form_data['date'] datetime__lte=form_data['date']
).order_by().values('card').annotate(s=Sum('value')).values('s') ).order_by().values('card').annotate(s=Sum('value')).values('s')
qs = organizer.issued_gift_cards.filter( qs = self.organizer.issued_gift_cards.filter(
issuance__lte=form_data['date'] issuance__lte=form_data['date']
).annotate( ).annotate(
cached_value=Coalesce(Subquery(s), Decimal('0.00')), cached_value=Coalesce(Subquery(s), Decimal('0.00')),
@@ -1105,9 +1102,7 @@ def generate_GiftCardListExporter(organizer): # hackhack
yield row yield row
def get_filename(self): def get_filename(self):
return '{}_giftcards'.format(organizer.slug) return '{}_giftcards'.format(self.organizer.slug)
return GiftcardListExporter
@receiver(register_data_exporters, dispatch_uid="exporter_orderlist") @receiver(register_data_exporters, dispatch_uid="exporter_orderlist")
@@ -1147,9 +1142,9 @@ def register_multievent_i_giftcardredemptionlist_exporter(sender, **kwargs):
@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardlist") @receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardlist")
def register_multievent_i_giftcardlist_exporter(sender, **kwargs): def register_multievent_i_giftcardlist_exporter(sender, **kwargs):
return generate_GiftCardListExporter(sender) return GiftcardListExporter
@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardtransactionlist") @receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardtransactionlist")
def register_multievent_i_giftcardtransactionlist_exporter(sender, **kwargs): def register_multievent_i_giftcardtransactionlist_exporter(sender, **kwargs):
return generate_GiftCardTransactionListExporter(sender) return GiftcardTransactionListExporter