Changeset 644 for pro-violet-viettel/sourcecode/application/modules
- Timestamp:
- Dec 4, 2014 3:10:46 PM (10 years ago)
- Location:
- pro-violet-viettel/sourcecode/application/modules
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
r590 r644 119 119 </td> 120 120 <td class=" "> 121 <a><?php echo @$user['username']; ?></a> 121 <a onclick="getUserHistory(<?php echo $user['us_id']; ?>, 1);" data-toggle="modal"><?php echo @$user['username']; ?></a> 122 <!--<a href="#user-history" data-toggle="modal"><?php echo @$user['username']; ?></a>--> 122 123 </td> 123 124 <td class=" "> … … 161 162 </div><!-- /.col --> 162 163 </div> 164 165 <!-- Modal User History --> 166 <div class="modal fade" id="user-history" tabindex="-1" role="dialog"aria-hidden="true"> 167 <div class="modal-dialog"> 168 <div class="modal-content"> 169 <div class="modal-header"> 170 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> 171 <h4 class="modal-title">Lá»ch sá»</h4> 172 </div> 173 <div class="modal-body"> 174 <ul class="nav nav-tabs padding-16"> 175 <li class="active" > 176 <a id="regis-tab" href="#regis" data-toggle="tab"> 177 ÄÄng kÜ dá»ch vụ 178 </a> 179 </li> 180 <li> 181 <a id="trade-tab" href="#trade" data-toggle="tab"> 182 Giao dá»ch 183 </a> 184 </li> 185 </ul> 186 <div class="tab-content history-tab-content"> 187 <div class="tab-pane in active" id="regis"> 188 <div class="table-responsive"> 189 <table id="sample-table-1" class="table table-striped table-bordered table-hover"> 190 <thead> 191 <tr> 192 <th class="center"> 193 Từ 194 </th> 195 <th class="center"> Gói dá»ch vụ </th> 196 <th> 197 <i class="icon-time bigger-110 hidden-480"></i> 198 Thá»i gian 199 </th> 200 </tr> 201 </thead> 202 <tbody id="content-regis-histoty"> 203 </tbody> 204 </table> 205 <div> 206 <div class="dataTables_paginate paging_bootstrap"> 207 <ul class="pagination" id="regis-pagination"> 208 </ul> 209 </div> 210 </div> 211 </div><!-- /.table-responsive --> 212 </div> 213 <div class="tab-pane" id="trade"> 214 <div class="table-responsive"> 215 <table id="sample-table-1" class="table table-striped table-bordered table-hover"> 216 <thead> 217 <tr> 218 <th class="center"> 219 Từ 220 </th> 221 <th class="center">Sá» tiá»n (VNÄ)</th> 222 <th> 223 <i class="icon-time bigger-110 hidden-480"></i> 224 Thá»i gian 225 </th> 226 </tr> 227 </thead> 228 <tbody id="content-trade-histoty"> 229 </tbody> 230 </table> 231 <div> 232 <div class="dataTables_paginate paging_bootstrap"> 233 <ul class="pagination" id="trade-pagination"> 234 </ul> 235 </div> 236 </div> 237 </div><!-- /.table-responsive --> 238 </div> 239 </div> 240 </div><!-- Modal Body --> 241 </div> <!-- Modal Content --> 242 </div> 243 </div> 244 163 245 <script type="text/javascript"> 164 246 window.onload = function () -
pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php
r643 r644 387 387 $packagelogs = array(); 388 388 foreach ($result as $packagelog): 389 $packagelog['vip_name'] = 'VIP '.$packagelog['p_code'];390 389 $packagelog['created_time'] = date('d/m/Y H:i:s', strtotime($packagelog['created_time'])); 391 390 array_push($packagelogs, $packagelog); -
pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php
r642 r644 534 534 $username = $data['username']; 535 535 $this->db->query ( 'UNLOCK TABLES' ); 536 $sql = "SELECT * FROM tblregisterpackagelog where username = ? ORDER BY created_time DESC LIMIT ".$data['start'].", ".$data['perpage']." ";536 $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']." "; 537 537 $query = $this->db->query ( $sql, array ( 538 538 $username
Note: See TracChangeset
for help on using the changeset viewer.