From 9fba62db170cec5c830b00a503c82130280999bc Mon Sep 17 00:00:00 2001 From: polmf <99polmf@gmail.com> Date: Thu, 19 Feb 2026 21:02:07 +0100 Subject: [PATCH 1/6] fix alguns errors --- reimbursement/templates/mails/project_invalidated_subject.txt | 1 + reimbursement/views.py | 1 + 2 files changed, 2 insertions(+) create mode 100644 reimbursement/templates/mails/project_invalidated_subject.txt diff --git a/reimbursement/templates/mails/project_invalidated_subject.txt b/reimbursement/templates/mails/project_invalidated_subject.txt new file mode 100644 index 00000000..eafe9d60 --- /dev/null +++ b/reimbursement/templates/mails/project_invalidated_subject.txt @@ -0,0 +1 @@ +[IMPORTANT INFORMATION] Your reimbursement has been invalidated diff --git a/reimbursement/views.py b/reimbursement/views.py index 890c32f3..e1e847a1 100644 --- a/reimbursement/views.py +++ b/reimbursement/views.py @@ -249,6 +249,7 @@ def post(self, request, *args, **kwargs): if a_form.is_valid(): a_form.save(commit=False) a_form.instance.accept_receipt(request.user) + emails.create_ticket_accepted_email(a_form.instance, request).send() a_form.save() messages.success(request, "Receipt accepted") else: From 68d309ab8c9e71c99787fff4960fa210af9a3d24 Mon Sep 17 00:00:00 2001 From: polmf <99polmf@gmail.com> Date: Wed, 25 Feb 2026 17:17:43 +0100 Subject: [PATCH 2/6] update hackaton_variables --- app/hackathon_variables.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/hackathon_variables.py b/app/hackathon_variables.py index 92a28061..c1e5d521 100644 --- a/app/hackathon_variables.py +++ b/app/hackathon_variables.py @@ -84,13 +84,9 @@ REIMBURSEMENT_ENABLED = True DEFAULT_REIMBURSEMENT_AMOUNT = 100 CURRENCY = "€" -REIMBURSEMENT_EXPIRY_DATE = timezone.datetime( - 2026, 5, 2, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE) -) -REIMBURSEMENT_REQUIREMENTS = "You have to submit a project and demo it during the event in order to get reimbursed" -REIMBURSEMENT_DEADLINE = timezone.datetime( - 2026, 5, 5, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE) -) +REIMBURSEMENT_EXPIRY_DATE = timezone.datetime(2026, 4, 4, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE)) +REIMBURSEMENT_REQUIREMENTS = 'You have to submit a project and demo it during the event in order to get reimbursed' +REIMBURSEMENT_DEADLINE = timezone.datetime(2026, 4, 4, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE)) # (OPTIONAL) Max team members. Defaults to 4 TEAMS_ENABLED = True From 1f54ecd51f5f3e284244212c5155c886e950157c Mon Sep 17 00:00:00 2001 From: polmf <99polmf@gmail.com> Date: Wed, 25 Feb 2026 17:27:21 +0100 Subject: [PATCH 3/6] actualitzacions de plantilles --- .../mails/devpost_upload_message.html | 6 ++---- .../mails/devpost_upload_subject.txt | 2 +- .../mails/ticket_accepted_message.html | 12 +++++------ .../mails/travel_tickets_upload_message.html | 20 +++++++++---------- .../mails/travel_tickets_upload_subject.txt | 2 +- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/reimbursement/templates/mails/devpost_upload_message.html b/reimbursement/templates/mails/devpost_upload_message.html index da62d5e7..f7d81aca 100644 --- a/reimbursement/templates/mails/devpost_upload_message.html +++ b/reimbursement/templates/mails/devpost_upload_message.html @@ -5,13 +5,11 @@

Hey {{ app.user.get_full_name }},


HackUPC has officially come to an end, and we hope you enjoyed the event as much as we did!

-

The next step to get your travel reimbursement is to upload the link to your project on Devpost. This will allow us +

The next step to get your travel reimbursement is to upload the link to your project on Devpost. This will allow us to validate your submission and verify that the project is valid and that it complies with the requirements that were previously communicated.

-

Upload your link here: https://my.hackupc.com/reimbursement/dash_board/. -

+

Upload your link here:

{% include 'mails/include/email_button.html' with text='Upload Devpost link' url=form_url %} diff --git a/reimbursement/templates/mails/devpost_upload_subject.txt b/reimbursement/templates/mails/devpost_upload_subject.txt index f99021ac..991155d8 100644 --- a/reimbursement/templates/mails/devpost_upload_subject.txt +++ b/reimbursement/templates/mails/devpost_upload_subject.txt @@ -1 +1 @@ -[ACTION REQUIRED] Upload your Devpost link +Upload your Devpost link diff --git a/reimbursement/templates/mails/ticket_accepted_message.html b/reimbursement/templates/mails/ticket_accepted_message.html index 12d2f87d..775dc320 100644 --- a/reimbursement/templates/mails/ticket_accepted_message.html +++ b/reimbursement/templates/mails/ticket_accepted_message.html @@ -10,22 +10,22 @@

Regarding the project:

Regarding the attendance:

The money will be transferred to the participant using PayPal in the following 60 days after the event. The paypal - account MUST exist.

+ account MUST exist.

{% include 'mails/include/closing.html' with travel="true" %} {% endblock %} \ No newline at end of file diff --git a/reimbursement/templates/mails/travel_tickets_upload_message.html b/reimbursement/templates/mails/travel_tickets_upload_message.html index 3b84a138..8cf424da 100644 --- a/reimbursement/templates/mails/travel_tickets_upload_message.html +++ b/reimbursement/templates/mails/travel_tickets_upload_message.html @@ -4,19 +4,19 @@ {% block content %}

Hey {{ app.user.get_full_name }},


-

For us to accept your travel reimbursement request, you need to upload VALID travel tickets in https://my.hackupc.com/reimbursement/dash_board/. -

-

A ticket is considered valid if and only if:

+

For us to accept your travel reimbursement request, you need to upload VALID travel tickets here:

+ +{% include 'mails/include/email_button.html' with text='Upload tickets' url=form_url %} + +

A ticket is considered valid if and only if:

-{% include 'mails/include/email_button.html' with text='Upload tickets' url=form_url %} - {% include 'mails/include/closing.html' with travel="true" %} {% endblock %} \ No newline at end of file diff --git a/reimbursement/templates/mails/travel_tickets_upload_subject.txt b/reimbursement/templates/mails/travel_tickets_upload_subject.txt index b96ef834..b74d979d 100644 --- a/reimbursement/templates/mails/travel_tickets_upload_subject.txt +++ b/reimbursement/templates/mails/travel_tickets_upload_subject.txt @@ -1 +1 @@ -[ACTION REQUIRED] Upload your travel tickets +Upload your travel tickets From 0df616bfc3eccd19591fea6609376a496fef2a87 Mon Sep 17 00:00:00 2001 From: polmf <99polmf@gmail.com> Date: Wed, 25 Feb 2026 17:43:36 +0100 Subject: [PATCH 4/6] afegir paypal --- .../templates/mails/travel_tickets_upload_message.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reimbursement/templates/mails/travel_tickets_upload_message.html b/reimbursement/templates/mails/travel_tickets_upload_message.html index 8cf424da..d799a3a8 100644 --- a/reimbursement/templates/mails/travel_tickets_upload_message.html +++ b/reimbursement/templates/mails/travel_tickets_upload_message.html @@ -18,5 +18,7 @@
  • The ticket is uploaded before the start of the event.
    • +

    Remember! The paypal account MUST exist.

    + {% include 'mails/include/closing.html' with travel="true" %} {% endblock %} \ No newline at end of file From efa602ed1c403de4ff72f4949fd7e4a61689f097 Mon Sep 17 00:00:00 2001 From: polmf <99polmf@gmail.com> Date: Wed, 25 Feb 2026 17:47:50 +0100 Subject: [PATCH 5/6] cronjob diumenges a les 20 --- cronjob | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cronjob b/cronjob index 9e7e140d..574ab424 100644 --- a/cronjob +++ b/cronjob @@ -2,5 +2,5 @@ 6 */2 * * * root /usr/local/bin/python /code/manage.py expire_applications # Run expire reimbursements job at 6 minutes past the hour, every 2 hours 36 */2 * * * root /usr/local/bin/python /code/manage.py expire_reimbursements -# Run send devpost emails job every Sunday at 20:00 -0 20 * * 0 root /usr/local/bin/python /code/manage.py send_devpost_emails +# Run send devpost emails job every Sunday at 20:00 server va 1 hora abans +0 19 * * 0 root /usr/local/bin/python /code/manage.py send_devpost_emails From bf49141bf2bc3134bdbe65d501e6e74132c8c0b7 Mon Sep 17 00:00:00 2001 From: polmf <99polmf@gmail.com> Date: Thu, 26 Feb 2026 17:43:59 +0100 Subject: [PATCH 6/6] mail actualitzat --- .../mails/travel_tickets_upload_message.html | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/reimbursement/templates/mails/travel_tickets_upload_message.html b/reimbursement/templates/mails/travel_tickets_upload_message.html index d799a3a8..4f33175f 100644 --- a/reimbursement/templates/mails/travel_tickets_upload_message.html +++ b/reimbursement/templates/mails/travel_tickets_upload_message.html @@ -1,24 +1,34 @@ {% extends 'base_email.html' %} -{% block preheader %}Upload your travel tickets{% endblock %} +{% block preheader %}Upload your travel ticket{% endblock %} {% block content %} -

    Hey {{ app.user.get_full_name }},

    +

    Hey {{ app.user.get_full_name }},


    -

    For us to accept your travel reimbursement request, you need to upload VALID travel tickets here:

    -{% include 'mails/include/email_button.html' with text='Upload tickets' url=form_url %} +

    Congratulations on being accepted to HackUPC 2026! 🎉

    -

    A ticket is considered valid if and only if:

    +

    We noticed that you selected the travel reimbursement option. To proceed, please upload a valid travel ticket to your MyHackUPC dashboard as soon as possible.

    + +{% include 'mails/include/email_button.html' with text='Upload ticket' url=form_url %} + +

    A ticket will be considered valid only if:

    -

    Remember! The paypal account MUST exist.

    +
    + +

    Reimbursement Policy

    +

    The reimbursed amount will be the minimum of:

    + {% include 'mails/include/closing.html' with travel="true" %} -{% endblock %} \ No newline at end of file +{% endblock %}