Merge pull request #4199 from magfest/form_fixes

Fixing form validation bugs
magfest · Aug 4, 2023 · 50eaf1e · 50eaf1e
2 parents 7d2689d + dbfd436
commit 50eaf1e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/uber/forms/attendee.py b/uber/forms/attendee.py
@@ -168,6 +168,14 @@ def get_non_admin_locked_fields(self, attendee):
     def validate_shirt(form, field):
         if (form.amount_extra.data > 0 or form.badge_type.data in c.BADGE_TYPE_PRICES) and field.data == c.NO_SHIRT:
             raise ValidationError("Please select a shirt size.")
+
+    def get_optional_fields(self, attendee, is_admin=False):        
+        optional_list = super().get_optional_fields(attendee)
+
+        if attendee.badge_type not in c.PREASSIGNED_BADGE_TYPES:
+            optional_list.append('badge_printed_name')
+
+        return optional_list
 
 
 class OtherInfo(MagForm):

diff --git a/uber/site_sections/preregistration.py b/uber/site_sections/preregistration.py
@@ -1457,7 +1457,7 @@ def validate_dealer(self, session, form_list=[], **params):
 
     @ajax
     def validate_attendee(self, session, form_list=[], **params):
-        id = params.get('id', params.get('edit_id'))
+        id = params.get('id', params.get('edit_id', params.get('attendee_id')))
         if id in [None, '', 'None']:
             attendee = Attendee()
         else:

diff --git a/uber/templates/preregistration/stripeForm.html b/uber/templates/preregistration/stripeForm.html
@@ -288,7 +288,7 @@
 {% else %}
 var collectStripePayment = function (client_secret, stripe_id, success_url, cancel_url) {
     var stripeModal = bootstrap.Modal.getOrCreateInstance($('#stripeModal'));
-    sripeModal.show();
+    stripeModal.show();
     $("#cc-message-alert").hide().removeClass().addClass("alert").children("span").html("");
     var form = document.getElementById('payment-form');
     var stripe = Stripe('{{ c.STRIPE_PUBLIC_KEY }}');