Merge branch 'development' into order-msg

Author: progmatic-99

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)

poetry.lock

@@ -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"
@@ -140,7 +140,7 @@ black = "22.3.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"