fix #269

Author: =

auctions/forms.py

@@ -1668,6 +1668,7 @@ class Meta:
             "custom_field_1_name",
             "allow_bulk_adding_lots",
             "copy_users_when_copying_this_auction",
+            "use_seller_dash_lot_numbering",
             "use_donation_field",
             "use_i_bred_this_fish_field",
             "use_custom_checkbox_field",
@@ -1864,6 +1865,10 @@ def __init__(self, *args, **kwargs):
                     "copy_users_when_copying_this_auction",
                     css_class="col-md-4",
                 ),
+                Div(
+                    "use_seller_dash_lot_numbering",
+                    css_class="col-md-4",
+                ),
                 css_class="row",
             ),
             HTML("""<h4>Fields</h4>Control what information your users can enter about lots.
@@ -1975,21 +1980,19 @@ def __init__(self, *args, **kwargs):
             Submit("submit", "Save", css_class="create-update-auction btn-success"),
         )
 
-    # as it stands right now, we are not cleaning this at all
-    # we are relying on the auction save receiver models.on_save_auction to clean anything up
-    # def clean(self):
-    #     cleaned_data = super().clean()
-    #     date_end = cleaned_data.get("date_end")
-    #     date_start = cleaned_data.get("date_start")
-    #     lot_submission_end_date = cleaned_data.get("lot_submission_end_date")
-    #     if date_end < timezone.now() + datetime.timedelta(hours=2):
-    #         self.add_error('date_end', "The end date can't be in the past")
-    #     if date_end < date_start:
-    #         self.add_error('date_end', "The end date can't be before the start date")
-    #     if lot_submission_end_date:
-    #         if lot_submission_end_date > date_end:
-    #             self.add_error('lot_submission_end_date', "Submission should end before the auction ends")
-    #     return cleaned_data
+    def clean(self):
+        cleaned_data = super().clean()
+        use_seller_dash_lot_numbering = cleaned_data.get("use_seller_dash_lot_numbering")
+        saved_instance = self.instance
+
+        if saved_instance and saved_instance.pk:
+            if use_seller_dash_lot_numbering is not saved_instance.use_seller_dash_lot_numbering:
+                if saved_instance.admin_checklist_lots_added:
+                    self.add_error(
+                        "use_seller_dash_lot_numbering", "This option cannot be changed after lots have been added."
+                    )
+
+        return cleaned_data
 
 
 class CreateLotForm(forms.ModelForm):

auctions/models.py

@@ -721,6 +721,7 @@ class Auction(models.Model):
         default="qr_code,lot_name,min_bid_label,buy_now_label,quantity_label,seller_name,donation_label,custom_field_1,i_bred_this_fish_label,custom_checkbox_label",
     )
     use_seller_dash_lot_numbering = models.BooleanField(default=False, blank=True)
+    use_seller_dash_lot_numbering.help_text = "Include the seller's bidder number with the lot number.  This option is not recommended as users find it confusing."
 
     def __str__(self):
         result = self.title

auctions/templates/auctions/auction_lot_admin.html

@@ -7,7 +7,7 @@
 {% block content %}
   {% include 'auction_ribbon.html' %}
   <small>This is a list of items for sale in your auction.  Click a lot name to edit it.  {% if auction.is_online %}You probably don't need to use this page; users will add their own lots to this auction{% else %}To add new lots, go to the <a href="{% url 'auction_tos_list' slug=auction.slug %}">users page</a> and click add lots under the appropriate user.{% endif %}<br>
-  {% if auction.use_seller_dash_lot_numbering %}<br><div class="bg-secondary"><b>Lot numbering has changed:</b> This auction uses the older lot numbering system (seller-lot, for example 123-55 for lot seller 123's 55th lot).  Newly created auctions will use only a number and no dash for lots, for example 55).  This change is to reduce user confusion and does not impact how your auction works.  <a href='https://github.com/iragm/fishauctions/issues/269'>Read more about this update and leave comments here.</a><br></div>{% endif %}
+  {% if auction.use_seller_dash_lot_numbering and not auction.admin_checklist_lots_added %}<br><div class=""><b class="text-warning">Change your lot numbering:</b> This auction uses seller-dash-lot numbering.  Go to the <a href="/auctions/{{auction.slug}}/edit">rules</a> and uncheck <b>Use seller dash lot numbering</b> to switch to a simpler lot numbering system that users find less confusing.  <a href='https://github.com/iragm/fishauctions/issues/269'>Read more and leave feedback here.</a><br></div>{% endif %}
   </small>
     {% if not auction.is_online %}<a class='btn btn-sm btn-primary' href="{{ auction.set_lot_winners_link }}"><i class="bi bi-calendar-check"></i> Set winners</a>{% endif %}
     <a id='all_lot_list' href="{% url 'lot_list' slug=auction.slug %}" class="btn btn-sm mt-2 mb-2 btn-primary"><i class="bi bi-download"></i> Export lot CSV</a>

auctions/views.py

@@ -4392,6 +4392,7 @@ def form_valid(self, form, **kwargs):
                 "copy_users_when_copying_this_auction",
                 "use_donation_field",
                 "use_i_bred_this_fish_field",
+                "use_seller_dash_lot_numbering",
             ]
             for field in fields_to_clone:
                 setattr(auction, field, getattr(original_auction, field))