formatting, refactoring

This commit is contained in:
Mira Weller
2024-07-18 21:26:09 +02:00
parent 9c3150ccde
commit e18c699529
5 changed files with 78 additions and 45 deletions

View File

@@ -304,8 +304,8 @@ class Discount(LoggedModel):
# unused discount ("for each 1 ticket you buy, get 50% on 2 t-shirts", cart content: 1 ticket
# but 0 t-shirts) -> 2 shirt maybe potential discount (if the 1 ticket is not consumed by a later discount)
for i, idx in enumerate(condition_idx_group[
n_groups * self.condition_min_count:
possible_applications_cond * self.condition_min_count
n_groups * self.condition_min_count:
possible_applications_cond * self.condition_min_count
]):
print(i, idx)
collect_potential_discounts[idx] += [

View File

@@ -1,12 +1,12 @@
from collections import defaultdict
from decimal import Decimal
from itertools import groupby
from math import inf
from typing import List
from django.utils.functional import cached_property
from math import inf
from pretix.base.models import ItemCategory, CartPosition, SalesChannel
from pretix.base.models import CartPosition, ItemCategory, SalesChannel
from pretix.presale.views.event import get_grouped_items
@@ -163,8 +163,8 @@ class CrossSellingService:
item.original_price = item.original_price or item.display_price
previous_price = item.display_price
new_price = (
previous_price * (
(Decimal('100.00') - discount_rule.benefit_discount_matching_percent) / Decimal('100.00'))
previous_price * (
(Decimal('100.00') - discount_rule.benefit_discount_matching_percent) / Decimal('100.00'))
)
item.display_price = new_price
@@ -177,4 +177,3 @@ class CrossSellingService:
new_items.append(item)
return new_items

View File

@@ -31,7 +31,7 @@ from pretix.base.models import (
AbstractPosition, InvoiceAddress, Item, ItemAddOn, ItemVariation,
SalesChannel, Voucher,
)
from pretix.base.models.discount import PositionInfo, Discount
from pretix.base.models.discount import Discount, PositionInfo
from pretix.base.models.event import Event, SubEvent
from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
from pretix.base.timemachine import time_machine_now

View File

@@ -515,7 +515,6 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
return request._checkoutflow_addons_applicable
def is_completed(self, request, warn=False):
if getattr(self, '_completed', None) is not None:
return self._completed