diff --git a/www/application/controllers/Coupons.php b/www/application/controllers/Coupons.php index b898a458..5bd7f2fa 100644 --- a/www/application/controllers/Coupons.php +++ b/www/application/controllers/Coupons.php @@ -17,7 +17,13 @@ class Coupons extends Users_Controller { $this->load->model('coupon_model'); $activeCouponResult = $this->coupon_model->loadMemberActiveCoupons($_SESSION['member_id'] ,$fliters=[]); $_SESSION['coupon'] = $activeCouponResult->num_rows(); - $data['coupon_table_row'] = $activeCouponResult->result(); + $data['coupon_table_row'] = $activeCouponResult->result(); + + $redeemCouponResult = $this->coupon_model->loadMemberRedeemCoupons($_SESSION['member_id'] ,$fliters=[]); + $data['coupon_redeem_row'] = $redeemCouponResult->result(); + + + $data['page_title'] ="Coupons"; $this->renderSecurePage('users/view_coupon', $data); } diff --git a/www/application/models/Coupon_model.php b/www/application/models/Coupon_model.php index 5825b989..6c496ff6 100644 --- a/www/application/models/Coupon_model.php +++ b/www/application/models/Coupon_model.php @@ -9,8 +9,16 @@ function __construct() { public function loadMemberActiveCoupons($member_id,$fliters=[]){ $sql="SELECT id, ca.code, ca.amount, ca.added::date,ca.status - FROM coupons_allocation ca WHERE ca.member_id = $member_id ORDER BY ca.id DESC"; + FROM coupons_allocation ca WHERE ca.member_id = $member_id AND ca.active IS NULL ORDER BY ca.id DESC"; $q = $this->db->query($sql); return $q; } + + public function loadMemberRedeemCoupons($member_id,$fliters=[]){ + $sql="SELECT id, ca.code, ca.amount, ca.added::date,ca.status ,ca.active + FROM coupons_allocation ca WHERE ca.member_id = $member_id AND ca.active IS NOT NULL ORDER BY ca.id DESC"; + $q = $this->db->query($sql); + return $q; + } + } \ No newline at end of file diff --git a/www/application/views/users/view_coupon.php b/www/application/views/users/view_coupon.php index b64c9a80..524992df 100644 --- a/www/application/views/users/view_coupon.php +++ b/www/application/views/users/view_coupon.php @@ -108,7 +108,50 @@
| Added | +Coupon | +Amount | +Status | ++ |
|---|---|---|---|---|
|
+
+
+ = $row->added ?>
+
+
+ |
+ + = $row->code ?> + Free credit + | += $row->amount*0.01 ?> Naira | ++ = $row->status ?> + | ++ = $row->active ?> + | +