Merge pull request #8648 from fossasia/development

Dev to master

Author: mariobehling

app/api/helpers/order.py

@@ -283,15 +283,15 @@ def calculate_order_amount(tickets, discount_code=None):
                     f"{ticket.min_price} to {ticket.max_price}",
                 )
         else:
-            price = ticket.price if ticket.type != 'free' else 0.0
+            price = ticket.price if ticket.type not in ['free', 'freeRegistration'] else 0.0
 
         if tax:
             if tax_included:
                 ticket_tax = price - price / (1 + tax.rate / 100)
             else:
                 ticket_tax = price * tax.rate / 100
 
-        if discount_code and ticket.type != 'free':
+        if discount_code and ticket.type not in ['free', 'freeRegistration']:
             code = (
                 DiscountCode.query.with_parent(ticket)
                 .filter_by(id=discount_code.id)

app/templates/email/ticket_purchased.html

@@ -21,7 +21,7 @@
                                     <a href="https://calendar.yahoo.com/?v=60&title={{ order.event.name }}&st={{ order.event.starts_at.strftime('%Y%m%dT%H%M') }}&et={{ order.event.ends_at.strftime('%Y%m%dT%H%M') }}&desc={{ order.event.description }}&in_loc={{ order.event.normalized_location }}">{{ _('Yahoo') }}</a> &bull;
                                     <a href="https://outlook.live.com/calendar/0/deeplink/compose?subject={{ order.event.name }}&startdt={{ order.event.starts_at.strftime('%Y-%m-%dT%H:%M') }}&enddt={{ order.event.ends_at.strftime('%Y-%m-%dT%H:%M') }}&body={{ order.event.description }}&location={{ order.event.normalized_location }}">{{ _('Outlook') }}</a>
 <br/>
-{% if order.event.after_order_message %}
+{% if order.event.after_order_message | strip_tags != '' %}
     <br/>{{ _('Below you find a message from the organizer') }}:
     <br/>
     <div style="white-space: pre-line;">

app/templates/email/ticket_purchased_attendee.html

@@ -15,7 +15,7 @@
 <br/>{{ order.event.normalized_location }}
 <br/><br/>{{ _('Best regards') }},
 <br/>{{ settings.app_name }} {{ _('Team') }}
-{% if order.event.after_order_message %}
+{% if order.event.after_order_message | strip_tags != '' %}
     <br/><br/>{{ _('Below you find a message from the organizer') }}:
     <br/><br/>
     <div style="white-space: pre-line;">

poetry.lock

@@ -67,16 +67,16 @@ psycopg2-binary = "2.9.3"
 SQLAlchemy-Utils = "0.38.2"
 itsdangerous = "2.0.1"
 humanize = "4.0.0"
-celery = "5.2.3"
-redis = "4.2.1"
+celery = "5.2.6"
+redis = "4.2.2"
 apscheduler = "3.9.1"
 pillow = "9.1.0"
 gunicorn = "20.1.0"
 boto = "2.49"
 geoip2 = "4.5.0"
 SQLAlchemy-Continuum = "1.3.12"
 bleach = "4.1.0"
-stripe = "2.70.0"
+stripe = "2.71.0"
 xhtml2pdf = "0.2.6"
 flask-caching = "1.10.1"
 forex-python = "1.8"
@@ -101,7 +101,7 @@ wtforms = {version = "2.3.3", extras = ["email"]}
 flask-admin = "1.6.0"
 google-compute-engine = "2.8.13"
 factory_boy = "3.2.1"
-sentry-sdk = {version = "1.5.8", extras = ["flask"]}
+sentry-sdk = {version = "1.5.9", extras = ["flask"]}
 healthcheck = "1.3.3"
 elasticsearch-dsl = "7.0.0"
 flask-redis = "0.4"
@@ -133,14 +133,14 @@ Flask-Migrate = "2.7.0"
 
 [tool.poetry.dev-dependencies]
 nose = "1.3.7"
-pylint = "2.13.4"
+pylint = "2.13.5"
 pep8 = "1.7.1"
 isort = "5.10.1"
 black = "22.3.0"
-pre-commit = "2.17.0"
+pre-commit = "2.18.1"
 pytype = "2022.2.8"
 pycln = "1.2.5"
-pyupgrade = "2.31.1"
+pyupgrade = "2.32.0"
 # For testing
 coverage = "6.3.2"
 dredd_hooks = "0.2"

pyproject.toml

@@ -2563,9 +2563,9 @@ module-not-found-error@^1.0.0:
   integrity sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=
 
 moment@^2.8.4:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
-  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
 [email protected]:
   version "0.7.1"