From 270ece840db52c1b0b669e7385b79d7ca37a002e Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Tue, 11 Dec 2018 02:09:59 -0700
Subject: [PATCH] Add membership expiration dates and payment status

---
 database.mwb                        | Bin 10844 -> 11181 bytes
 langs/en/labels.json                |  11 ++++++++++-
 lib/Family.lib.php                  |  29 +++++++++++++++++++++++++---
 pages/families.php                  |   5 ++++-
 pages/payments.php                  |  19 ++++++++++--------
 public/actions/submitmembership.php |   9 ++++++++-
 public/parts/verify.php             |   4 +++-
 7 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/database.mwb b/database.mwb
index 0d55c980a783fbb2609ec5fdb4adad1b8c910eaf..af3129df75ff1358f307c7f6011797ad28ab68dc 100644
GIT binary patch
literal 11181
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

literal 10844
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

diff --git a/langs/en/labels.json b/langs/en/labels.json
index b137f74..429fd9a 100644
--- a/langs/en/labels.json
+++ b/langs/en/labels.json
@@ -34,5 +34,14 @@
     "DOCX": "DOCX",
     "Amount": "Amount",
     "Date": "Date",
-    "Paid": "Paid"
+    "Status": "Status",
+    "Paid": "Paid",
+    "Unpaid": "Unpaid",
+    "Type": "Type",
+    "Online": "Online",
+    "Cash": "Cash",
+    "Check": "Check",
+    "Other": "Other",
+    "Free": "Free",
+    "Expires": "Expires"
 }
diff --git a/lib/Family.lib.php b/lib/Family.lib.php
index 384de00..96aa626 100644
--- a/lib/Family.lib.php
+++ b/lib/Family.lib.php
@@ -21,6 +21,7 @@ class Family {
     private $photo = false;
     private $newsletter = 1;
     private $children = [];
+    private $expires = 0;
 
     public function __construct() {
 
@@ -53,7 +54,8 @@ class Family {
             'zip',
             'father_name (father)',
             'mother_name (mother)',
-            'photo_permission (photo)'
+            'photo_permission (photo)',
+            'expires'
                 ], [
             "familyid" => $this->id
         ]);
@@ -71,6 +73,7 @@ class Family {
         $this->zip = $f['zip'];
         $this->photo = $f['photo'] == 1;
         $this->newsletter = $f['newsletter'];
+        $this->expires = $f['expires'];
 
         foreach ($children as $c) {
             $this->children[] = (new Child())->load($c);
@@ -93,7 +96,8 @@ class Family {
                 "state" => $this->getState(),
                 "zip" => $this->getZip(),
                 "photo_permission" => $this->getPhotoPermission(),
-                "newsletter_method" => $this->getNewsletter()
+                "newsletter_method" => $this->getNewsletter(),
+                "expires" => date("Y-m-d", $this->getExpires())
             ], [
                 "familyid" => $this->id
             ]);
@@ -109,7 +113,8 @@ class Family {
                 "state" => $this->getState(),
                 "zip" => $this->getZip(),
                 "photo_permission" => $this->getPhotoPermission(),
-                "newsletter_method" => $this->getNewsletter()
+                "newsletter_method" => $this->getNewsletter(),
+                "expires" => date("Y-m-d", $this->getExpires())
             ]);
             $this->id = $database->id();
         }
@@ -172,6 +177,10 @@ class Family {
         return $this->children;
     }
 
+    public function getExpires(): int {
+        return $this->expires;
+    }
+
 
 
     public function setName(string $name) {
@@ -252,4 +261,18 @@ class Family {
         $this->children[] = $child;
     }
 
+    /**
+     * Set the membership expiration date to either a UNIX timestamp or a date
+     * string.
+     * @param int $timestamp
+     * @param string $date A string parseable by strtotime().
+     */
+    public function setExpires(int $timestamp = null, string $date = null) {
+        if (is_null($timestamp) && !is_null($date)) {
+            $this->expires = strtotime($date);
+        } else if (!is_null($timestamp) && is_null($date)) {
+            $this->expires = $timestamp;
+        }
+    }
+
 }
diff --git a/pages/families.php b/pages/families.php
index 5367ce0..4ddb6ea 100644
--- a/pages/families.php
+++ b/pages/families.php
@@ -14,7 +14,7 @@ if (!$user->hasPermission("HACHEPORTAL_VIEW")) {
 
 $writeaccess = $user->hasPermission("HACHEPORTAL_EDIT");
 
-$families = $database->select("families", ['familyid (id)', 'familyname', 'phone', 'email', 'father_name (father)', 'mother_name (mother)']);
+$families = $database->select("families", ['familyid (id)', 'familyname', 'phone', 'email', 'father_name (father)', 'mother_name (mother)', 'expires']);
 ?>
 
 <div class="btn-group">
@@ -32,6 +32,7 @@ $families = $database->select("families", ['familyid (id)', 'familyname', 'phone
             <th data-priority="3"><i class="fas fa-female hidden-sm"></i> <?php $Strings->get('Mother'); ?></th>
             <th data-priority="2"><i class="fas fa-phone hidden-sm"></i> <?php $Strings->get('Phone'); ?></th>
             <th data-priority="4"><i class="fas fa-at hidden-sm"></i> <?php $Strings->get('Email'); ?></th>
+            <th data-priority="5"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Expires'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -55,6 +56,7 @@ $families = $database->select("families", ['familyid (id)', 'familyname', 'phone
                 <td><?php echo $f['mother']; ?></td>
                 <td><?php echo $f['phone']; ?></td>
                 <td><?php echo $f['email']; ?></td>
+                <td class="<?php echo strtotime($f['expires']) < time() ? "text-red" : ""; ?>"><?php echo $f['expires']; ?></td>
             </tr>
             <?php
         }
@@ -69,6 +71,7 @@ $families = $database->select("families", ['familyid (id)', 'familyname', 'phone
             <th data-priority="3"><i class="fas fa-female hidden-sm"></i> <?php $Strings->get('Mother'); ?></th>
             <th data-priority="2"><i class="fas fa-phone hidden-sm"></i> <?php $Strings->get('Phone'); ?></th>
             <th data-priority="4"><i class="fas fa-at hidden-sm"></i> <?php $Strings->get('Email'); ?></th>
+            <th data-priority="5"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Expires'); ?></th>
         </tr>
     </tfoot>
 </table>
\ No newline at end of file
diff --git a/pages/payments.php b/pages/payments.php
index 7148f98..e517f61 100644
--- a/pages/payments.php
+++ b/pages/payments.php
@@ -14,7 +14,7 @@ if (!$user->hasPermission("HACHEPORTAL_VIEW")) {
 
 $writeaccess = $user->hasPermission("HACHEPORTAL_EDIT");
 
-$payments = $database->select("payments", ['paymentid (id)', 'familyid', 'amount', 'paid', 'date']);
+$payments = $database->select("payments", ['paymentid (id)', 'familyid', 'amount', 'paid', 'date', 'type']);
 ?>
 
 <div class="btn-group">
@@ -26,11 +26,12 @@ $payments = $database->select("payments", ['paymentid (id)', 'familyid', 'amount
     <thead>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('Actions'); ?></th>
+            <!--<th data-priority="1"><?php $Strings->get('Actions'); ?></th>-->
             <th data-priority="1"><i class="fas fa-users hidden-sm"></i> <?php $Strings->get('Family'); ?></th>
             <th data-priority="1"><i class="fas fa-dollar-sign hidden-sm"></i> <?php $Strings->get('Amount'); ?></th>
             <th data-priority="2"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Date'); ?></th>
-            <th data-priority="2"><i class="far fa-check-square hidden-sm"></i> <?php $Strings->get('Paid'); ?></th>
+            <th data-priority="2"><i class="far fa-check-square hidden-sm"></i> <?php $Strings->get('Status'); ?></th>
+            <th data-priority="3"><i class="fas fa-bars hidden-sm"></i> <?php $Strings->get('Type'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -39,7 +40,7 @@ $payments = $database->select("payments", ['paymentid (id)', 'familyid', 'amount
             ?>
             <tr>
                 <td></td>
-                <td>
+<!--                <td>
                     <?php
                     if ($writeaccess) {
                         ?>
@@ -47,11 +48,12 @@ $payments = $database->select("payments", ['paymentid (id)', 'familyid', 'amount
                         <?php
                     }
                     ?>
-                </td>
+                </td>-->
                 <td><a href="./app.php?page=viewfamily&id=<?php echo $p['familyid']; ?>"><?php echo (new Family())->load($p['familyid'])->getName(); ?></a></td>
                 <td>$<?php echo number_format($p['amount'], 2); ?></td>
                 <td><?php echo date("Y-m-d H:i:s", strtotime($p['date'])); ?></td>
-                <td><?php $p['paid'] ? $Strings->get("Yes") : $Strings->get("No"); ?></td>
+                <td><?php $p['paid'] ? $Strings->get("Paid") : $Strings->get("Unpaid"); ?></td>
+                <td><?php $Strings->get($p["type"]); ?></td>
             </tr>
             <?php
         }
@@ -60,11 +62,12 @@ $payments = $database->select("payments", ['paymentid (id)', 'familyid', 'amount
     <tfoot>
         <tr>
             <th data-priority="0"></th>
-            <th data-priority="1"><?php $Strings->get('Actions'); ?></th>
+            <!--<th data-priority="1"><?php $Strings->get('Actions'); ?></th>-->
             <th data-priority="1"><i class="fas fa-users hidden-sm"></i> <?php $Strings->get('Family'); ?></th>
             <th data-priority="1"><i class="fas fa-dollar-sign hidden-sm"></i> <?php $Strings->get('Amount'); ?></th>
             <th data-priority="2"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Date'); ?></th>
-            <th data-priority="2"><i class="far fa-check-square hidden-sm"></i> <?php $Strings->get('Paid'); ?></th>
+            <th data-priority="2"><i class="far fa-check-square hidden-sm"></i> <?php $Strings->get('Status'); ?></th>
+            <th data-priority="3"><i class="fas fa-bars hidden-sm"></i> <?php $Strings->get('Type'); ?></th>
         </tr>
     </tfoot>
 </table>
\ No newline at end of file
diff --git a/public/actions/submitmembership.php b/public/actions/submitmembership.php
index c1ff37f..7b225fc 100644
--- a/public/actions/submitmembership.php
+++ b/public/actions/submitmembership.php
@@ -112,6 +112,12 @@ $database->action(function($database) {
         }
         $family->setPhotoPermission($photopermission);
 
+        if ($renewal) {
+            $family->setExpires(strtotime("+1 year", $family->getExpires()));
+        } else {
+            $family->setExpires(strtotime("+1 year"));
+        }
+
         $family->save();
 
         //
@@ -215,7 +221,8 @@ $database->action(function($database) {
         "familyid" => $family->getID(),
         "amount" => ($membership_cost / 100.0),
         "paid" => 1,
-        "date" => date("Y-m-d H:i:s")
+        "date" => date("Y-m-d H:i:s"),
+        "type" => "Online"
     ]);
 
     try {
diff --git a/public/parts/verify.php b/public/parts/verify.php
index 64744f0..2d294b6 100644
--- a/public/parts/verify.php
+++ b/public/parts/verify.php
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+require_once __DIR__ . "/../../lib/Email.lib.php";
+
 $badcode = false;
 if (!empty($_POST['email'])) {
     if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
@@ -29,7 +31,7 @@ if (!empty($_POST['email'])) {
         $verification->setBody("The verification code for renewing your HACHE membership is $code.");
         $verification->send();
     } catch (Exception $e) {
-        
+
     }
 } else if (!empty($_POST['code'])) {
     if (empty($_SESSION['code'])) {