Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 765)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 767)
@@ -106,5 +106,5 @@
                                     echo "sorting";
                                 }
-                                ?>" id="cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="TÃ i khoáº£n: activate to sort column ascending">Username</th>
+                                ?>" id="cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="TÃ i khoáº£n: activate to sort column ascending">Sá» Äiá»n thoáº¡i</th>
                                 <th class="<?php
                                 if ($sorting_field == 'cellphone') {
@@ -113,5 +113,6 @@
                                     echo "sorting";
                                 }
-                                ?>" 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">Sá» Äiá»n thoáº¡i</th>
+                                ?>" 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') {
@@ -121,6 +122,5 @@
                                 }
                                 ?>" id="acc_balanced" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 156px;" aria-label="Tiá»n: activate to sort column ascending">TÃ i khoáº£n (VNÄ)</th>
-                                <th style="width: 140px;">Tá»nh/TP</th>
-                                <th class="<?php
+								<th class="<?php
                                 if ($sorting_field == 'created_time') {
                                     echo $sorting_order;
@@ -142,5 +142,6 @@
                                     NgÃ y háº¿t háº¡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 style="width: 140px;">Tá»nh/TP</th>
+                                
                             </tr>
                         </thead>
@@ -148,7 +149,7 @@
                         <tbody role="alert" aria-live="polite" aria-relevant="all">
 
-<?php
-foreach ($users as $user) {
-?>
+							<?php
+							foreach ($users as $user):
+							?>
                                 <tr class="odd">
                                     <td class="center  sorting_1">
@@ -163,21 +164,24 @@
                                     </td>
                                     <td class=" ">
-                                        <?php echo $user['cellphone']; ?>
+                                        <?php echo $user['fullname']; ?>
+                                    </td>
+									<td class=" ">
+									<?php if (strtotime($user['expire_date']) > time() && $user['p_id'] != 5 ): ?>
+										<span class="label label-sm label-success">ÄÃ£ ÄÄng kÃœ</span>
+									<?php elseif(strtotime($user['expire_date']) > time() && $user['p_id'] == 5): ?>
+										<span class="label label-sm label-info">DÃ¹ng thá»­</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>
+									<?php else: ?>
+										<span class="label label-sm label-danger">Háº¿t háº¡n</span>
+									<?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>
-                                    <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 class=" ">
-    <?php if (strtotime($user['expire_date']) > time()) { ?>
-                                            <span class="label label-sm label-success">ÄÃ£ ÄÄng kÃœ</span>
-    <?php } else { ?>
-                                            <span class="label label-sm label-warning">DÃ¹ng thá»­</span>
-    <?php } ?>
-                                    </td>
 
                                 </tr>
-                                    <?php } ?>
+							<?php endforeach; ?>
 
                         </tbody></table>
