Fix group discount not being applied in some cases

If a group was free due to not having any 'paid by group' badges in it, the first badge added would not have a group discount applied to it. Also fixes an issue where the group's cost would not be updated when an admin added badges to the group.
magfest · Jan 5, 2025 · 7e30727 · 7e30727
1 parent 5038255
commit 7e30727
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/uber/models/attendee.py b/uber/models/attendee.py
@@ -866,7 +866,7 @@ def calculate_badge_cost(self, use_promo_code=False, include_price_override=True
             return self.overridden_price
         elif self.is_dealer:
             return c.DEALER_BADGE_PRICE
-        elif self.promo_code_groups or (self.group and self.group.cost and self.paid == c.PAID_BY_GROUP):
+        elif self.promo_code_groups or (self.group and self.group.auto_recalc and self.paid == c.PAID_BY_GROUP):
             return c.get_group_price()
         else:
             cost = self.new_badge_cost

diff --git a/uber/site_sections/group_admin.py b/uber/site_sections/group_admin.py
@@ -165,6 +165,8 @@ def form(self, session, new_dealer='', message='', **params):
                     new_ribbon_type=group.new_ribbons,
                     badge_status=new_badge_status,
                     )
+                session.commit()
+                session.refresh(group)
 
             if group.is_dealer and group.status == c.SHARED:
                 if group.table_shares: