Changeset 773

Timestamp:

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

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode

Files:

• application/modules/admin/views/user/index.php (modified) (1 diff)
• application/modules/admin/views/user/listview.php (modified) (2 diffs)
• application/modules/frontend/controllers/user.php (modified) (1 diff)
• application/modules/frontend/models/user_model.php (modified) (1 diff)
• application/modules/frontend/views/user_infor.php (modified) (1 diff)
• application/modules/frontend/views/user_profile.php (modified) (1 diff)
• assets/js/admin/user.js (modified) (2 diffs)
• assets/js/frontend/user.js (modified) (1 diff)

pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php

@@ -80 +80 @@
         function filter()
         {
-                daterange = $('input[name="daterange"]').val();
+                var daterange = $('input[name="daterange"]').val();
                 $.ajax({
                         url: '<?php echo base_url();?>admin/nguoi_dung/trang/1',

pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php

@@ -249 +249 @@
                                             Từ
                                         </th>
+                                                                                <th class="center"> Số tiền (VNĐ) </th>
                                         <th class="center"> Gói dịch vụ </th>
                                         <th>
@@ -281 +282 @@
     </div>
 </div>
+</div>
 
 <script type="text/javascript">

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>

pro-violet-viettel/sourcecode/assets/js/admin/user.js

@@ -21 +21 @@
                                 for (var i in result)
                                 {
-                                        content += '<tr><td class="center">'+result[i].source+'</td><td class="center">'+result[i].p_name+'</td><td>'+result[i].created_time+'</td></tr>';
+                                        content += '<tr><td class="center">'+result[i].source+'</td><td class="center">'+result[i].amount+'</td><td class="center">'+result[i].p_name+'</td><td>'+result[i].created_time+'</td></tr>';
                                         
                                 }
                         }else
                         {
-                                content += '<tr><td class="center" colspan=3>Chưa đăng kí gói dịch vụ nà o!</td></tr>';
+                                content += '<tr><td class="center" colspan=4>Chưa đăng kí gói dịch vụ nà o!</td></tr>';
                         }
                         $("#user-history").find("#content-regis-histoty").html(content);
@@ -91 +91 @@
                         {
                             $('#user-history').modal('hide');
-                            alert("đã cập nhật");
+                            //alert("đã cập nhật");
                             location.reload();
                         }

pro-violet-viettel/sourcecode/assets/js/frontend/user.js

@@ -232 +232 @@
                                         source = result[i].source;
                                         if (result[i].source == null || result[i].source == '') source = 'Thẻ cà o';
-                                        content += '<tr><td class="center">'+source+'</td><td class="center">'+result[i].p_name+'</td><td>'+result[i].created_time+'</td></tr>';
+                                        content += '<tr><td class="center">'+source+'</td><td class="center">'+result[i].amount+'</td><td class="center">'+result[i].p_name+'</td><td>'+result[i].created_time+'</td></tr>';
                                         
                                 }