Changeset 727

Timestamp:

Jan 30, 2015 6:49:11 PM (10 years ago)

Author:

quyenla

Message:

nguoi dung

File:

• pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php (modified) (2 diffs)

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

@@ -172 +172 @@
                 return $data;
         }
+        public function update_local_user($input,$us_id)
+        {
+            $this->db->where('us_id', $us_id);
+            $this->db->update('tbluser', $input);
+        }
         
         public function changeProfile($sentNumber, $username, $password, &$status = '') {
@@ -557 +562 @@
         {
                 $username = $data['username'];
-                $this->db->query ( 'UNLOCK TABLES' );
-                $sql = "SELECT * FROM tblregisterpackagelog INNER JOIN tblservicepackage ON tblservicepackage.p_code = tblregisterpackagelog.p_code where username = ? ORDER BY created_time DESC LIMIT ".$data['start'].", ".$data['perpage']." ";
-                $query = $this->db->query ( $sql, array (
-                                $username
+                $us_id = $data['us_id'];
+                $this->db->query ( 'UNLOCK TABLES' );
+                $sql="SELECT tblregisterpackagelog.source,tblservicepackage.p_name,tblregisterpackagelog.created_time FROM tblregisterpackagelog INNER JOIN tblservicepackage ON tblservicepackage.p_code = tblregisterpackagelog.p_code where username = ? UNION SELECT tblpaidlog.source,tblpaidlog.amount,tblpaidlog.paid_time FROM tblpaidlog where us_id = ? ORDER BY created_time DESC LIMIT ".$data['start'].", ".$data['perpage']."";
+                $query = $this->db->query ( $sql, array (
+                                "$username",
+                                $us_id
                 ) );
                 $row = $query->result_array();