Skip to content

only create order rounds automatically in the future #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 14, 2025
Merged

only create order rounds automatically in the future #395

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ba9867
only create order rounds automatically in the future
tobiascadee Aug 13, 2025
3ccd06d
only create order rounds automatically in the future
tobiascadee Aug 13, 2025
e4e6696
Merge branch 'bug/only-automatically-create-order-rounds-in-the-futur…
tobiascadee Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions webapp/ordering/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,24 +301,25 @@ def create_orderround_batch():
# This will be the last day of the next quarter
order_rounds = []
while start_date <= end_date:
open_datetime, close_datetime, collect_datetime = calculate_next_orderround_dates(start_date)
if start_date > current_date:
open_datetime, close_datetime, collect_datetime = calculate_next_orderround_dates(start_date)

# Get default pickup location and transport coordinator
pickup_location = models.PickupLocation.objects.filter(is_default=True).first()
transport_coordinator = VokoUser.objects.filter(pk=config.ORDERROUND_TRANSPORT_COORDINATOR).first()
# Get default pickup location and transport coordinator
pickup_location = models.PickupLocation.objects.filter(is_default=True).first()
transport_coordinator = VokoUser.objects.filter(pk=config.ORDERROUND_TRANSPORT_COORDINATOR).first()

order_round = models.OrderRound.objects.create(
open_for_orders=open_datetime,
closed_for_orders=close_datetime,
collect_datetime=collect_datetime,
markup_percentage=config.MARKUP_PERCENTAGE,
pickup_location=pickup_location,
transport_coordinator=transport_coordinator,
)
order_round = models.OrderRound.objects.create(
open_for_orders=open_datetime,
closed_for_orders=close_datetime,
collect_datetime=collect_datetime,
markup_percentage=config.MARKUP_PERCENTAGE,
pickup_location=pickup_location,
transport_coordinator=transport_coordinator,
)

order_rounds.append(order_round)
order_rounds.append(order_round)

log_event(event="Auto-created order round #%d" % order_round.pk)
log_event(event="Auto-created order round #%d" % order_round.pk)

start_date += timedelta(weeks=config.ORDERROUND_INTERVAL_WEEKS)

Expand Down