- {% endcache %}
-{% endblock content %}
-
-{% block javascript %}
-
-{% endblock %}
-
-{% block css %}
-
-{% endblock %}
\ No newline at end of file
+{% endblock content %}
\ No newline at end of file
diff --git a/theme/templates/trades/_trade_offer_list.html b/theme/templates/trades/_trade_offer_list.html
index a2e897a..3b5d9f6 100644
--- a/theme/templates/trades/_trade_offer_list.html
+++ b/theme/templates/trades/_trade_offer_list.html
@@ -1,19 +1,13 @@
{% load trade_offer_tags pagination_tags %}
-{% comment %}
- This snippet renders a grid of trade offer cards (or acceptance cards) along with pagination controls.
- For a TradeOffer, we use {% render_trade_offer %}; for a TradeAcceptance, {% render_trade_acceptance %}.
-{% endcomment %}
-
+
{% for offer in offers %}
-
{% if offer.accepted_by %}
{# Render a trade acceptance using our new tag #}
{% render_trade_acceptance offer %}
{% else %}
{% render_trade_offer offer %}
{% endif %}
-
{% empty %}
No trade offers available.
{% endfor %}
diff --git a/theme/templates/trades/email/trade_update_accepted.txt b/theme/templates/trades/email/trade_update_accepted.txt
deleted file mode 100644
index 18c4833..0000000
--- a/theme/templates/trades/email/trade_update_accepted.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Hello {{ recipient_user }},
-
-Great news! {{ acting_user }} ({{ acting_user_friend_code }}) has accepted your trade offer.
-
-Trade Details:
-- #{{ hash }}
-- They are offering: {{ want_card }}
-- They want: {{ has_card }}
-
-What's next? You can now mark the trade as "Sent" once you've offered the card to them in the app, or reject the trade if needed.
-
-Visit your dashboard to manage this trade:
-{% url 'dashboard' %}
-
-Happy trading!
-PKMN Trade Club
\ No newline at end of file
diff --git a/theme/templates/trades/email/trade_update_received.txt b/theme/templates/trades/email/trade_update_received.txt
deleted file mode 100644
index 78e4e28..0000000
--- a/theme/templates/trades/email/trade_update_received.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Hello {{ recipient_user }},
-
-{{ acting_user }} ({{ acting_user_friend_code }}) has marked your trade as "Received".
-
-Trade Details:
-- #{{ hash }}
-- Card you sent: {{ has_card }}
-- Card they offered: {{ want_card }}
-
-What's next? Send a thank you to this user to increase their reputation!
-
-Visit your dashboard to send thanks:
-{% url 'dashboard' %}
-
-Happy trading!
-PKMN Trade Club
\ No newline at end of file
diff --git a/theme/templates/trades/email/trade_update_sent.txt b/theme/templates/trades/email/trade_update_sent.txt
deleted file mode 100644
index a49ce02..0000000
--- a/theme/templates/trades/email/trade_update_sent.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Hello {{ recipient_user }},
-
-{{ acting_user }} ({{ acting_user_friend_code }}) has marked your trade as "Sent".
-
-Trade Details:
-- #{{ hash }}
-- Card being sent to you: {{ has_card }}
-- Card you're offering: {{ want_card }}
-
-What's next? Once you respond to the trade in the app, please mark the trade as "Received" in your dashboard.
-
-Visit your dashboard to manage this trade:
-{% url 'dashboard' %}
-
-Happy trading!
-PKMN Trade Club
\ No newline at end of file
diff --git a/theme/templates/trades/email/trade_update_thanked_by_both.txt b/theme/templates/trades/email/trade_update_thanked_by_both.txt
deleted file mode 100644
index 4de1c97..0000000
--- a/theme/templates/trades/email/trade_update_thanked_by_both.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Hello {{ recipient_user }},
-
-{{ acting_user }} ({{ acting_user_friend_code }}) has sent their thanks for the successful trade!
-
-Trade Details:
-- #{{ hash }}
-- Card {% if is_initiator %}you{% else %}they{% endif %} sent: {{ has_card }}
-- Card {% if is_initiator %}they{% else %}you{% endif %} offered: {{ want_card }}
-
-This trade is now completed; no further actions can be made.
-
-Thank you for using PKMN Trade Club.
-
-Happy trading!
-PKMN Trade Club
\ No newline at end of file
diff --git a/theme/templatetags/trade_offer.html b/theme/templatetags/trade_offer.html
index 249d10d..0610834 100644
--- a/theme/templatetags/trade_offer.html
+++ b/theme/templatetags/trade_offer.html
@@ -13,7 +13,7 @@
Wants
-
+
{{ initiated_by_email|gravatar:40 }}
@@ -73,7 +73,7 @@
Wants
-
+
{{ initiated_by_email|gravatar:40 }}
diff --git a/trades/signals.py b/trades/signals.py
index bb9a769..df92f30 100644
--- a/trades/signals.py
+++ b/trades/signals.py
@@ -8,7 +8,10 @@ from datetime import timedelta
from django.utils import timezone
import uuid
import hashlib
+from django.core.mail import send_mail
from django.conf import settings
+from django.template.loader import render_to_string
+from django.contrib.sites.models import Site
ACTIVE_STATES = [
TradeAcceptance.AcceptanceState.ACCEPTED,
@@ -92,7 +95,6 @@ def trade_acceptance_post_delete(sender, instance, **kwargs):
def trade_acceptance_email_notification(sender, instance, created, **kwargs):
# Only proceed if the update was triggered by an acting user.
if not hasattr(instance, "_actioning_user"):
- print("No actioning user")
return
# check if were in debug mode
@@ -122,42 +124,41 @@ def trade_acceptance_email_notification(sender, instance, created, **kwargs):
else:
return
- print("state", state)
- print("acting_user", acting_user)
# Determine the non-acting party:
if instance.trade_offer.initiated_by == acting_user:
# The initiator made the change; notify the acceptor.
recipient_user = instance.accepted_by.user
- email_template = "trades/email/trade_update_" + state + ".txt"
- email_subject = "[PKMN Trade Club] Trade Update"
else:
# The acceptor made the change; notify the initiator.
recipient_user = instance.trade_offer.initiated_by.user
- email_template = "trades/email/trade_update_" + state + ".txt"
- email_subject = "[PKMN Trade Club] Trade Update"
is_initiator = instance.trade_offer.initiated_by == acting_user
- from django.template.loader import render_to_string
email_context = {
"has_card": instance.requested_card,
"want_card": instance.offered_card,
"hash": instance.hash,
"acting_user": acting_user.username,
+ "acting_user_ign": instance.trade_offer.initiated_by.in_game_name if is_initiator else instance.accepted_by.in_game_name,
"recipient_user": recipient_user.username,
+ "recipient_user_ign": instance.accepted_by.in_game_name if is_initiator else instance.trade_offer.initiated_by.in_game_name,
"acting_user_friend_code": instance.trade_offer.initiated_by.friend_code if is_initiator else instance.accepted_by.friend_code,
"is_initiator": is_initiator,
+ "domain": Site.objects.get_current().domain,
"pk": instance.pk,
}
- print("email_context", email_context)
+ email_template = "email/trades/trade_update_" + state + ".txt"
+ email_subject = render_to_string("email/common/subject.txt", email_context)
+ email_subject += render_to_string("email/trades/trade_update_" + state + "_subject.txt", email_context)
email_body = render_to_string(email_template, email_context)
- from django.core.mail import send_mail
+ print("initiated by: ", instance.trade_offer.initiated_by, ", accepted by: ", instance.accepted_by, ", acting user: ", acting_user, ", recipient user: ", recipient_user, ", state: ", state)
+
send_mail(
email_subject,
email_body,
- None, # Django will use DEFAULT_FROM_EMAIL from settings
+ None,
[recipient_user.email],
)