From 157318e495bcf666d3d47975c542a71ef04acff3 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 25 Aug 2015 10:58:21 -0400
Subject: [PATCH] Separate the dates into columns in list view

---
 controllers/front.php      |  5 ++---
 models/coupon.php          | 25 +++++++++++++++++--------
 views/front/couponList.php |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/controllers/front.php b/controllers/front.php
index a82f823..66ac6ed 100644
--- a/controllers/front.php
+++ b/controllers/front.php
@@ -81,10 +81,9 @@ class glm_coupon_front
                 );
             }
         }
-        $coupons = get_posts($args);
+        $coupons      = get_posts($args);
         $totalCoupons = count($coupons);
-        $current_url = esc_url(add_query_arg($wp->query_string, '', home_url($wp->request)));
-        $iterator = 1;
+        $iterator     = 1;
         foreach ($coupons as $coupon) {
             $custom = get_post_custom($coupon->ID);
             $coupon->end                   = false;
diff --git a/models/coupon.php b/models/coupon.php
index db720f0..b247167 100644
--- a/models/coupon.php
+++ b/models/coupon.php
@@ -110,7 +110,9 @@ class glm_coupons_coupon
      */
     public function sortingColumns($columns)
     {
-        $columns['glmcoupons_col_date'] = 'glmcoupons_col_date';
+        $columns['glmcoupons_col_sdate'] = 'glmcoupons_col_sdate';
+        $columns['glmcoupons_col_edate'] = 'glmcoupons_col_edate';
+        $columns['glmcoupons_col_xdate'] = 'glmcoupons_col_xdate';
         $columns['glmcoupons_col_cat']  = 'glmcoupons_col_cat';
         return $columns;
     }
@@ -411,7 +413,9 @@ class glm_coupons_coupon
             "cb"               => "<input type=\"checkbox\" />",
             "title"            => "Coupon Title",
             "glmcoupons_col_cat"  => "Category",
-            "glmcoupons_col_date" => "Dates",
+            "glmcoupons_col_sdate" => "Starts",
+            "glmcoupons_col_edate" => "Ends",
+            "glmcoupons_col_xdate" => "Expires",
         );
         return $columns;
     }
@@ -443,15 +447,20 @@ class glm_coupons_coupon
                     ;
                 }
                 break;
-            case "glmcoupons_col_date":
-                // - show dates -
+            case "glmcoupons_col_sdate":
                 $startd    = $custom['glm_coupons_startdate'][0];
+                $startdate = date("m/d/Y", $startd);
+                echo '<div>' . $startdate . '</div>';
+                break;
+            case "glmcoupons_col_edate":
                 $endd      = $custom['glm_coupons_enddate'][0];
+                $enddate   = date("m/d/Y", $endd);
+                echo '<div>' . $enddate . '</div>';
+                break;
+            case "glmcoupons_col_xdate":
                 $expd      = $custom['glm_coupons_expdate'][0];
-                $startdate = date("F j, Y", $startd);
-                $enddate   = date("F j, Y", $endd);
-                $expdate   = date("F j, Y", $expd);
-                echo '<div>Start - ' . $startdate . '</div><div>End - ' . $enddate . '</div><div>Expire - ' . $expdate . '</div>';
+                $expdate   = date("m/d/Y", $expd);
+                echo '<div>' . $expdate . '</div>';
                 break;
         }
     }
diff --git a/views/front/couponList.php b/views/front/couponList.php
index 68f74d7..47960b8 100644
--- a/views/front/couponList.php
+++ b/views/front/couponList.php
@@ -1,8 +1,8 @@
 <div>
     <h1>List Coupons</h1>
-    <div class="row">
+    <div class="coupon-row">
         <?php if ($coupons): foreach($coupons as $coupon) :?>
-        <div class="small-6 medium-4 columns<?php if ($coupon->end){ echo ' end';}?>">
+        <div class="<?php if ($coupon->end){ echo ' end';}?> coupon-item">
             <h2><?php echo $coupon->post_title;?></h2>
             <div><?php echo $coupon->post_content;?></div>
             <div><b>Expires:</b> <?php echo date('F d,Y', $coupon->glm_coupons_expdate);?></div>
-- 
2.17.1