Automated OrderRound Creation

This feature automatically creates new order rounds based on a configurable schedule, eliminating the need for manual creation every other Sunday.

## How It Works

The system uses a cron job that runs every 6 hours to check if a new order round should be created. When the conditions are met, it automatically creates a new order round with all the proper dates calculated based on your configuration.

## Configuration

All settings are managed through the Django admin interface under **Constance Config**:

### Core Settings
- **AUTO_CREATE_ORDERROUNDS**: Enable/disable the automation (default: False)
- **ORDERROUND_INTERVAL_WEEKS**: How often to create new rounds (default: 2 weeks)
- **ORDERROUND_CREATE_DAYS_AHEAD**: How far in advance to create rounds (default: 7 days)

### Timing Settings
- **ORDERROUND_OPEN_HOUR**: Hour when order rounds open, 24h format (default: 12)
- **ORDERROUND_CLOSE_HOUR**: Hour when order rounds close, 24h format (default: 3)
- **ORDERROUND_DURATION_HOURS**: How long order rounds stay open (default: 63 hours)
- **ORDERROUND_COLLECT_DAYS_AFTER**: Days after closing when products can be collected (default: 0)
- **ORDERROUND_COLLECT_HOUR**: Hour when products can be collected (default: 18)

### Coordinator Settings
- **ORDERROUND_DEFAULT_TRANSPORT_COORDINATOR**: Default transport coordinator user ID (default: 986)
- **ORDERROUND_DEFAULT_PICKUP_LOCATION**: Default pickup location ID (default: 1)

## Setup Instructions

1. **Enable the feature**:
   - Go to Django Admin → Constance Config
   - Set `AUTO_CREATE_ORDERROUNDS` to `True`

2. **Configure your schedule**:
   - Adjust the timing settings to match your current manual schedule
   - Current defaults: Opens Sunday at 12:00, closes Wednesday at 03:00, collect Wednesday at 18:00
   - Transport coordinator automatically set to user ID 986
   - Pickup location automatically set to location ID 1

3. **Set up cron** (if not already running):
   - The system uses django-cron which should already be configured
   - Make sure your deployment runs: `python manage.py runcrons`

## Manual Controls

### Admin Interface
- Go to Django Admin → Ordering → Order Rounds
- Select any order round and use the action "Create next order round automatically"
- This respects your automation settings but bypasses the timing checks

### Management Command
```bash
# Create the next order round
python manage.py create_orderround

# Preview what would be created (dry run)
python manage.py create_orderround --dry-run

# Force creation even if disabled or not needed
python manage.py create_orderround --force
```

## How Dates Are Calculated

The system calculates dates based on:

1. **Next Opening Date**:
   - If there's a previous round: adds the interval (e.g., 2 weeks) to the last round's opening date
   - If no previous rounds: uses the next Sunday

2. **Closing Date**: Opening date + duration hours (e.g., 72 hours later)

3. **Collection Date**: Closing date + collection days (e.g., same day if 0 days after)

**Example Schedule**:
- **Opens**: Sunday at 12:00 (noon)
- **Closes**: Wednesday at 03:00 (3 AM) - 63 hours later
- **Collect**: Wednesday at 18:00 (6 PM) - same day as closing

## Safety Features

- **No Duplicates**: Won't create a round if one already exists within the configured timeframe
- **Manual Override**: You can always create rounds manually - automation won't interfere
- **Configuration Checks**: Won't create rounds if automation is disabled
- **Error Logging**: All creation attempts are logged for troubleshooting

## Monitoring

- Check the **Log** section in Django admin for creation events
- Use the management command with `--dry-run` to preview upcoming rounds
- The cron job prints status messages that appear in your application logs

## Troubleshooting

### Order rounds aren't being created automatically
1. Check that `AUTO_CREATE_ORDERROUNDS` is set to `True`
2. Verify that django-cron is running (`python manage.py runcrons`)
3. Check if there's already a future round within your `ORDERROUND_CREATE_DAYS_AHEAD` setting
4. Look at the application logs for any error messages from the `AutoCreateOrderRounds` cron job

### Dates are wrong
1. Review your timing configuration in Constance Config
2. Use `python manage.py create_orderround --dry-run` to preview the next round
3. Check that your server timezone is set correctly

### Need to disable temporarily
1. Set `AUTO_CREATE_ORDERROUNDS` to `False` in Constance Config
2. The cron job will continue to run but won't create any rounds
3. You can still use manual creation methods

## Migration from Manual Process

1. **Before enabling**: Make sure your current manual schedule matches the configuration
2. **Enable gradually**: Start with `AUTO_CREATE_ORDERROUNDS = False` and test with the management command
3. **Monitor first few rounds**: Check that the automatically created rounds have the correct dates
4. **Keep manual backup**: You can always create rounds manually if needed

Author: tobiascadee

webapp/ordering/admin.py

@@ -7,9 +7,19 @@
 
 from finance.models import Balance
 from vokou.admin import DeleteDisabledMixin
-from .models import (Order, OrderProduct, Product, OrderRound, ProductCategory,
-                     OrderProductCorrection, ProductStock, Supplier,
-                     ProductUnit, DraftProduct, PickupLocation)
+from .models import (
+    Order,
+    OrderProduct,
+    Product,
+    OrderRound,
+    ProductCategory,
+    OrderProductCorrection,
+    ProductStock,
+    Supplier,
+    ProductUnit,
+    DraftProduct,
+    PickupLocation,
+)
 
 
 class OrderProductInline(admin.TabularInline):
@@ -18,36 +28,60 @@ class OrderProductInline(admin.TabularInline):
 
 def create_credit_for_order(modeladmin, request, queryset):
     for order in queryset:
-        Balance.objects.create(user=order.user,
-                               type="CR",
-                               amount=order.total_price,
-                               notes="Bestelling #%d contant betaald"
-                                     % order.pk)
+        Balance.objects.create(
+            user=order.user, type="CR", amount=order.total_price, notes="Bestelling #%d contant betaald" % order.pk
+        )
 
 
 create_credit_for_order.short_description = "Contant betaald"
 
 
+def create_next_orderround(modeladmin, request, queryset):
+    """Admin action to manually create the next order round"""
+    from ordering.core import create_orderround_automatically
+    from django.contrib import messages
+
+    try:
+        order_round = create_orderround_automatically()
+        if order_round:
+            messages.success(
+                request,
+                f"Successfully created order round #{order_round.pk}. "
+                f"Opens: {order_round.open_for_orders.strftime('%Y-%m-%d %H:%M')}, "
+                f"Closes: {order_round.closed_for_orders.strftime('%Y-%m-%d %H:%M')}, "
+                f"Collect: {order_round.collect_datetime.strftime('%Y-%m-%d %H:%M')}",
+            )
+        else:
+            messages.warning(
+                request, "No new order round was created. Check if automation is enabled and if a new round is needed."
+            )
+    except Exception as e:
+        messages.error(request, f"Failed to create order round: {str(e)}")
+
+
+create_next_orderround.short_description = "Create next order round automatically"
+
+
 def dutch_decimal(value):
-    return str(value).replace('.', ',')
+    return str(value).replace(".", ",")
 
 
 def export_orders_for_financial_admin(modeladmin, request, queryset):
     field_names = [
-        'Bestelling ID',
-        'Lid',
-        'Datum',
-        'Ronde',
-        'Totaalsom producten (incl. marge)',
-        'ledenbijdrage',
-        'Transactiekosten',
-        'Betaald',
-        'Verrekening debit/credit',
-        'Totaalbedrag']
-
-    response = HttpResponse(content_type='text/csv; charset=utf-8')
-    response[
-        'Content-Disposition'] = 'attachment; filename=orders_export.csv'
+        "Bestelling ID",
+        "Lid",
+        "Datum",
+        "Ronde",
+        "Totaalsom producten (incl. marge)",
+        "ledenbijdrage",
+        "Transactiekosten",
+        "Betaald",
+        "Verrekening debit/credit",
+        "Totaalbedrag",
+    ]
+
+    response = HttpResponse(content_type="text/csv; charset=utf-8")
+    response["Content-Disposition"] = "attachment; filename=orders_export.csv"
 
     writer = csv.writer(response)
     writer.writerow(field_names)
@@ -64,27 +98,24 @@ def export_orders_for_financial_admin(modeladmin, request, queryset):
             "{0} ({1})".format(order.user, order.user_id),
             order.modified.date(),
             order.order_round_id,
-            dd(sum([odp.total_retail_price
-                    for odp in order.orderproducts.all()])),
+            dd(sum([odp.total_retail_price for odp in order.orderproducts.all()])),
             dd(order.member_fee),
             dd(order.order_round.transaction_costs),
-            dd(actually_paid).replace('.', ','),
+            dd(actually_paid).replace(".", ","),
             dd(order.debit.amount - actually_paid),
-            dd(order.debit.amount)
+            dd(order.debit.amount),
         ]
         writer.writerow(row)
 
     return response
 
 
-export_orders_for_financial_admin.short_description = (
-    "Exporteer voor financiële admin")
+export_orders_for_financial_admin.short_description = "Exporteer voor financiële admin"
 
 
 class OrderAdmin(DeleteDisabledMixin, admin.ModelAdmin):
-    list_display = ["id", "created", "order_round", "user", "finalized",
-                    "paid", "total_price"]
-    ordering = ("-id", )
+    list_display = ["id", "created", "order_round", "user", "finalized", "paid", "total_price"]
+    ordering = ("-id",)
     # inlines = [OrderProductInline]  ## causes timeout
     list_filter = ("paid", "finalized", "order_round")
     actions = (create_credit_for_order, export_orders_for_financial_admin)
@@ -96,6 +127,7 @@ def fn(modeladmin, request, queryset):
         for product in queryset:
             product.category = category
             product.save()
+
     return fn
 
 
@@ -114,6 +146,7 @@ def remove_category(_, __, queryset):
         for product in queryset:
             product.category = None
             product.save()
+
     remove_category.short_description = "Remove category from product"
     prod_cat_actions.append(remove_category)
 
@@ -122,51 +155,67 @@ def remove_category(_, __, queryset):
 
 
 class ProductAdmin(admin.ModelAdmin):
-    list_display = ["name", 'description', "order_round", "supplier",
-                    "category", "base_price", "maximum_total_order",
-                    "new"]
-    ordering = ("-id", )
+    list_display = [
+        "name",
+        "description",
+        "order_round",
+        "supplier",
+        "category",
+        "base_price",
+        "maximum_total_order",
+        "new",
+    ]
+    ordering = ("-id",)
     list_filter = ("order_round", "supplier", "category", "new")
     actions = prod_cat_actions
     list_per_page = 500
 
 
 class ProductStockAdmin(DeleteDisabledMixin, admin.ModelAdmin):
-    list_display = ["id", "created", "product", 'amount', "type", "notes"]
+    list_display = ["id", "created", "product", "amount", "type", "notes"]
     ordering = ("-id", "created", "product", "amount", "type", "notes")
     list_filter = ("type",)
-    raw_id_fields = ('product',)
+    raw_id_fields = ("product",)
 
 
 class OrderRoundAdmin(DeleteDisabledMixin, admin.ModelAdmin):
-    list_display = ["id", "open_for_orders", "closed_for_orders",
-                    "collect_datetime", "pickup_location", "markup_percentage",
-                    "transaction_costs", "reminder_hours_before_closing",
-                    "order_placed", "reminder_sent"]
-    ordering = ("-id", )
+    list_display = [
+        "id",
+        "open_for_orders",
+        "closed_for_orders",
+        "collect_datetime",
+        "pickup_location",
+        "markup_percentage",
+        "transaction_costs",
+        "reminder_hours_before_closing",
+        "order_placed",
+        "reminder_sent",
+    ]
+    ordering = ("-id",)
+    actions = [create_next_orderround]
 
 
 class OrderProductCorrectionAdmin(DeleteDisabledMixin, admin.ModelAdmin):
-    list_display = ["id", 'created', 'order_product', "supplied_percentage",
-                    "notes", "credit", "charge_supplier"]
-    ordering = ("-id", 'charge_supplier', 'supplied_percentage', 'created')
+    list_display = ["id", "created", "order_product", "supplied_percentage", "notes", "credit", "charge_supplier"]
+    ordering = ("-id", "charge_supplier", "supplied_percentage", "created")
     list_filter = ("charge_supplier",)
-    raw_id_fields = ('order_product',)
+    raw_id_fields = ("order_product",)
 
 
 class OrderProductAdmin(DeleteDisabledMixin, admin.ModelAdmin):
-    list_display = ["id", 'order', 'order_paid', "product", "amount",
-                    "stock_product", "base_price", "retail_price"]
-    ordering = ("-id", 'order', 'product')
+    list_display = ["id", "order", "order_paid", "product", "amount", "stock_product", "base_price", "retail_price"]
+    ordering = ("-id", "order", "product")
     list_filter = ("order__paid", "product__order_round")
-    raw_id_fields = ('order', 'product')
+    raw_id_fields = ("order", "product")
 
     def order_paid(self, obj):
         return obj.order.paid is True
+
     order_paid.boolean = True
 
     def stock_product(self, obj):
         return obj.product.is_stock_product()
+
     stock_product.boolean = True