From 22ef6b8e3a8b03423d307cd06c4d7e6002fca9b2 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 26 Nov 2019 18:18:49 +0000
Subject: [PATCH 1/2] FIX #321: Authorisation Success emails dated 'None'

---
 RIGS/templates/RIGS/eventauthorisation_client_success.txt | 2 +-
 RIGS/templates/RIGS/eventauthorisation_mic_success.txt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RIGS/templates/RIGS/eventauthorisation_client_success.txt b/RIGS/templates/RIGS/eventauthorisation_client_success.txt
index ff934c4d6..2914b0457 100644
--- a/RIGS/templates/RIGS/eventauthorisation_client_success.txt
+++ b/RIGS/templates/RIGS/eventauthorisation_client_success.txt
@@ -1,6 +1,6 @@
 Hi {{ to_name|default:"there" }},
 
-Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
+Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
 
 {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
 Your event is now fully booked and payment will be processed by the finance department automatically.
diff --git a/RIGS/templates/RIGS/eventauthorisation_mic_success.txt b/RIGS/templates/RIGS/eventauthorisation_mic_success.txt
index 7548cad4e..43ddd5e17 100644
--- a/RIGS/templates/RIGS/eventauthorisation_mic_success.txt
+++ b/RIGS/templates/RIGS/eventauthorisation_mic_success.txt
@@ -1,5 +1,5 @@
 Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
 
-Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
+Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
 
 The TEC Rig Information Gathering System

From 8e27dae895b90a84207422c4267009a6e685b54f Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 26 Nov 2019 20:10:20 +0000
Subject: [PATCH 2/2] FIX: Additionally fix datestamp on HTML client emails
 (#321)

---
 RIGS/templates/RIGS/eventauthorisation_client_success.html | 2 +-
 RIGS/templates/RIGS/eventauthorisation_client_success.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RIGS/templates/RIGS/eventauthorisation_client_success.html b/RIGS/templates/RIGS/eventauthorisation_client_success.html
index dc6d04854..398dee809 100644
--- a/RIGS/templates/RIGS/eventauthorisation_client_success.html
+++ b/RIGS/templates/RIGS/eventauthorisation_client_success.html
@@ -6,7 +6,7 @@
     <p>
         Your event <b>N{{ object.event.pk|stringformat:"05d" }}</b> has been successfully authorised
         for <b>&pound;{{ object.amount }}</b>
-        by <b>{{ object.name }}</b> as of <b>{{ object.last_edited_at }}</b>.
+        by <b>{{ object.name }}</b> as of <b>{{ object.event.last_edited_at }}</b>.
     </p>
 
     <p>
diff --git a/RIGS/templates/RIGS/eventauthorisation_client_success.txt b/RIGS/templates/RIGS/eventauthorisation_client_success.txt
index 2914b0457..c511fc72c 100644
--- a/RIGS/templates/RIGS/eventauthorisation_client_success.txt
+++ b/RIGS/templates/RIGS/eventauthorisation_client_success.txt
@@ -1,4 +1,4 @@
-Hi {{ to_name|default:"there" }},
+Hi {{ to_name|default_if_none:"there" }},
 
 Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.