From 923ba639d64dd05a0af829d0233ebd06f97f5c9b Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Tue, 5 Nov 2024 12:20:43 -0500
Subject: [PATCH 01/17] Make admin notes search on promo_codes/index Fixes
 https://jira.furfest.org/browse/SEI_SD-1799.

---
 uber/templates/promo_codes/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uber/templates/promo_codes/index.html b/uber/templates/promo_codes/index.html
index 974b031b7..a475fad09 100644
--- a/uber/templates/promo_codes/index.html
+++ b/uber/templates/promo_codes/index.html
@@ -170,7 +170,7 @@ <h4 class="modal-title" id="title-delete-unused">Delete all unused promo codes?<
           {% endfor %}
         </td>
         {% if show == 'admin' %}
-        <td>
+        <td data-search="{{ promo_code.admin_notes }}">
           <input type="text" form="update_promo_code_{{ promo_code.id }}" name="admin_notes" class="form-control" size="30" placeholder="E.g., intended usage, department" value="{{ promo_code.admin_notes }}">
         </td>
         {% else %}

From f7d489f18dc2439b28f2ef6206321b4628f37ada Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Tue, 5 Nov 2024 12:32:37 -0500
Subject: [PATCH 02/17] Fix self-service refunds sorting Fixes
 https://jira.furfest.org/browse/SEI_SD-1804. Also adds the totals per paid
 badge type, requested via Slack.

---
 uber/site_sections/reg_reports.py                    |  9 ++++++++-
 uber/templates/reg_reports/self_service_refunds.html | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/uber/site_sections/reg_reports.py b/uber/site_sections/reg_reports.py
index 4fd47830b..02907ebd9 100644
--- a/uber/site_sections/reg_reports.py
+++ b/uber/site_sections/reg_reports.py
@@ -112,14 +112,21 @@ def attendees_nonzero_balance(self, session, include_no_receipts=False):
     def self_service_refunds(self, session):
         refunds = session.query(ReceiptTransaction).filter(ReceiptTransaction.amount < 0,
                                                            ReceiptTransaction.who == 'non-admin').all()
-
+        
+        counts = defaultdict(int)
         refund_models = defaultdict(dict)
         for refund in refunds:
             model = session.get_model_by_receipt(refund.receipt)
             model_name = ''.join(' ' + char if char.isupper() else
                                  char.strip() for char in model.__class__.__name__).strip()
             refund_models[model_name][refund] = model
+            if c.BADGE_TYPE_PRICES and isinstance(model, Attendee):
+                if model.badge_type in c.BADGE_TYPE_PRICES:
+                    counts[model.badge_type] += 1
+                else:
+                    counts[c.ATTENDEE_BADGE] += 1
 
         return {
             'refund_models': refund_models,
+            'counts': counts,
         }
diff --git a/uber/templates/reg_reports/self_service_refunds.html b/uber/templates/reg_reports/self_service_refunds.html
index 1eadf1c5e..97835dc31 100644
--- a/uber/templates/reg_reports/self_service_refunds.html
+++ b/uber/templates/reg_reports/self_service_refunds.html
@@ -15,6 +15,14 @@ <h1>
     <h2 class="card-title mb-0">{{ cls }} Refunds</h2>
   </div>
   <div class="card-body">
+    {% if c.BADGE_TYPE_PRICES and cls == 'Attendee' %}
+    <p>
+      {% for badge_type, total in counts.items() %}
+      {{ c.BADGES[badge_type] }} Refunds: {{ total }}<br/>
+      {% endfor %}
+    </p>
+    {% endif %}
+    <p></p>
     <div class="table-responsive">
       <table class="table table-striped datatable">
         <thead>
@@ -41,7 +49,7 @@ <h2 class="card-title mb-0">{{ cls }} Refunds</h2>
             {% endif %}
               {{ model|form_link(new_window=True) }}
             </td>
-            <td>
+            <td data-order="{{ refund.added }}">
               {{ refund.added|datetime_local }}
             </td>
             <td>{{ (refund.amount * -1 / 100)|format_currency }}</td>

From f5140292b25fac7f269f192323f58fd5db899d6c Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Tue, 5 Nov 2024 12:44:16 -0500
Subject: [PATCH 03/17] Fix 500 error with messages and return_to Strips
 message from all return_to URLs, and also joins any message list together so
 the template throw a 500 error.

---
 uber/templates/art_show_common/art_pieces_form.html | 10 +++++-----
 uber/templates/base.html                            |  2 ++
 uber/templates/group_admin/form.html                |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/uber/templates/art_show_common/art_pieces_form.html b/uber/templates/art_show_common/art_pieces_form.html
index 6ef252222..380b3643e 100644
--- a/uber/templates/art_show_common/art_pieces_form.html
+++ b/uber/templates/art_show_common/art_pieces_form.html
@@ -24,7 +24,7 @@ <h4 class="modal-title" id="piece_title_{{ real_piece.id or 'new' }}">{{ "Add" i
         <div class="modal-body">
           <input type="hidden" name="id" value="{{ real_piece.id or 'None' }}" />
           <input type="hidden" name="app_id" value="{{ app.id }}" />
-          <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
+          <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
           {{ csrf_token() }}
           <div class="row g-sm-3">
             <div class="col-12 col-sm-6">
@@ -129,7 +129,7 @@ <h4 class="modal-title" id="piece_title_{{ real_piece.id or 'new' }}">{{ "Add" i
   <h3 class="card-title">Art Show Information</h3>
   <form method="post" action="../art_show_applications/edit" role="form">
     <input type="hidden" name="id" value="{{ app.id }}" />
-    <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
+    <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
     {{ csrf_token() }}
     <div class="row g-sm-3">
       <div class="col-12 col-sm-6">
@@ -221,7 +221,7 @@ <h3 class="card-title">Art Show Pieces</h3>
     <div class="col-4">
       <form method="post" action="../art_show_applications/confirm_pieces" class="form-inline">
         <input type="hidden" name="id" value="{{ app.id }}" />
-        <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
+        <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
         {{ csrf_token() }}
         <button type="submit" class="btn btn-outline-secondary" id="confirm_pieces">Confirm Current Pieces</button>
       </form>
@@ -277,7 +277,7 @@ <h3 class="card-title">Art Show Pieces</h3>
           <form method="post" action="../art_show_applications/save_art_show_piece" role="form">
             <input type="hidden" name="app_id" value="{{ app.id }}" />
             <input type="hidden" name="id" value="{{ piece.id }}" />
-            <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
+            <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
             {% if piece.for_sale %}<input type="hidden" name="for_sale" value=1 />{% endif %}
             {% if piece.no_quick_sale %}<input type="hidden" name="no_quick_sale" value=1 />{% endif %}
             {{ csrf_token() }}
@@ -310,7 +310,7 @@ <h3 class="card-title">Art Show Pieces</h3>
           <form method="post" action="../art_show_applications/remove_art_show_piece">
             {{ csrf_token() }}
             <input type="hidden" name="id" value="{{ piece.id }}" />
-            <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
+            <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
             <button type="button" class="btn btn-danger remove_piece" data-name="{{ piece.name }}">
               <i class="fa fa-remove"></i>
             </button>
diff --git a/uber/templates/base.html b/uber/templates/base.html
index 5fabb7c0a..39d271582 100644
--- a/uber/templates/base.html
+++ b/uber/templates/base.html
@@ -223,6 +223,8 @@
         }
 
         $(function() {
+            {% set message = message if message is string else message|join(' ') %}
+            {% set error_message = error_message if error_message is string else error_message|join(' ') %}
             // This nonsense is so we can have line breaks AND unescaped quotes in our messages
             var message = '{{ message|sanitize_html|tojson if message else "" }}';
             var error_message = '{{ error_message|sanitize_html|tojson if error_message else "" }}';
diff --git a/uber/templates/group_admin/form.html b/uber/templates/group_admin/form.html
index bc2141898..2d66e3527 100644
--- a/uber/templates/group_admin/form.html
+++ b/uber/templates/group_admin/form.html
@@ -164,7 +164,7 @@ <h3>New {{ c.DEALER_TERM|title if group.is_dealer else "Group" }} Info</h3>
                 {{ csrf_token() }}
                 <input type="hidden" name="id" value="{{ attendee.id }}" />
                 <input type="hidden" name="return_to" value="../group_admin/form?id={{ group.id }}" />
-                <input type="submit" value="Unassign" />
+                <input type="submit" value="Unassign" class="btn btn-warning" />
               </form>
             {% endif %}
           </td>

From 3c3ab3f5d981d024f82084a7584b8905e069a4d9 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Tue, 5 Nov 2024 13:12:45 -0500
Subject: [PATCH 04/17] Update art show emails

---
 uber/templates/emails/art_show/mailing_in.html     | 13 +++----------
 uber/templates/emails/art_show/pieces_reminder.txt |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/uber/templates/emails/art_show/mailing_in.html b/uber/templates/emails/art_show/mailing_in.html
index ad4d71cab..febcb7bdd 100644
--- a/uber/templates/emails/art_show/mailing_in.html
+++ b/uber/templates/emails/art_show/mailing_in.html
@@ -1,13 +1,9 @@
 Dear {{ app.attendee.first_name }},
-<p>Thank you for registering to send Art to {{ c.EVENT_NAME }} via our
-Mail-In Option. Below you will find the steps you need to follow to
-successfully submit/send art to us.</p>
+<p>Thank you for registering to send Art to {{ c.EVENT_NAME }} via our Mail-In Option. Below you will find the steps you need to follow to successfully submit/send art to us.</p>
 <p>Here is a link to <a href="{{ c.URL_BASE
 }}/art_show_applications/edit?id={{ app.id }}" target="_blank">your
 application</a>.</p>
-<p>**If you have not paid for your space in the show, please do so
-now. Any unpaid reservations will be deleted on November 8th, and you
-will lose your space to the waitlist.</p>
+<p>**If you have not paid for your space in the show, please do so now. Any unpaid reservations will be deleted on November 15th, and you will lose your space to the waitlist.</p>
 <ol>
 <li>Enter your mailing address.</li>
 <li>Enter your pieces into your application.</li>
@@ -35,10 +31,7 @@
 <li>Email {{ c.ART_SHOW_EMAIL|email_only|email_to_link }} with your
 Name, Tracking Number and shipper name.</li>
 </ol>
-<p>I will send back any unsold Art via your prepaid label on Monday,
-December 4th. If all of your art sells we will send back your prepaid
-label, receipt and the check for your sales during the week after the
-convention.</p>
+<p>I will send back any unsold Art via your prepaid label on Monday, December 9th. If all of your art sells we will send back your prepaid label, receipt and the check for your sales during the week after the convention.</p>
 <p>Thank you,
 <br/>Hugmonster
 <br/>Art Show Director</p>
\ No newline at end of file
diff --git a/uber/templates/emails/art_show/pieces_reminder.txt b/uber/templates/emails/art_show/pieces_reminder.txt
index d3f11dd05..f9be3f52e 100644
--- a/uber/templates/emails/art_show/pieces_reminder.txt
+++ b/uber/templates/emails/art_show/pieces_reminder.txt
@@ -4,7 +4,7 @@ We are looking forward to having your Art in the Midwest FurFest Art Show. At th
 
 We will be able to do onsite corrections, but would rather you enter as much as possible ahead of time. Use this link to access your application and start entering today: {{ c.URL_BASE }}/art_show_applications/edit?id={{ app.id }}
 
-Remember check in starts at 9 AM on Friday morning on the second floor of the Convention Center, right next to Artist Alley. If you are around on Thursday we are hoping to allow earlier setup as well but that is dependent on how fast we can get our prep done, feel free to stop by and volunteer.
+Remember check in starts at 9 AM on Friday morning on the FIRST floor of the Convention Center, to the right of registration, behind the fountain. If you are around on Thursday we are hoping to allow earlier setup as well but that is dependent on how fast we can get our prep done, feel free to stop by and volunteer.
 
 Thank you,
 Hugmonster

From b99f183c6841846de9acce94f07165d4236659c4 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Tue, 5 Nov 2024 13:13:14 -0500
Subject: [PATCH 05/17] Fix watchlist display bug Non-confirmed attendees were
 always showing as "Confirmed" on the WatchList index page due to a bug with
 dictionary assignment. This should fix that.

---
 uber/site_sections/security_admin.py              | 2 +-
 uber/templates/security_admin/watchlist_form.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/uber/site_sections/security_admin.py b/uber/site_sections/security_admin.py
index ca2f304fc..3ea8efc6e 100644
--- a/uber/site_sections/security_admin.py
+++ b/uber/site_sections/security_admin.py
@@ -15,7 +15,7 @@ def index(self, session, message='', **params):
         active_entries = session.query(WatchList).filter(WatchList.active == True  # noqa: E712
                                                          ).order_by(WatchList.last_name).all()
         for entry in active_entries:
-            entry.attendees_and_guesses = entry.attendees
+            entry.attendees_and_guesses = entry.attendees.copy()
             for attendee in session.guess_watchentry_attendees(entry):
                 if attendee not in entry.attendees_and_guesses:
                     entry.attendees_and_guesses.append(attendee)
diff --git a/uber/templates/security_admin/watchlist_form.html b/uber/templates/security_admin/watchlist_form.html
index 408a4ea19..07773f2cd 100644
--- a/uber/templates/security_admin/watchlist_form.html
+++ b/uber/templates/security_admin/watchlist_form.html
@@ -134,8 +134,8 @@ <h3>Watchlist Entry Info</h3>
       <tbody>
       {% for attendee in attendees %}
         <tr>
-          <td>{{ (attendee in entry.attendees)|yesno("Y,N") }}</td>
-          <td style="padding:15px;"> <a href="#attendee_form?id={{ attendee.id }}">{{ attendee.full_name }}</a> </td>
+          <td>{{ (attendee in entry.attendees)|yesno("Yes,No") }}</td>
+          <td> {{ attendee|form_link }} </td>
           <td>{{ attendee.badge_status_label }}</td>
           <td>{{ attendee.paid_label }}</td>
           <td>{{ attendee.badge_type_label }}</td>

From bdf17f22d625a336081dc02d9e76ebc58f9efdf6 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Tue, 5 Nov 2024 23:59:42 -0500
Subject: [PATCH 06/17] Allow assigning one or all locations for artists Also
 makes the calls AJAX.

---
 uber/site_sections/art_show_admin.py          |  25 +++++
 uber/site_sections/promo_codes.py             |   3 +-
 .../art_show_admin/assign_locations.html      | 105 +++++++++++++++---
 uber/templates/promo_codes/index.html         |   5 +-
 4 files changed, 117 insertions(+), 21 deletions(-)

diff --git a/uber/site_sections/art_show_admin.py b/uber/site_sections/art_show_admin.py
index 4238586cd..0a3c61952 100644
--- a/uber/site_sections/art_show_admin.py
+++ b/uber/site_sections/art_show_admin.py
@@ -356,6 +356,31 @@ def save_and_check_in_out(self, session, **params):
             'success': success,
         }
 
+    @ajax
+    def update_location(self, session, message='', **params):
+        app = session.art_show_application(params)
+        session.commit()
+        return {'success': True,
+                'message': f"Updated {app.artist_or_full_name}'s location."}
+
+    @ajax
+    def update_all(self, session, message='', **params):
+        if 'id' in params:
+            app_list = []
+            for id in params.get('id'):
+                app_params = {key.replace(f'_{id}', ''): val for key, val in params.items() if f'_{id}' in key}
+                app_params['id'] = id
+                app = session.art_show_application(app_params)
+                if app.locations != app.orig_value_of('locations'):
+                    app_list.append(app.artist_or_full_name)
+
+            session.commit()
+            message = "No locations to update." if not app_list \
+                else f"Updated the following applications: {readable_join(app_list)}"
+
+            return {'success': True,
+                    'message': message}
+
     def assign_locations(self, session, message='', **params):
         valid_apps = session.query(ArtShowApplication).filter_by(status=c.APPROVED)
 
diff --git a/uber/site_sections/promo_codes.py b/uber/site_sections/promo_codes.py
index 4252c8ee9..c554c0f4b 100644
--- a/uber/site_sections/promo_codes.py
+++ b/uber/site_sections/promo_codes.py
@@ -192,8 +192,7 @@ def update_all(self, session, message='', **params):
             for id in params.get('id'):
                 code_params = {key.replace(f'_{id}', ''): val for key, val in params.items() if f'_{id}' in key}
                 code_params['id'] = id
-                from pockets.autolog import log
-                log.error(code_params)
+
                 promo_code = session.promo_code(code_params)
                 message = check(promo_code)
                 if message:
diff --git a/uber/templates/art_show_admin/assign_locations.html b/uber/templates/art_show_admin/assign_locations.html
index 75d9b8a24..99a5d0bf5 100644
--- a/uber/templates/art_show_admin/assign_locations.html
+++ b/uber/templates/art_show_admin/assign_locations.html
@@ -1,16 +1,76 @@
 {% extends "base.html" %}{% set admin_area=True %}
-{% block title %}Assign Locations{% endblock %}
+{% set title = "Assign Locations" %}
 {% block content %}
 <style type="text/css">
 .invalid-row>td {background-color: #FFE4E1 !important;}
 </style>
-{% block admin_controls %}
 
-<h3>Assign Locations</h3>
-<div class="card-body">
-  <form role="form" method="post" action="assign_locations" class="form-inline">
-  <button class="btn btn-primary" type="submit">Save</button>
-  <table class="table table-striped datatable">
+<script type="text/javascript">
+  var updateAll = function() {
+    let bigData = ''
+    $('[id^=update_location_]').each(function() {
+      let serializedData = new URLSearchParams($(this).serialize());
+
+      if (bigData == '') {
+        bigData = 'csrf_token=' + serializedData.get('csrf_token')
+      }
+
+      bigData = bigData + '&id=' + serializedData.get('id')
+
+      for (const [key, value] of serializedData) {
+        if (key != 'csrf_token' && key != 'id') {
+          bigData = bigData + '&' + key + '_' + serializedData.get('id') + '=' + value
+        }
+      }
+    })
+    $.ajax({
+      method: 'POST',
+      url: 'update_all',
+      dataType: 'json',
+      data: bigData,
+      success: function (json) {
+        hideMessageBox();
+        var message = json.message;
+        if (json.success) {
+          $("#message-alert").addClass("alert-info").show().children('span').html(message);
+          window.scrollTo(0,0); setTimeout(() => { window.scrollTo(0, 0); }, 100);
+        } else {
+          showErrorMessage(message);
+        }
+      },
+      error: function () {
+          showErrorMessage('Unable to connect to server, please try again.');
+      }
+    });
+  }
+  $().ready(function () {
+    $('form[action="update_location"]').on('submit', function(event) {
+      event.preventDefault();
+      $.ajax({
+        type: 'POST',
+        url: $(this).attr("action"),
+        data: $(this).serialize(), 
+        success: function (json) {
+          hideMessageBox();
+          var message = json.message;
+          if (json.success) {
+            $("#message-alert").addClass("alert-info").show().children('span').html(message);
+            window.scrollTo(0,0); setTimeout(() => { window.scrollTo(0, 0); }, 100);
+          } else {
+            showErrorMessage(message);
+          }
+        },
+        error: function () {
+            showErrorMessage('Unable to connect to server, please try again.');
+        }
+      });
+    })
+  });
+</script>
+
+<h2>Assign Locations</h2>
+<div class="card card-body">
+  <table class="table table-hover datatable">
     <thead><tr>
         <th>Artist Name</th>
         <th>Real Name</th>
@@ -18,27 +78,38 @@ <h3>Assign Locations</h3>
         <th>Mature Grids</th>
         <th>General Tables</th>
         <th>Mature Tables</th>
-        <th>Location</th>
+        <th>Locations</th>
+        <th></th>
     </tr></thead>
     {% for app in apps %}
         <tr {% if app.amount_unpaid %}class="invalid-row"{% endif %}>
-            <td>{{ app.artist_name|default('N/A') }}</td>
-            <td style="text-align:left" data-order="{{ app.attendee.full_name }}" data-search="{{ app.attendee.full_name }}"> <a href="form?id={{ app.id }}">{{ app.attendee.full_name|default("?????") }}</a> </td>
+            <td>{{ app.artist_name|default('N/A',true) }}</td>
+            <td data-order="{{ app.attendee.full_name }}" data-search="{{ app.attendee.full_name }}"> <a href="form?id={{ app.id }}" target="_blank">{{ app.attendee.full_name|default("?????") }}</a> </td>
             <td>{{ app.panels }}</td>
             <td>{{ app.panels_ad }}</td>
             <td>{{ app.tables }}</td>
             <td>{{ app.tables_ad }}</td>
             <td>
-              <input type="text" class="form-control" name="{{ app.id }}_locations" value="{{ app.locations }}" />
+              <input type="text" class="form-control" form="update_location_{{ app.id }}" name="locations" value="{{ app.locations }}" />
+            </td>
+            <td>
+              <form id="update_location_{{ app.id }}" method="post" action="update_location">
+                {{ csrf_token() }}
+                <input type="hidden" name="id" value="{{ app.id }}" />
+                <button type="submit" class="btn btn-sm btn-primary update-button">
+                  <i class="fa fa-check"></i>
+                </button>
+              </form>
             </td>
         </tr>
     {% endfor %}
-      <caption align="bottom">
-        <ul class="pagination"></ul>
-      </caption>
     </table>
-    <button class="btn btn-primary" type="submit">Save</button>
-    </form>
+    <div class="d-flex justify-content-end mt-3">
+      <div class="flex-grow-1"></div>
+      <div>
+        <button type="button" class="btn btn-primary" onClick="updateAll()">Update All</button>
+      </div>
+    </div>
 </div>
-{% endblock admin_controls %}
+
 {% endblock content %}
diff --git a/uber/templates/promo_codes/index.html b/uber/templates/promo_codes/index.html
index a475fad09..e2085d82e 100644
--- a/uber/templates/promo_codes/index.html
+++ b/uber/templates/promo_codes/index.html
@@ -204,8 +204,9 @@ <h4 class="modal-title" id="title-delete-unused">Delete all unused promo codes?<
       {% endfor %}
     </tbody>
   </table>
-<div class="row g-sm-3 justify-content-end mt-1">
-  <div class="col col-auto">
+<div class="d-flex justify-content-end mt-3">
+  <div class="flex-grow-1"></div>
+  <div>
     <button type="button" class="btn btn-primary" onClick="updateAll()">Update All</button>
   </div>
 </div>

From 9adb281661a60b1f01eb314d04b1e3ee5d66090f Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Wed, 6 Nov 2024 00:15:42 -0500
Subject: [PATCH 07/17] Add locations to art show app and pieces pages Also
 undoes the change to return_to on the pieces form because that apparently
 broke things.

---
 uber/templates/art_show_admin/form.html       | 42 +++++++++++--------
 .../art_show_common/art_pieces_form.html      | 23 +++++++---
 2 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/uber/templates/art_show_admin/form.html b/uber/templates/art_show_admin/form.html
index f39a04260..e66a1714c 100644
--- a/uber/templates/art_show_admin/form.html
+++ b/uber/templates/art_show_admin/form.html
@@ -35,36 +35,44 @@ <h2>Art Show {{ c.ART_SHOW_APP_TERM|title }} Form{% if app.attendee %} for {{ ap
 
       {{ csrf_token() }}
 
-      {% if new_app or c.HAS_ART_SHOW_ADMIN_ACCESS %}
-      <div class="form-group">
-        <label for="attendee" class="col-sm-3 form-text">Attendee</label>
-        <div class="col-sm-6">
+      <div class="row g-sm-3 form-group">
+        <div class="col-12 col-sm-6">
+        <label for="attendee" class="col-12 form-text">Attendee</label>
+        <div class="mb-3">
           <select class="form-select" id="attendee_id" name="attendee_id" required="true">
             <option value="" selected="selected">Select an attendee</option>
             {{ options(all_attendees, attendee_id) }}
           </select>
         </div>
-      </div>
-      {% else %}
-      <div class="form-group">
-        <label for="attendee" class="col-sm-3 form-text">Attendee Badge Status</label>
-        <div class="col-sm-6">
+        </div>
+      {% if not new_app %}
+      <div class="col-12 col-sm-6">
+        <label for="attendee" class="col-12 form-text">Attendee Badge Status</label>
+        <div class="mb-3">
           <select class="form-select" id="badge_status" name="badge_status">
             {{ options(c.BADGE_STATUS_OPTS, app.attendee.badge_status) }}
           </select>
         </div>
       </div>
       {% endif %}
+      </div>
 
-      <div class="form-group">
-        <label for="status" class="col-sm-3 form-text">{{ c.ART_SHOW_APP_TERM|title }} Status</label>
-        <div class="col-sm-6">
-          <select class="form-select" name="status">
-            {{ options(c.ART_SHOW_STATUS_OPTS, app.status) }}
-          </select>
+      <div class="row g-sm-3 form-group">
+        <div class="col-12 col-sm-6">
+          <label for="status" class="col-12 form-text">{{ c.ART_SHOW_APP_TERM|title }} Status</label>
+          <div class="mb-3">
+            <select class="form-select" name="status">
+              {{ options(c.ART_SHOW_STATUS_OPTS, app.status) }}
+            </select>
+            <p class="form-text">Changing this may trigger an email to the attendee.</p>
+          </div>
+        </div>
+        <div class="col-12 col-sm-6">
+          <label for="attendee" class="col-12 form-text">Locations</label>
+          <div class="mb-3">
+            <input type="text" class="form-control" name="locations" value="{{ app.locations }}" />
+          </div>
         </div>
-        <div class="clearfix"></div>
-        <p class="help-block col-sm-6 col-sm-offset-3">Changing this may trigger an email to the attendee.</p>
       </div>
 
       <div class="row g-3 form-group">
diff --git a/uber/templates/art_show_common/art_pieces_form.html b/uber/templates/art_show_common/art_pieces_form.html
index 380b3643e..79488e434 100644
--- a/uber/templates/art_show_common/art_pieces_form.html
+++ b/uber/templates/art_show_common/art_pieces_form.html
@@ -24,7 +24,7 @@ <h4 class="modal-title" id="piece_title_{{ real_piece.id or 'new' }}">{{ "Add" i
         <div class="modal-body">
           <input type="hidden" name="id" value="{{ real_piece.id or 'None' }}" />
           <input type="hidden" name="app_id" value="{{ app.id }}" />
-          <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
+          <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
           {{ csrf_token() }}
           <div class="row g-sm-3">
             <div class="col-12 col-sm-6">
@@ -129,8 +129,21 @@ <h4 class="modal-title" id="piece_title_{{ real_piece.id or 'new' }}">{{ "Add" i
   <h3 class="card-title">Art Show Information</h3>
   <form method="post" action="../art_show_applications/edit" role="form">
     <input type="hidden" name="id" value="{{ app.id }}" />
-    <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
+    <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
     {{ csrf_token() }}
+    {% if admin_area %}
+    <div class="row g-sm-3">
+      <div class="col-12 col-sm-6">
+        <label for="banner_name" class="form-text">Locations</label>
+        {% if readonly %}
+          {{ app.locations }}
+        {% else %}
+          <input type="text" class="form-control" name="locations" id="locations" value="{{ app.locations }}"/>
+        {% endif %}
+      </div>
+    </div>
+    {% endif %}
+
     <div class="row g-sm-3">
       <div class="col-12 col-sm-6">
         <label for="banner_name" class="form-text">Banner Name</label>
@@ -221,7 +234,7 @@ <h3 class="card-title">Art Show Pieces</h3>
     <div class="col-4">
       <form method="post" action="../art_show_applications/confirm_pieces" class="form-inline">
         <input type="hidden" name="id" value="{{ app.id }}" />
-        <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
+        <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
         {{ csrf_token() }}
         <button type="submit" class="btn btn-outline-secondary" id="confirm_pieces">Confirm Current Pieces</button>
       </form>
@@ -277,7 +290,7 @@ <h3 class="card-title">Art Show Pieces</h3>
           <form method="post" action="../art_show_applications/save_art_show_piece" role="form">
             <input type="hidden" name="app_id" value="{{ app.id }}" />
             <input type="hidden" name="id" value="{{ piece.id }}" />
-            <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
+            <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
             {% if piece.for_sale %}<input type="hidden" name="for_sale" value=1 />{% endif %}
             {% if piece.no_quick_sale %}<input type="hidden" name="no_quick_sale" value=1 />{% endif %}
             {{ csrf_token() }}
@@ -310,7 +323,7 @@ <h3 class="card-title">Art Show Pieces</h3>
           <form method="post" action="../art_show_applications/remove_art_show_piece">
             {{ csrf_token() }}
             <input type="hidden" name="id" value="{{ piece.id }}" />
-            <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
+            <input type="hidden" name="return_to" value="{{ c.PAGE_PATH }}" />
             <button type="button" class="btn btn-danger remove_piece" data-name="{{ piece.name }}">
               <i class="fa fa-remove"></i>
             </button>

From 930b72f09bd8fe4aef8352eb6ea55d94a4d5292a Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Wed, 6 Nov 2024 00:16:21 -0500
Subject: [PATCH 08/17] Update bidsheets to say NFS instead of N/A

---
 uber/models/art_show.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uber/models/art_show.py b/uber/models/art_show.py
index f81a5caad..c37e3ebce 100644
--- a/uber/models/art_show.py
+++ b/uber/models/art_show.py
@@ -418,10 +418,10 @@ def print_bidsheet(self, pdf, sheet_num, normal_font_name, bold_font_name, set_f
         pdf.set_font(normal_font_name, size=8)
         pdf.set_xy(242 + xplus, 90 + yplus)
         # Note: we want the prices on the PDF to always have a trailing .00
-        pdf.cell(53, 14, txt=('${:,.2f}'.format(self.opening_bid)) if self.valid_for_sale else 'N/A', ln=1)
+        pdf.cell(53, 14, txt=('${:,.2f}'.format(self.opening_bid)) if self.valid_for_sale else 'NFS', ln=1)
         pdf.set_xy(242 + xplus, 116 + yplus)
         pdf.cell(
-            53, 14, txt=('${:,.2f}'.format(self.quick_sale_price)) if self.valid_quick_sale else 'N/A', ln=1)
+            53, 14, txt=('${:,.2f}'.format(self.quick_sale_price)) if self.valid_quick_sale else 'NFS', ln=1)
 
 
 class ArtShowPayment(MagModel):

From 0f4591302e59c3ff4481897837d0b96da2b82fef Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Wed, 6 Nov 2024 00:19:18 -0500
Subject: [PATCH 09/17] Fix 500 error with valid_agent_codes This should fix
 the template error for admins as well as attendees.

---
 uber/templates/art_show_applications/art_show_form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uber/templates/art_show_applications/art_show_form.html b/uber/templates/art_show_applications/art_show_form.html
index 86dd81d18..43c6d1f80 100644
--- a/uber/templates/art_show_applications/art_show_form.html
+++ b/uber/templates/art_show_applications/art_show_form.html
@@ -2,7 +2,7 @@
 {% set max_tables = c.MAX_ART_TABLES if not admin_area else 30 %}
 {% set max_panels = c.MAX_ART_PANELS if not admin_area else 30 %}
 
-{% if app.delivery_method == c.AGENT and not app.current_agents and not app.is_new %}
+{% if app.delivery_method == c.AGENT and not app.current_agents and app.valid_agent_codes %}
   <div class="alert alert-warning">
     <p>Your art show {{ c.ART_SHOW_APP_TERM }} does not have an agent assigned to bring and hang art.
     {% if app.valid_agent_codes|length == 1 %}
@@ -101,7 +101,7 @@
   {% endif %}
 </div>
 
-{% if app.delivery_method == c.AGENT and not app.is_new %}
+{% if app.delivery_method == c.AGENT and app.valid_agent_codes %}
   {% if not c.ONE_AGENT_PER_APP %}
     <input type="hidden" form="add_agent_code" name="id" value="{{ app.id }}" />
     <button type="submit" form="add_agent_code" class="btn btn-primary">Generate Another Agent Code</button>

From a2275933815db1e9123e0eac6bc194a1d0543bb5 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 12:33:49 -0500
Subject: [PATCH 10/17] Add text to 'shared table' email

---
 ...79_add_header_thumbnail_flag_to_mivs_images.py |  2 +-
 uber/templates/emails/dealers/table_shared.html   | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/alembic/versions/f01a2ad10d79_add_header_thumbnail_flag_to_mivs_images.py b/alembic/versions/f01a2ad10d79_add_header_thumbnail_flag_to_mivs_images.py
index 204a04055..a99628cbf 100644
--- a/alembic/versions/f01a2ad10d79_add_header_thumbnail_flag_to_mivs_images.py
+++ b/alembic/versions/f01a2ad10d79_add_header_thumbnail_flag_to_mivs_images.py
@@ -55,7 +55,7 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column('indie_game_image', sa.Column('is_header', sa.Boolean(), server_default='False', nullable=False))
     op.add_column('indie_game_image', sa.Column('is_thumbnail', sa.Boolean(), server_default='False', nullable=False))
-    op.create_unique_constraint(op.f('uq_lottery_application_attendee_id'), 'lottery_application', ['attendee_id'])
+    #op.create_unique_constraint(op.f('uq_lottery_application_attendee_id'), 'lottery_application', ['attendee_id'])
     # ### end Alembic commands ###
 
 
diff --git a/uber/templates/emails/dealers/table_shared.html b/uber/templates/emails/dealers/table_shared.html
index adc45445b..b3616a6cf 100644
--- a/uber/templates/emails/dealers/table_shared.html
+++ b/uber/templates/emails/dealers/table_shared.html
@@ -1,12 +1,17 @@
 <html>
 <head></head>
 <body>
-{{ group.leader.first_name }},
+<p>{{ group.leader.first_name }},
 
-<br/><br/>
-This space intentionally left blank.
+<br/>
+You have been set as a Shared Dealer. This does still require that you purchase your badge if you have not yet done so, which you can do using the credit card button <a href="{{ c.URL_BASE }}/preregistration/group_members?id={{ group.id }}">on this page</a>.
+This will also mean that you are required to meet the same rules as other dealers, and your information will be provided for tax purposes. Please insure that if you do have an Illinois tax ID, that it has been provided either via email or your application.
+</p>
 
-<br/><br/>-----
-<br/><br/>{{ c.MARKETPLACE_EMAIL_SIGNATURE }}
+<u>Dealer Rules and Information</u>
+{% include "static_views/dealerRules.html" %}
+
+<br />Sincerely,<br />
+{{ c.MARKETPLACE_EMAIL_SIGNATURE }}
 </body>
 </html>

From 7e979b175b80aab44dfff065c6b5e9500c351d70 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 22:40:33 -0500
Subject: [PATCH 11/17] Find uv error when building

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ef92b85ca..6bcd57976 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
     sed -i 's/v3.19/edge/' /etc/apk/repositories && \
     apk --update-cache upgrade && \
     apk add git libxml2 xmlsec-dev build-base jq curl && \
-    sh /tmp/install-uv.sh && \
+    sh /tmp/install-uv.sh UV_INSTALL_DIR=/usr && \
     rm /tmp/install-uv.sh
 
 ADD requirements.txt /app/

From c076ff49244ee64ef7001cc30111022dc6968b8d Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 22:43:06 -0500
Subject: [PATCH 12/17] Try to fix build problem part 2

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6bcd57976..412d95269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
     sed -i 's/v3.19/edge/' /etc/apk/repositories && \
     apk --update-cache upgrade && \
     apk add git libxml2 xmlsec-dev build-base jq curl && \
-    sh /tmp/install-uv.sh UV_INSTALL_DIR=/usr && \
+    sh UV_INSTALL_DIR=/usr /tmp/install-uv.sh && \
     rm /tmp/install-uv.sh
 
 ADD requirements.txt /app/

From 4cd86611f4687f63e303d04648331a0848beff25 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 22:45:26 -0500
Subject: [PATCH 13/17] Fix the build part 3

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 412d95269..7418b1c3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,12 +19,12 @@ RUN --mount=type=cache,target=/var/cache/apk \
     sed -i 's/v3.19/edge/' /etc/apk/repositories && \
     apk --update-cache upgrade && \
     apk add git libxml2 xmlsec-dev build-base jq curl && \
-    sh UV_INSTALL_DIR=/usr /tmp/install-uv.sh && \
+    sh /tmp/install-uv.sh UV_INSTALL_DIR=/usr && \
     rm /tmp/install-uv.sh
 
 ADD requirements.txt /app/
 #RUN --mount=type=cache,target=/root/.cache \
-RUN    uv pip install --system -r requirements.txt;
+RUN /usr/uv pip install --system -r requirements.txt;
 
 ADD uber-wrapper.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/uber-wrapper.sh
@@ -39,7 +39,7 @@ ENV uber_plugins=$PLUGIN_NAMES
 FROM build as test
 ADD requirements_test.txt /app/
 #RUN --mount=type=cache,target=/root/.cache \
-RUN uv pip install --system -r requirements_test.txt
+RUN /usr/uv pip install --system -r requirements_test.txt
 CMD python -m pytest
 ADD . /app
 

From 072bdcf11aef99e1ff7476f82a00ac61161c1593 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 22:47:21 -0500
Subject: [PATCH 14/17] Maybe this time it will work

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7418b1c3a..2f4c21cca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
     sed -i 's/v3.19/edge/' /etc/apk/repositories && \
     apk --update-cache upgrade && \
     apk add git libxml2 xmlsec-dev build-base jq curl && \
-    sh /tmp/install-uv.sh UV_INSTALL_DIR=/usr && \
+    sh /tmp/install-uv.sh && source $HOME/.local/bin/env \
     rm /tmp/install-uv.sh
 
 ADD requirements.txt /app/

From 476eb30282d08e20a9800773ab69296a2c1f33eb Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 22:48:39 -0500
Subject: [PATCH 15/17] Build fix???

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2f4c21cca..cc00145a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
 
 ADD requirements.txt /app/
 #RUN --mount=type=cache,target=/root/.cache \
-RUN /usr/uv pip install --system -r requirements.txt;
+RUN uv pip install --system -r requirements.txt;
 
 ADD uber-wrapper.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/uber-wrapper.sh
@@ -39,7 +39,7 @@ ENV uber_plugins=$PLUGIN_NAMES
 FROM build as test
 ADD requirements_test.txt /app/
 #RUN --mount=type=cache,target=/root/.cache \
-RUN /usr/uv pip install --system -r requirements_test.txt
+RUN uv pip install --system -r requirements_test.txt
 CMD python -m pytest
 ADD . /app
 

From da2a435a231611b31c77e671fc55954490f0d229 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 22:50:03 -0500
Subject: [PATCH 16/17] Final try this way

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cc00145a9..c3310e4d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
     sed -i 's/v3.19/edge/' /etc/apk/repositories && \
     apk --update-cache upgrade && \
     apk add git libxml2 xmlsec-dev build-base jq curl && \
-    sh /tmp/install-uv.sh && source $HOME/.local/bin/env \
+    sh /tmp/install-uv.sh && source $HOME/.local/bin/env && \
     rm /tmp/install-uv.sh
 
 ADD requirements.txt /app/

From b73797a974dc32580b6671928d9ad02d6b771e27 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Thu, 7 Nov 2024 22:54:51 -0500
Subject: [PATCH 17/17] Trying a different way

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c3310e4d1..b1c1d5660 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,12 +19,12 @@ RUN --mount=type=cache,target=/var/cache/apk \
     sed -i 's/v3.19/edge/' /etc/apk/repositories && \
     apk --update-cache upgrade && \
     apk add git libxml2 xmlsec-dev build-base jq curl && \
-    sh /tmp/install-uv.sh && source $HOME/.local/bin/env && \
+    sh /tmp/install-uv.sh && \
     rm /tmp/install-uv.sh
 
 ADD requirements.txt /app/
 #RUN --mount=type=cache,target=/root/.cache \
-RUN uv pip install --system -r requirements.txt;
+RUN /root/.local/bin/uv pip install --system -r requirements.txt;
 
 ADD uber-wrapper.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/uber-wrapper.sh
@@ -39,7 +39,7 @@ ENV uber_plugins=$PLUGIN_NAMES
 FROM build as test
 ADD requirements_test.txt /app/
 #RUN --mount=type=cache,target=/root/.cache \
-RUN uv pip install --system -r requirements_test.txt
+RUN /root/.local/bin/uv pip install --system -r requirements_test.txt
 CMD python -m pytest
 ADD . /app