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

Timestamp:

Mar 2, 2015 1:07:19 PM (10 years ago)

Author:

namnd

Message:

 

Location:

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

Files:

• controllers/user.php (modified) (1 diff)
• models/user_model.php (modified) (1 diff)
• views/user_infor.php (modified) (1 diff)
• views/user_profile.php (modified) (1 diff)

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

@@ -451 +451 @@
                 if ($user_info || $admin_info) 
                 {
+                        $data['us_id'] = $us_id;
                         $data['username'] = $username;
                         $data['perpage'] = 10;

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

@@ -567 +567 @@
                 $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']."";
+                //$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']."";
+                                $sql="SELECT tblregisterpackagelog.source,0 as amount,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,'Nạp tiền' as name,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",

pro-violet-viettel/sourcecode/application/modules/frontend/views/user_infor.php

@@ -36 +36 @@
             <div class="col-sm-8">
                 <select name="province" id="form-field-province" class="col-xs-12 col-sm-10">
-                    <?php foreach ($provinces as $pro): ?>
-                        <option value="<?php echo $pro; ?>" <?php if ($user['province'] == $pro) echo "selected"; ?>><?php echo $pro; ?></option>
+                    <?php foreach ($provinces as $key => $pro): ?>
+                        <option value="<?php echo $key; ?>" <?php if ($user['province'] == $key) echo "selected"; ?>><?php echo $pro; ?></option>
                     <?php endforeach; ?>
                 </select>

pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php

@@ -489 +489 @@
                                                                         Từ
                                 </th>
-                                <th class="center"> Gói dịch vụ </th>
+                                                                <th class="center">
+                                                                        Số tiền (VNĐ)
+                                </th>
+                                <th class="center"> Dịch vụ </th>
                                 <th>
                                     <i class="icon-time bigger-110 hidden-480"></i>