diff --git a/magprime/__init__.py b/magprime/__init__.py index b8c551f..5cd0313 100644 --- a/magprime/__init__.py +++ b/magprime/__init__.py @@ -43,7 +43,7 @@ def season_passes(self): # magfest prime no longer uses one-day badges, so remove it. from uber.site_sections.badge_exports import Root as _badge_exports _badge_exports.badge_zipfile_contents = \ - [fn for fn in _badge_exports.badge_zipfile_contents if fn.__name__ is not 'printed_badges_one_day'] + [fn for fn in _badge_exports.badge_zipfile_contents if fn.__name__ != 'printed_badges_one_day'] static_overrides(join(config['module_root'], 'static')) template_overrides(join(config['module_root'], 'templates')) diff --git a/magprime/automated_emails.py b/magprime/automated_emails.py index d9c9ab3..d985c50 100644 --- a/magprime/automated_emails.py +++ b/magprime/automated_emails.py @@ -80,20 +80,6 @@ def __init__(self, event): needs_approval=True, sender='MAGFest LAN ') -AutomatedEmailFixture( - GuestGroup, f'Sign up to sell merch at {c.EVENT_NAME} Rock Island', 'guests/rock_island_merch_reminder.txt', - lambda g: g.group_type == c.ROCK_ISLAND and not g.merch, - ident='magprime_ri_merch_reminder', - when=days_before(7, c.ROCK_ISLAND_MERCH_DEADLINE), - sender='MAGFest Rock Island ') - -AutomatedEmailFixture( - GuestGroup, f'Last change to fill out your {c.EVENT_NAME} Rock Island Inventory', 'guests/rock_island_inventory_reminder.txt', - lambda g: g.group_type == c.ROCK_ISLAND and g.merch and g.merch.selling_merch == c.ROCK_ISLAND, - ident='magprime_ri_inventory_reminder', - when=days_before(7, c.ROCK_ISLAND_DEADLINE), - sender='MAGFest Rock Island ') - MarketplaceEmailFixture( 'Your {} {} has been waitlisted'.format(c.EVENT_NAME, c.DEALER_APP_TERM.capitalize()), 'dealers/waitlisted.txt', diff --git a/magprime/static/RockIsland.pdf b/magprime/static/RockIsland.pdf index 29a54a9..448f2f3 100644 Binary files a/magprime/static/RockIsland.pdf and b/magprime/static/RockIsland.pdf differ diff --git a/magprime/templates/emails/guests/rock_island_inventory_reminder.txt b/magprime/templates/emails/guests/rock_island_inventory_reminder.txt deleted file mode 100644 index 8c5f5b6..0000000 --- a/magprime/templates/emails/guests/rock_island_inventory_reminder.txt +++ /dev/null @@ -1,8 +0,0 @@ -{{ guest.group.name }}, - -Thanks for opting into selling merch at Rock Island! {% if not guest.merch.inventory %}You have not uploaded any inventory yet! Y{% else %}This is just a friendly reminder that y{% endif %}ou have until {{ c.ROCK_ISLAND_DEADLINE|datetime_local }} to finalize your Rock Island inventory, which you can do here: {{ c.URL_BASE }}/guests/merch?guest_id={{ guest.id }} - -{% if not guest.merch.inventory %}Failure to submit this information on time may result in forfeiture of the opportunity to sell merchandise at Rock Island. - -{% endif %}- Rock Island -rockisland@magfest.org \ No newline at end of file diff --git a/magprime/templates/emails/guests/rock_island_merch_reminder.txt b/magprime/templates/emails/guests/rock_island_merch_reminder.txt deleted file mode 100644 index aacb34f..0000000 --- a/magprime/templates/emails/guests/rock_island_merch_reminder.txt +++ /dev/null @@ -1,8 +0,0 @@ -{{ guest.group.name }}, - -{{ c.EVENT_NAME }} encourages performers to sell their merchandise through "Rock Island," where our volunteers sell your merchandise at a booth which is staffed throughout the event. We need you to tell us whether you intend to sell merch at Rock Island by filling out the form at {{ c.URL_BASE }}/guests/merch?guest_id={{ guest.id }} - -You must tell us whether you intend to sell merch at Rock Island by {{ c.ROCK_ISLAND_MERCH_DEADLINE|datetime_local }}. If yes, you must also input your inventory by {{ c.ROCK_ISLAND_DEADLINE|datetime_local }}. Failure to submit this information on time may result in forfeiture of the opportunity to sell merchandise at Rock Island. - -- Rock Island -rockisland@magfest.org \ No newline at end of file