badblocks/pkmntrade.club
1
1
Fork 0
Code Issues 14 Pull requests Projects 1 Releases Packages Wiki Activity

Refactor email templates

Browse source
This commit is contained in:
badblocks 2025-04-07 18:33:45 -07:00
parent e37731b74d
commit 32da8157a6
31 changed files with 476 additions and 2516 deletions
Download patch file Download diff file Expand all files Collapse all files

2
accounts/models.py
View file

@ -17,7 +17,7 @@ class CustomUser(AbstractUser):
verbose_name="Show Friend Code on Link Previews",
help_text="This will primarily affect share link previews on X, Discord, etc."
)
reputation_score = models.PositiveIntegerField(default=0)
reputation_score = models.IntegerField(default=0)
def __str__(self):
return self.email

75
seed/0004_TestUsers.json
View file

@ -1,10 +1,10 @@
[
{
{
"model": "accounts.customuser",
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$870000$f99EReOECF2LPne1JHADoy$pr/769omIyRNkDhaojgIIm8kZcAeFiR0DOLcUvbLlk4=",
"last_login": "2025-03-13T04:24:11.029Z",
"last_login": "2025-04-07T07:40:57.629Z",
"is_superuser": true,
"username": "badblocks",
"first_name": "",
@ -14,11 +14,13 @@
"is_active": true,
"date_joined": "2025-03-13T04:21:04.553Z",
"default_friend_code": 1,
"show_friend_code_on_link_previews": true,
"reputation_score": 2,
"groups": [],
"user_permissions": []
}
},
{
},
{
"model": "accounts.customuser",
"pk": 2,
"fields": {
@ -33,11 +35,34 @@
"is_active": true,
"date_joined": "2025-03-13T04:52:28.482Z",
"default_friend_code": 2,
"show_friend_code_on_link_previews": false,
"reputation_score": 0,
"groups": [],
"user_permissions": []
}
},
{
},
{
"model": "accounts.customuser",
"pk": 3,
"fields": {
"password": "pbkdf2_sha256$870000$hbzakvek5c6oJWJ0jMliuz$4yX2/s9BsZ2FqMnOaApWQUraB+FX0JK7RmjjPbaLlgQ=",
"last_login": "2025-04-07T23:30:40.481Z",
"is_superuser": false,
"username": "badblocks2",
"first_name": "",
"last_name": "",
"email": "rob2@badblocks.email",
"is_staff": false,
"is_active": true,
"date_joined": "2025-04-07T07:36:12.011Z",
"default_friend_code": 3,
"show_friend_code_on_link_previews": false,
"reputation_score": 2,
"groups": [],
"user_permissions": []
}
},
{
"model": "accounts.friendcode",
"pk": 1,
"fields": {
@ -47,8 +72,8 @@
"created_at": "2025-03-13T04:21:05.166Z",
"updated_at": "2025-03-13T04:21:05.166Z"
}
},
{
},
{
"model": "accounts.friendcode",
"pk": 2,
"fields": {
@ -58,8 +83,19 @@
"created_at": "2025-03-13T04:52:29.166Z",
"updated_at": "2025-03-13T04:52:29.166Z"
}
},
{
},
{
"model": "accounts.friendcode",
"pk": 3,
"fields": {
"friend_code": "0987-0987-1234-1234",
"in_game_name": "badblocks2",
"user": 3,
"created_at": "2025-04-07T07:36:12.592Z",
"updated_at": "2025-04-07T07:36:12.592Z"
}
},
{
"model": "account.emailaddress",
"pk": 1,
"fields": {
@ -68,8 +104,8 @@
"verified": true,
"primary": true
}
},
{
},
{
"model": "account.emailaddress",
"pk": 2,
"fields": {
@ -78,5 +114,16 @@
"verified": true,
"primary": true
}
}
]
},
{
"model": "account.emailaddress",
"pk": 3,
"fields": {
"user": 3,
"email": "rob2@badblocks.email",
"verified": true,
"primary": true
}
}
]

257
seed/0005_TradeOffers.json
View file

@ -1168,7 +1168,7 @@
"trade_offer": 33,
"card": 236,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1178,7 +1178,7 @@
"trade_offer": 33,
"card": 545,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1188,7 +1188,7 @@
"trade_offer": 33,
"card": 537,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1198,7 +1198,7 @@
"trade_offer": 33,
"card": 248,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1218,7 +1218,7 @@
"trade_offer": 33,
"card": 533,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1248,7 +1248,7 @@
"trade_offer": 33,
"card": 543,
"quantity": 3,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1258,7 +1258,7 @@
"trade_offer": 33,
"card": 655,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1268,7 +1268,7 @@
"trade_offer": 33,
"card": 542,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1278,7 +1278,7 @@
"trade_offer": 33,
"card": 360,
"quantity": 2,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1298,7 +1298,7 @@
"trade_offer": 33,
"card": 240,
"quantity": 2,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -1308,7 +1308,7 @@
"trade_offer": 33,
"card": 657,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2028,7 +2028,7 @@
"trade_offer": 33,
"card": 227,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2038,7 +2038,7 @@
"trade_offer": 33,
"card": 530,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2058,7 +2058,7 @@
"trade_offer": 33,
"card": 540,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2068,7 +2068,7 @@
"trade_offer": 33,
"card": 239,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2078,7 +2078,7 @@
"trade_offer": 33,
"card": 244,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2088,7 +2088,7 @@
"trade_offer": 33,
"card": 539,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2128,7 +2128,7 @@
"trade_offer": 33,
"card": 532,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2168,7 +2168,7 @@
"trade_offer": 33,
"card": 535,
"quantity": 3,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2178,7 +2178,7 @@
"trade_offer": 33,
"card": 237,
"quantity": 1,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2188,7 +2188,7 @@
"trade_offer": 33,
"card": 544,
"quantity": 4,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
@ -2228,7 +2228,218 @@
"trade_offer": 33,
"card": 750,
"quantity": 2,
"qty_accepted": 0
"qty_accepted": 1
}
},
{
"model": "trades.tradeacceptance",
"pk": 1,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 542,
"offered_card": 532,
"state": "ACCEPTED",
"hash": "202ffbd4y",
"created_at": "2025-04-07T07:37:58.330Z",
"updated_at": "2025-04-07T07:37:58.330Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 2,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 236,
"offered_card": 530,
"state": "SENT",
"hash": "4ecac062y",
"created_at": "2025-04-07T07:38:40.854Z",
"updated_at": "2025-04-07T07:38:40.854Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 3,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 655,
"offered_card": 237,
"state": "THANKED_BY_INITIATOR",
"hash": "7ae69e4fy",
"created_at": "2025-04-07T07:38:58.971Z",
"updated_at": "2025-04-07T07:38:58.971Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 4,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 360,
"offered_card": 227,
"state": "SENT",
"hash": "a8d73a5ay",
"created_at": "2025-04-07T07:39:56.519Z",
"updated_at": "2025-04-07T07:39:56.519Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 5,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 533,
"offered_card": 539,
"state": "THANKED_BY_BOTH",
"hash": "873e6f61y",
"created_at": "2025-04-07T07:40:18.977Z",
"updated_at": "2025-04-07T07:40:18.977Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 6,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 543,
"offered_card": 540,
"state": "THANKED_BY_ACCEPTOR",
"hash": "9cdb8cc2y",
"created_at": "2025-04-07T07:40:37.114Z",
"updated_at": "2025-04-07T07:40:37.114Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 7,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 248,
"offered_card": 535,
"state": "RECEIVED",
"hash": "8da2e2e8y",
"created_at": "2025-04-07T07:46:45.763Z",
"updated_at": "2025-04-07T07:46:45.763Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 8,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 240,
"offered_card": 544,
"state": "THANKED_BY_BOTH",
"hash": "25c904e6y",
"created_at": "2025-04-07T07:47:08.427Z",
"updated_at": "2025-04-07T07:47:08.427Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 9,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 228,
"offered_card": 535,
"state": "REJECTED_BY_INITIATOR",
"hash": "1720d735y",
"created_at": "2025-04-07T07:47:35.798Z",
"updated_at": "2025-04-07T07:47:35.798Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 10,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 240,
"offered_card": 535,
"state": "REJECTED_BY_INITIATOR",
"hash": "d02caf35y",
"created_at": "2025-04-07T07:47:59.390Z",
"updated_at": "2025-04-07T07:47:59.390Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 11,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 748,
"offered_card": 750,
"state": "REJECTED_BY_ACCEPTOR",
"hash": "ea50fa4ey",
"created_at": "2025-04-07T07:48:30.600Z",
"updated_at": "2025-04-07T07:48:30.600Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 12,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 235,
"offered_card": 529,
"state": "REJECTED_BY_ACCEPTOR",
"hash": "a77cb744y",
"created_at": "2025-04-07T07:48:47.966Z",
"updated_at": "2025-04-07T07:48:47.966Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 13,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 537,
"offered_card": 239,
"state": "ACCEPTED",
"hash": "ac8d996by",
"created_at": "2025-04-07T23:31:50.450Z",
"updated_at": "2025-04-07T23:31:50.450Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 14,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 545,
"offered_card": 244,
"state": "ACCEPTED",
"hash": "01463b9dy",
"created_at": "2025-04-07T23:36:49.271Z",
"updated_at": "2025-04-07T23:36:49.271Z"
}
},
{
"model": "trades.tradeacceptance",
"pk": 15,
"fields": {
"trade_offer": 33,
"accepted_by": 3,
"requested_card": 657,
"offered_card": 750,
"state": "ACCEPTED",
"hash": "97343361y",
"created_at": "2025-04-08T01:41:36.782Z",
"updated_at": "2025-04-08T01:41:36.782Z"
}
}
]
]

2248
seed/M4R9zUMD.txt
View file

File diff suppressed because it is too large Load diff

2
theme/templates/email/common/footer.txt Normal file
View file

@ -0,0 +1,2 @@
Happy trading!
PKMN Trade Club

1
theme/templates/email/common/header.txt Normal file
View file

@ -0,0 +1 @@
Hello {{ recipient_user }},

1
theme/templates/email/common/subject.txt Normal file
View file

@ -0,0 +1 @@
[PKMN Trade Club]

15
theme/templates/email/trades/trade_update_accepted.txt Normal file
View file

@ -0,0 +1,15 @@
{% include 'email/common/header.txt' %}
Great news! {{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has accepted your trade offer.
Trade Details:
- They have: {{ want_card }}
- They want: {{ has_card }}
(#{{ hash }})
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:
{{ domain }}{% url 'dashboard' %}
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_accepted_subject.txt Normal file
View file

@ -0,0 +1 @@
Trade Accepted

15
theme/templates/email/trades/trade_update_received.txt Normal file
View file

@ -0,0 +1,15 @@
{% include 'email/common/header.txt' %}
Great news! {{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has marked your trade as "Received".
Trade Details:
- They sent: {{ want_card }}
- They received: {{ has_card }}
(#{{ hash }})
What's next? Send a thank you to this user to increase their reputation!
Visit your dashboard to send thanks:
{{ domain }}{% url 'dashboard' %}
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_received_subject.txt Normal file
View file

@ -0,0 +1 @@
Trade Received

13
theme/templates/trades/email/trade_update_rejected_by_acceptor.txt → theme/templates/email/trades/trade_update_rejected_by_acceptor.txt
View file

@ -1,16 +1,15 @@
Hello {{ recipient_user }},
{% include 'email/common/header.txt' %}
We're sorry to inform you that {{ acting_user }} ({{ acting_user_friend_code }}) has canceled their trade acceptance.
Trade Details:
- #{{ hash }}
- Card you were going to send: {{ has_card }}
- Card they were offering: {{ want_card }}
- They had: {{ want_card }}
- They wanted: {{ has_card }}
(#{{ hash }})
Your trade offer is still active and available for other users to accept.
Visit your dashboard to manage your trade offers:
{% url 'dashboard' %}
{{ domain }}{% url 'dashboard' %}
Happy trading!
PKMN Trade Club
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_rejected_by_acceptor_subject.txt Normal file
View file

@ -0,0 +1 @@
Trade Was Rejected

13
theme/templates/trades/email/trade_update_rejected_by_initiator.txt → theme/templates/email/trades/trade_update_rejected_by_initiator.txt
View file

@ -1,16 +1,15 @@
Hello {{ recipient_user }},
{% include 'email/common/header.txt' %}
We're sorry to inform you that {{ acting_user }} ({{ acting_user_friend_code }}) has rejected the trade.
Trade Details:
- #{{ hash }}
- Card you were going to receive: {{ has_card }}
- Card you were offering: {{ want_card }}
- You had: {{ has_card }}
- You wanted: {{ want_card }}
(#{{ hash }})
Don't worry - there are plenty of other trade opportunities available! You can browse our marketplace for similar trades.
Visit the marketplace:
https://pkmntrade.club{% url 'trade_offer_list' %}
{{ domain }}{% url 'trade_offer_list' %}
Better luck with your next trade!
PKMN Trade Club
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_rejected_by_initiator_subject.txt Normal file
View file

@ -0,0 +1 @@
Trade Was Rejected

15
theme/templates/email/trades/trade_update_sent.txt Normal file
View file

@ -0,0 +1,15 @@
{% include 'email/common/header.txt' %}
{{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has marked your trade as "Sent".
Trade Details:
- You have: {{ want_card }}
- You want: {{ has_card }}
(#{{ hash }})
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:
{{ domain }}{% url 'dashboard' %}
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_sent_subject.txt Normal file
View file

@ -0,0 +1 @@
Trade Sent

13
theme/templates/trades/email/trade_update_thanked_by_acceptor.txt → theme/templates/email/trades/trade_update_thanked_by_acceptor.txt
View file

@ -1,16 +1,15 @@
Hello {{ recipient_user }},
{% include 'email/common/header.txt' %}
{{ acting_user }} ({{ acting_user_friend_code }}) has sent their thanks for the successful trade!
Trade Details:
- #{{ hash }}
- Card you sent: {{ has_card }}
- Card they offered: {{ want_card }}
- They sent: {{ want_card }}
- They received: {{ has_card }}
(#{{ hash }})
What's next? Send a thank you to this user to increase their reputation!
Visit your dashboard to send thanks:
{% url 'dashboard' %}
{{ domain }}{% url 'dashboard' %}
Happy trading!
PKMN Trade Club
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_thanked_by_acceptor_subject.txt Normal file
View file

@ -0,0 +1 @@
You Received A Thanks!

14
theme/templates/email/trades/trade_update_thanked_by_both.txt Normal file
View file

@ -0,0 +1,14 @@
{% include 'email/common/header.txt' %}
{{ acting_user }} ({{ acting_user_friend_code }}) has sent their thanks for the successful trade!
Trade Details:
- {% if is_initiator %}They sent: {{ has_card }}{% else %}You sent: {{ want_card }}{% endif %}
- {% if is_initiator %}They received: {{ want_card }}{% else %}You received: {{ has_card }}{% endif %}
(#{{ hash }})
This trade is now completed; no further actions can be made.
Thank you for using PKMN Trade Club.
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_thanked_by_both_subject.txt Normal file
View file

@ -0,0 +1 @@
You Received A Thanks!

13
theme/templates/trades/email/trade_update_thanked_by_initiator.txt → theme/templates/email/trades/trade_update_thanked_by_initiator.txt
View file

@ -1,16 +1,15 @@
Hello {{ recipient_user }},
{% include 'email/common/header.txt' %}
{{ acting_user }} ({{ acting_user_friend_code }}) has sent their thanks for the successful trade!
Trade Details:
- #{{ hash }}
- Card they sent: {{ has_card }}
- Card you offered: {{ want_card }}
- You sent: {{ want_card }}
- You received: {{ has_card }}
(#{{ hash }})
What's next? Send a thank you to this user to increase their reputation!
Visit your dashboard to send thanks:
{% url 'dashboard' %}
{{ domain }}{% url 'dashboard' %}
Happy trading!
PKMN Trade Club
{% include 'email/common/footer.txt' %}

1
theme/templates/email/trades/trade_update_thanked_by_initiator_subject.txt Normal file
View file

@ -0,0 +1 @@
You Received A Thanks!

55
theme/templates/home/home.html
View file

@ -47,7 +47,7 @@
<h5 class="text-xl text-center font-semibold whitespace-nowrap truncate mb-0">Most Offered</h5>
</div>
<div class="card-body my-4 p-0">
{% cache 3600 most_offered_cards %}
{% cache 300 most_offered_cards %}
{% include "home/_card_list.html" with cards=most_offered_cards %}
{% endcache %}
</div>
@ -60,7 +60,7 @@
<h5 class="text-xl text-center font-semibold whitespace-nowrap truncate mb-0">Most Wanted</h5>
</div>
<div class="card-body my-4 p-0">
{% cache 3600 most_wanted_cards %}
{% cache 300 most_wanted_cards %}
{% include "home/_card_list.html" with cards=most_wanted_cards %}
{% endcache %}
</div>
@ -73,7 +73,7 @@
<h5 class="text-xl text-center font-semibold whitespace-nowrap truncate mb-0">Least Offered</h5>
</div>
<div class="card-body my-4 p-0">
{% cache 3600 least_offered_cards %}
{% cache 300 least_offered_cards %}
{% include "home/_card_list.html" with cards=least_offered_cards %}
{% endcache %}
</div>
@ -87,7 +87,6 @@
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<!-- Featured Offers -->
<div>
{% cache 3600 featured_offers %}
<div class="p-4 text-center ">
<h5 class="text-xl font-semibold whitespace-nowrap truncate mb-0">Featured Offers</h5>
</div>
@ -102,12 +101,10 @@
<p class="text-center">No featured offers available.</p>
{% endif %}
</div>
{% endcache %}
</div>
<!-- Recent Offers -->
<div>
{% cache 3600 recent_offers %}
<div class="text-center p-4">
<h5 class="text-xl font-semibold whitespace-nowrap truncate mb-0">Recent Offers</h5>
</div>
@ -120,53 +117,7 @@
{% endfor %}
</div>
</div>
{% endcache %}
</div>
</div>
</section>
{% endblock content %}
{% block javascript %}
<script defer>
document.addEventListener('DOMContentLoaded', function() {
// Minimal JavaScript for toggling Featured Offers tabs
const featuredTabs = document.querySelectorAll('input[name="featured_tabs"]');
const featuredTabContents = document.querySelectorAll('#featured-tab-contents .tab-content');
function updateFeaturedTabs() {
featuredTabs.forEach(radio => {
if (radio.checked) {
const target = radio.id;
featuredTabContents.forEach(content => {
content.style.display = content.getAttribute('data-tab') === target ? 'block' : 'none';
});
}
});
}
featuredTabs.forEach(radio => {
radio.addEventListener('change', updateFeaturedTabs);
});
// Initialize tabs on page load
updateFeaturedTabs();
});
</script>
{% endblock %}
{% block css %}
<style>
.tabs-box .tab {
z-index: 1;
}
.tabs-box .tab:checked,
.tabs-box .tab.active {
z-index: 2;
background-color: var(--color-base-200);
accent-color: var(--color-base-200);
}
.tabs-box .tab:focus-visible {
outline: none;
}
</style>
{% endblock %}

8
theme/templates/trades/_trade_offer_list.html
View file

@ -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 %}
<div class="flex flex-row gap-6 md:gap-2 lg:gap-6 flex-wrap justify-center items-start py-6">
<div class="flex flex-row gap-6 md:gap-2 lg:gap-6 flex-wrap justify-center py-6">
{% for offer in offers %}
<div class="flex flex-none">
{% if offer.accepted_by %}
{# Render a trade acceptance using our new tag #}
{% render_trade_acceptance offer %}
{% else %}
{% render_trade_offer offer %}
{% endif %}
</div>
{% empty %}
<div>No trade offers available.</div>
{% endfor %}

16
theme/templates/trades/email/trade_update_accepted.txt
View file

@ -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

16
theme/templates/trades/email/trade_update_received.txt
View file

@ -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

16
theme/templates/trades/email/trade_update_sent.txt
View file

@ -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

15
theme/templates/trades/email/trade_update_thanked_by_both.txt
View file

@ -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

4
theme/templatetags/trade_offer.html
View file

@ -13,7 +13,7 @@
<span class="text-sm font-semibold text-center">Wants</span>
</div>
<div class="absolute inset-x-0 top-1/2 transform -translate-y-1/2 flex justify-center">
<div class="avatar tooltip tooltip-top" data-tip="{{ initiated_by_username }} | {{ initiated_reputation }}">
<div class="avatar tooltip tooltip-top" data-tip="{{ initiated_by_username }} | {{ initiated_reputation }} rep">
<div class="w-10 rounded-full">
{{ initiated_by_email|gravatar:40 }}
</div>
@ -73,7 +73,7 @@
<span class="text-sm font-semibold text-center">Wants</span>
</div>
<div class="absolute inset-x-0 top-1/2 transform -translate-y-1/2 flex justify-center">
<div class="avatar">
<div class="avatar tooltip tooltip-top" data-tip="{{ initiated_by_username }} | {{ initiated_reputation }} rep">
<div class="w-10 rounded-full">
{{ initiated_by_email|gravatar:40 }}
</div>

23
trades/signals.py
View file

@ -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],
)