diff --git a/application/controllers/Coupons.php b/application/controllers/Coupons.php
index 993e5d0..10aa7fc 100644
--- a/application/controllers/Coupons.php
+++ b/application/controllers/Coupons.php
@@ -4,12 +4,18 @@
class Coupons extends Bko_Controller {
public function index() {
+
$data = array();
+ $this->load->library('table');
+ $this->table->set_template($this->template);
$this->load->model('coupons_model');
$data['coupons_result'] = $this->coupons_model->loadCoupons([]);
-
- $data["coupons_summary_table"] = '';
+ $data['coupons_summary_table'] = $this->table->generate($data['coupons_result']);
$data["dummy"] = '';
+//loadActiveCoupons
+ $data['active_coupons_result'] = $this->coupons_model->loadActiveCoupons([]);
+ $data['coupons_recent_alloc'] = $this->table->generate($data['active_coupons_result']);
+
$this-> secureBkoPage('coupons/index',$data);
}
diff --git a/application/models/Coupons_model.php b/application/models/Coupons_model.php
index 27dcd56..b56b344 100644
--- a/application/models/Coupons_model.php
+++ b/application/models/Coupons_model.php
@@ -7,8 +7,14 @@ class Coupons_model extends CI_Model {
}
public function loadCoupons($filters=[]) {
- $sql = "SELECT id , code,amount, description,created , active , updated from coupons ORDER BY id DESC";
+ $sql = "SELECT id , code,amount *.01 AS amount, description,created::date , active::date , updated::date from coupons ORDER BY id DESC";
$q = $this->db->query($sql);
- return $q->result();
+ return $q;
+ }
+
+ public function loadActiveCoupons($fliters=[]){
+ $sql="SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.username,m.firstname,m.lastname,ca.added FROM coupons_allocation ca LEFT JOIN members m ON m.id=ca.member_id ORDER BY ca.id DESC";
+ $q = $this->db->query($sql);
+ return $q;
}
}
diff --git a/application/views/bko/coupons/index.php b/application/views/bko/coupons/index.php
index 7ad5e7e..25ea974 100644
--- a/application/views/bko/coupons/index.php
+++ b/application/views/bko/coupons/index.php
@@ -43,13 +43,11 @@
-
-
-
-
-
-