Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 767)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 769)
@@ -68,11 +68,21 @@
                                         <input type="text" name="keyword" id="keyword" value='<?php echo $keyword; ?>' style="width: 162px; height: 18px;" aria-controls="sample-table-2"></label>
                                 </div>
-                                <div class="dataTables_status" style="float: right;" id="sample-table-2_status"><label>Lá»c:
-                                        <select onchange="filter();" name="status" size="1" style="width: 176px; height: 28px;">                                      
-                                            <?php foreach ($statusoptions as $key => $option): ?>
-                                                <option <?php if ($key == $status) echo "selected"; ?> value="<?php echo $key; ?>"><?php echo $option; ?></option>
-                                            <?php endforeach; ?>
-                                        </select>
-                                </div>
+                                <div class="dataTables_status" style="float: right;" id="sample-table-2_status"><label>Lá»c theo tÃ¬nh tráº¡ng:
+									<select onchange="filter();" name="status" size="1" style="width: 176px; height: 28px;">                                      
+										<?php foreach ($statusoptions as $key => $option): ?>
+											<option <?php if ($key == $status) echo "selected"; ?> value="<?php echo $key; ?>"><?php echo $option; ?></option>
+										<?php endforeach; ?>
+									</select>
+                                </div>
+								<div style="clear: both;"></div>
+								<div class="dataTables_status" style="float: right;" id="sample-table-2_status"><label>Lá»c theo Tá»nh/TP:
+									<select onchange="filter();" name="province-code" size="1" style="width: 176px; height: 28px;">
+										<option value=''></option>
+										<?php foreach ($provinces as $key => $pro): ?>
+											<option <?php if ($key == $province_code) echo "selected"; ?> value="<?php echo $key; ?>"><?php echo $pro; ?></option>
+										<?php endforeach; ?>
+									</select>
+                                </div>
+								
                                 <div style="clear: both;"></div>
                                 <div id="daterangepicker" class="selectbox pull-right">
@@ -114,5 +124,5 @@
                                 }
                                 ?>" id="cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="Sá» Äiá»n thoáº¡i: activate to sort column ascending">Há» tÃªn</th>
-								<th class="sorting_disabled" id="status" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;">TÃ¬nh tráº¡ng</th>
+								
                                 <th class="<?php
                                 if ($sorting_field == 'acc_balanced') {
@@ -143,5 +153,5 @@
                                 </th>
                                 <th style="width: 140px;">Tá»nh/TP</th>
-                                
+                                <th class="sorting_disabled" id="status" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;">TÃ¬nh tráº¡ng</th>
                             </tr>
                         </thead>
@@ -166,9 +176,13 @@
                                         <?php echo $user['fullname']; ?>
                                     </td>
+                                    <td class="hidden-480 "><?php echo number_format($user['acc_balanced'], 0); ?></td>
+									<td class=" "><?php echo $user['created_time']; ?></td>
+                                    <td class=" "><?php echo isset($user['expire_date']) && strtotime($user['expire_date']) > 0 ? date('d/m/Y', strtotime($user['expire_date'])) : ''; ?></td>
+                                    <td><?php echo $user['province']; ?></td>
 									<td class=" ">
 									<?php if (strtotime($user['expire_date']) > time() && $user['p_id'] != 5 ): ?>
-										<span class="label label-sm label-success">ÄÃ£ ÄÄng kÃœ</span>
+										<span class="label label-sm label-success">ÄÃ£ ÄÄng kÃœ VIP</span>
 									<?php elseif(strtotime($user['expire_date']) > time() && $user['p_id'] == 5): ?>
-										<span class="label label-sm label-info">DÃ¹ng thá»­</span>
+										<span class="label label-sm label-info">DÃ¹ng thá»­ 7 ngÃ y</span>
 									<?php elseif(strtotime($user['expire_date']) < time() && $user['p_id'] == 5): ?>
 										<span class="label label-sm label-warning">DÃ¹ng thá»­ háº¡n cháº¿</span>
@@ -177,9 +191,4 @@
 									<?php endif; ?>
                                     </td>
-                                    <td class="hidden-480 "><?php echo number_format($user['acc_balanced'], 0); ?></td>
-									<td class=" "><?php echo $user['created_time']; ?></td>
-                                    <td class=" "><?php echo isset($user['expire_date']) && strtotime($user['expire_date']) > 0 ? date('d/m/Y', strtotime($user['expire_date'])) : ''; ?></td>
-                                    <td><?php echo $user['province']; ?></td>
-
                                 </tr>
 							<?php endforeach; ?>
