Changeset 698 for pro-violet-viettel/sourcecode/application/modules/frontend

Timestamp:

Jan 19, 2015 11:51:02 AM (10 years ago)

Author:

dungnv

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules/frontend

Files:

• controllers/user.php (modified) (2 diffs)
• models/user_model.php (modified) (1 diff)

pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php

@@ -341 +341 @@
                 $this->load->helper('pagging');
                 $us_id = $this->uri->segment(4);
-        $user_info = $this->session->userdata('userInfo');
-        if ($user_info) 
+
+        $user_info = $this->session->userdata('userInfo');
+                $admin_info = $this->session->userdata('adminInfo');
+
+        if ($user_info || $admin_info) 
                 {
-                        
                         $data['us_id'] = $us_id;
                         $data['perpage'] = 10;
@@ -376 +378 @@
                 $username = $user['cellphone'];
                 $user_info = $this->session->userdata('userInfo');
-                if ($user_info) 
+                $admin_info = $this->session->userdata('adminInfo');
+                if ($user_info || $admin_info) 
                 {
                         $data['username'] = $username;

pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php

@@ -496 +496 @@
                 $cardlog['created_time'] = $receiveTime;
                 $this->db->query ( 'UNLOCK TABLES' );
-                $sql = 'INSERT INTO tblcardlog(sender, us_id, pin_code, serial_num, card_value, created_time) VALUES(?,?,?,?,?,?)';
+                $sql = 'INSERT INTO tblcardlog(sender, us_id, status, pin_code, serial_num, card_value, created_time) VALUES(?,?,?,?,?,?,?)';
                 $query = $this->db->query ($sql, $cardlog);
         }