From 2ec5b33e94187e541999a438b6d49745a09cfb27 Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Fri, 17 Nov 2023 21:43:35 -0500 Subject: [PATCH] Add dealer waitlist/decline emails and guest RI step Adds automatic emails for waitlisted and declined dealers, plus updates the approved email text, requested via email. Also adds the "Rock Island" version of the merch step for the guest checklist, requested via Slack. --- magprime/automated_emails.py | 19 ++++++- magprime/models.py | 9 ++++ .../templates/emails/dealers/approved.html | 34 ++++++------- .../templates/emails/dealers/declined.txt | 5 ++ .../templates/emails/dealers/waitlisted.txt | 5 ++ .../guest_checklist/guest_merch_deadline.html | 50 +++++++++++++++++++ magprime/templates/regextra.html | 43 ---------------- 7 files changed, 103 insertions(+), 62 deletions(-) create mode 100644 magprime/templates/emails/dealers/declined.txt create mode 100644 magprime/templates/emails/dealers/waitlisted.txt create mode 100644 magprime/templates/guest_checklist/guest_merch_deadline.html diff --git a/magprime/automated_emails.py b/magprime/automated_emails.py index 4fd20e0..02b8be5 100644 --- a/magprime/automated_emails.py +++ b/magprime/automated_emails.py @@ -1,5 +1,5 @@ from uber.models import Attendee, AutomatedEmail -from uber.automated_emails import StopsEmailFixture, AutomatedEmailFixture +from uber.automated_emails import StopsEmailFixture, AutomatedEmailFixture, MarketplaceEmailFixture from uber.config import c from uber.utils import before, days_after, days_before, DeptChecklistConf @@ -71,9 +71,24 @@ def __init__(self, event): Attendee, 'Important MAGFest PC Gaming Room Information! *PLEASE READ*', 'lan_room.html', lambda a: c.LAN in a.interests_ints, ident='magprime_important_lan_room_info', - needs_approval=True, sender='MAGFest LAN ') +MarketplaceEmailFixture( + 'Your {} {} has been waitlisted'.format(c.EVENT_NAME, c.DEALER_APP_TERM.capitalize()), + 'dealers/waitlisted.txt', + lambda g: g.status == c.WAITLISTED, + # query=Group.status == c.WAITLISTED, + needs_approval=True, + ident='dealer_reg_waitlisted') + +MarketplaceEmailFixture( + 'Your {} {} has been decline'.format(c.EVENT_NAME, c.DEALER_APP_TERM.capitalize()), + 'dealers/declined.txt', + lambda g: g.status == c.DECLINED, + # query=Group.status == c.DECLINED, + needs_approval=True, + ident='dealer_reg_declined') + """ AutomatedEmailFixture( Attendee, 'MAGFest Tech Ops volunteering', 'techops.txt', diff --git a/magprime/models.py b/magprime/models.py index b374108..488ff04 100644 --- a/magprime/models.py +++ b/magprime/models.py @@ -9,6 +9,15 @@ from uber.utils import add_opt, check, localized_now, remove_opt +@Session.model_mixin +class AutomatedEmail: + @presave_adjustment + def set_auto_approval(self): + if self.ident in [ + 'qrcode_for_checkin', 'badge_confirmation_reminder_last_chance', 'under_18_parental_consent_reminder' + ]: + self.needs_approval = False + @Session.model_mixin class PanelApplication: magscouts_opt_in = Column(Choice(c.PANEL_MAGSCOUTS_OPTS), default=c.NO_CHOICE) diff --git a/magprime/templates/emails/dealers/approved.html b/magprime/templates/emails/dealers/approved.html index f6b2a9d..3590828 100644 --- a/magprime/templates/emails/dealers/approved.html +++ b/magprime/templates/emails/dealers/approved.html @@ -13,23 +13,23 @@ You may do this by clicking here. {% endif %} -

New Tax Information *Please Read* -

All sellers in the Marketplace are required to obtain a Seller's Permit from the State of Maryland. - To ease the burden on the Comptroller's office for issuing mass permits, we submit the names of our sellers in advance - to ensure everyone has the right documentation; the Comptroller's office then issues the seller's permits directly to - you. In order to make sure we get you your documentation, we need you to fill out - this form - no later than December 12th, 2021. After that date, you will need to obtain your own permit, - directions on how to do this can be found here: - https://tinyurl.com/MAGFestSellers. - Finally, if you are multiple Artists or Vendors sharing the same table space through an approved table share or - you applied and were accepted together: then each individual seller *MUST* fill out the form above and get their - exhibitor's affidavit.

- -

TLDR; fill out this form - no later than December 12th, 2021. Check your email and/or physical mail for your sellers permit that will be - sent directly from MD Comptroller. ANY and ALL issues regarding receiving your permit must be directed to the - Comptroller's office as we, unfortunately, have no power to help!

+

Tax Information *MUST READ* +

All sellers in the Marketplace are required to obtain a Seller's Permit from the State of Maryland. + To ease the burden on the Comptroller's office for issuing mass permits, we submit the names & information of our sellers + in advance to ensure everyone has the right documentation; the Comptroller's office then issues the seller's permits + directly to you. Be sure to double check the address on your application and be sure this information is correct for the + Comptroller's office submission. + Finally, if you are multiple Artists or Vendors sharing the same table space through an approved table share or you + applied and were accepted together: then each individual seller *MUST* provide MAGFest and the Maryland Comptroller their + information above and get their own exhibitor's affidavit.

+ +

By paying for your table(s) and assigning your badge(s), you and anyone with badges associated with your table agree to abide + by and follow the below rules and guidelines laid out in the Marketplace Contract. This is non-negotiable, and anyone who does + not follow them will have their tables rescinded immediately with no refund and will have to leave.

+ +

Please review the full list of rules for MAGFest Marketplace at + https://super.magfest.org/marketplace-rules. + All sellers must abide by these rules at all times.

This registration includes: