From 33791d0762a74e973510b5ab7038ebaed8d97bff Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Mon, 25 Sep 2023 18:30:43 -0400
Subject: [PATCH] redeem

---
 .../email/COUPON/member_coupon_allocated.mailfile     |  2 +-
 wrenchboard/src/shared_tool/email.cc                  | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/wrenchboard/email/COUPON/member_coupon_allocated.mailfile b/wrenchboard/email/COUPON/member_coupon_allocated.mailfile
index 5bd886e2..3ad52c66 100644
--- a/wrenchboard/email/COUPON/member_coupon_allocated.mailfile
+++ b/wrenchboard/email/COUPON/member_coupon_allocated.mailfile
@@ -89,7 +89,7 @@ Hello {{firstname}},
 <td class="bodycopy">
 You have recieved <b>{{coupon_amount}} {{currency}}</b> coupon
 <br>
-Log on to your account to reddem,
+Log on to your account to redeem,
 </td>
 </tr>
 </table>
diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 19f13f27..f3c3e51d 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -255,15 +255,11 @@ long coupon_email(long mailtype, CVars in, CVars &out) {
     form.LetStr("site_trade_name", "Connecting Opportunities");
 
  try {
+        CVars yr;
+        load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY");
+        vars2form(yr, form);
 
         switch (mailtype) {
-/*
-
-wrenchboard=> SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.email,m.firstname FROM coupons_allocation ca LEFT JOIN members m ON m.id=ca.member_id;
-    code     | amount |        email         | firstname
--------------+--------+----------------------+-----------
- 1M5XXXXXXXX |      0 | ses66181+1@gmail.com | Olusesan
-*/
             case WRENCHBOARD_COUPON_ACTIVATE:
                 REQ_LONG(in, "coupon_id", 1, -1);
                 if (load_db_record(x, "SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount*0.01 AS coupon_amount,m.email,m.firstname FROM coupons_allocation ca LEFT JOIN members m ON m.id=ca.member_id WHERE ca.id  = %lu ", in["coupon_id"].Long())) {
@@ -273,7 +269,6 @@ wrenchboard=> SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.ema
                     form.Email("COUPON/member_coupon_allocated.mailfile");
                 }
                 break;
-
         }
 
     } catch (bad_parameter) {