diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index cc0389a7..092e35fa 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -93,6 +93,3 @@ CHANNEL_LAYERS = { ACCOUNTINGSYSTEM_EMAIL = "{{ django_accountingsystem_email }}" ECONOMYTEAM_EMAIL = "{{ django_economyteam_email }}" ECONOMYTEAM_NAME = "Economy" - -ORDER_TTL = 24 -ORDER_TTL_UNIT = 'hours' diff --git a/src/bornhack/environment_settings.py.dist.dev b/src/bornhack/environment_settings.py.dist.dev index 488767e4..3009d2c9 100644 --- a/src/bornhack/environment_settings.py.dist.dev +++ b/src/bornhack/environment_settings.py.dist.dev @@ -78,6 +78,3 @@ CHANNEL_LAYERS = { } REIMBURSEMENT_MAIL = "reimbursement@example.com" - -ORDER_TTL = 30 -ORDER_TTL_UNIT = 'minutes' diff --git a/src/shop/email.py b/src/shop/email.py index 14042b9d..80ef8751 100644 --- a/src/shop/email.py +++ b/src/shop/email.py @@ -49,25 +49,6 @@ def add_invoice_email(invoice): ) -def add_order_cancelled_email(order): - formatdict = { - 'ordernumber': order.pk, - 'order_ttl': settings.ORDER_TTL, - 'order_ttl_unit': settings.ORDER_TTL_UNIT - } - - subject = 'Your non-paid BornHack order has been cancelled.' - - # add email to outgoing email queue - return add_outgoing_email( - text_template='emails/order_cancelled_email.txt', - html_template='emails/order_cancelled_email.html', - to_recipients=order.user.email, - formatdict=formatdict, - subject=subject, - ) - - def add_test_email(recipient): return add_outgoing_email( text_template='emails/testmail.txt', diff --git a/src/shop/templates/emails/order_cancelled_email.html b/src/shop/templates/emails/order_cancelled_email.html deleted file mode 100644 index 44650fe1..00000000 --- a/src/shop/templates/emails/order_cancelled_email.html +++ /dev/null @@ -1,11 +0,0 @@ -Hello!
-
-Your order number {{ ordernumber }} has been open for more than {{ order_ttl }} {{ order_ttl_unit }} and has been cancelled.
-
-This means you will have to open a new order.
-
-
-Best regards,
-
-The BornHack Team
-
diff --git a/src/shop/templates/emails/order_cancelled_email.txt b/src/shop/templates/emails/order_cancelled_email.txt deleted file mode 100644 index c530ee12..00000000 --- a/src/shop/templates/emails/order_cancelled_email.txt +++ /dev/null @@ -1,9 +0,0 @@ -Hello! - -Your order number {{ ordernumber }} has been open for more than {{ order_ttl }} {{ order_ttl_unit }} and has been cancelled. - -This means you will have to open a new order. - -Best regards, - -The BornHack Team