Index: pro-violet-viettel/sourcecode/application/modules/admin/views/report/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/report/index.php	(revision 838)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/report/index.php	(revision 883)
@@ -1,3 +1,3 @@
-﻿<?php
+<?php
 $base_url = base_url();
 $this->load->view('layout/admin/header', array('base_url' => $base_url));
@@ -157,9 +157,9 @@
         <li>
             <i class="icon-home home-icon"></i>
-            <a href="#">Trang chủ</a>
+            <a href="#">Trang chá»§</a>
         </li>
 
         <li>
-            <a href="#">Quản lý tin nhắn</a>
+            <a href="#">Quáº£n lÃœ tin nháº¯n</a>
         </li>
         
@@ -169,5 +169,5 @@
         <form class="form-search">
             <span class="input-icon">
-                <input type="text" autocomplete="off" id="nav-search-input" class="nav-search-input" placeholder="Tìm kiếm ...">
+                <input type="text" autocomplete="off" id="nav-search-input" class="nav-search-input" placeholder="TÃ¬m kiáº¿m ...">
                 <i class="icon-search nav-search-icon"></i>
             </span>
@@ -183,8 +183,8 @@
     <div class="page-header">
         <h1>
-            Tin nhắn
+            Tin nháº¯n
             <small>
                 <i class="icon-double-angle-right"></i>
-                Mẫu tin nhắn
+                Máº«u tin nháº¯n
             </small>
         </h1>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/report/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/report/listview.php	(revision 838)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/report/listview.php	(revision 883)
@@ -1,8 +1,8 @@
-﻿<div class="col-xs-12">
+<div class="col-xs-12">
 		<!-- PAGE CONTENT BEGINS -->
 		<div style="padding-bottom:4px" class="table-header">
 			Doanh thu
 			<div class="pull-right" style="margin:5px;">
-					<a style="color:#fff" href="<?php echo base_url();?>admin/report/export">Xuất ra Excel</a>
+					<a style="color:#fff" href="<?php echo base_url();?>admin/report/export">Xuáº¥t ra Excel</a>
                 </div>
 		</div>
@@ -13,10 +13,10 @@
 					<div class="row">
 						<div class="col-sm-6">
-							<div id="sample-table-2_length" class="dataTables_length"><label>Hiện thị 
+							<div id="sample-table-2_length" class="dataTables_length"><label>Hiá»n thá» 
 									<select onchange="filter();" name="items" size="1" aria-controls="sample-table-2">                                      
 										<?php foreach ($itemsoptions as $option) { ?>
 										<option <?php if($option == $perpage) echo "selected"; ?> value="<?php echo $option;?>"><?php echo $option;?></option>
 										<?php } ?>
-									</select> bản ghi</label>
+									</select> báº£n ghi</label>
 
 							</div>
@@ -25,8 +25,8 @@
 						<div class="col-sm-6">
 							<!--<div class="dataTables_filter" id="sample-table-2_filter">
-								<label>Tìm kiếm: 
+								<label>TÃ¬m kiáº¿m: 
 									<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_filter" id="sample-table-2_filter"><label>Lọc theo:
+							<div class="dataTables_filter" id="sample-table-2_filter"><label>Lá»c theo:
 								<select onchange="filter();" name="paid_type" size="1" style="width: 176px; height: 28px;">                                      
 									<?php foreach ($paid_types as $key => $type): ?>
@@ -51,9 +51,9 @@
 						<tr role="row">
 							
-							<th class="<?php if ($sorting_field == 'fullname') {echo $sorting_order;} else {echo "";}?>" id="full_name" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Số điện thoại: activate to sort column ascending">Số điện thoại</th>
-							<th class="<?php if ($sorting_field == 'cellphone') {echo $sorting_order;} else {echo "sorting";}?>" id="cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 283px;" aria-label="Họ tên: activate to sort column ascending">Họ tên</th>
-							<th class="<?php if ($sorting_field == 'amount') {echo $sorting_order;} else {echo "sorting";}?>" id="amount" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Số điện thoại: activate to sort column ascending">Số tiền</th> 
-							<th class="<?php if ($sorting_field == 'paid_type') {echo $sorting_order;} else {echo "sorting";}?>" id="paid_type" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Số điện thoại: activate to sort column ascending">SMS/Card</th> 
-							<th class="<?php if ($sorting_field == 'paid_time') {echo $sorting_order;} else {echo "sorting";}?>" id="paid_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 209px;" aria-label="Ngày đăng ký: activate to sort column ascending">Ngày</th>
+							<th class="<?php if ($sorting_field == 'fullname') {echo $sorting_order;} else {echo "";}?>" id="full_name" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoáº¡i: activate to sort column ascending">Sá» Äiá»n thoáº¡i</th>
+							<th class="<?php if ($sorting_field == 'cellphone') {echo $sorting_order;} else {echo "sorting";}?>" id="cellphone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 283px;" aria-label="Há» tÃªn: activate to sort column ascending">Há» tÃªn</th>
+							<th class="<?php if ($sorting_field == 'amount') {echo $sorting_order;} else {echo "sorting";}?>" id="amount" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoáº¡i: activate to sort column ascending">Sá» tiá»n</th> 
+							<th class="<?php if ($sorting_field == 'paid_type') {echo $sorting_order;} else {echo "sorting";}?>" id="paid_type" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoáº¡i: activate to sort column ascending">SMS/Card</th> 
+							<th class="<?php if ($sorting_field == 'paid_time') {echo $sorting_order;} else {echo "sorting";}?>" id="paid_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 209px;" aria-label="NgÃ y ÄÄng kÃœ: activate to sort column ascending">NgÃ y</th>
 							  
 					</thead>
@@ -90,5 +90,5 @@
 						<tr>
 						<td colspan=2>
-						Tổng tiền
+						Tá»ng tiá»n
 						</td>
 						<td colspan=3>
@@ -97,5 +97,5 @@
 						</tr>
 					</tbody></table><div class="row"><div class="col-sm-6">
-							<div class="dataTables_info" id="sample-table-2_info">Hiển thị <?php echo ($start+1)?> đến <?php echo ($start+$perpage)?> của <?php echo $total?> bản ghi</div>
+							<div class="dataTables_info" id="sample-table-2_info">Hiá»n thá» <?php echo ($start+1)?> Äáº¿n <?php echo ($start+$perpage)?> cá»§a <?php echo $total?> báº£n ghi</div>
 								
 						</div>
@@ -120,5 +120,5 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Lịch sử</h4>
+                <h4 class="modal-title">Lá»ch sá»­</h4>
             </div>
             <div class="modal-body">
@@ -126,10 +126,10 @@
                     <li class="active" >
                         <a id="regis-tab" href="#regis" data-toggle="tab">
-                            Giao dịch
+                            Giao dá»ch
                         </a>
                     </li>
                     <li>
                         <a id="trade-tab" href="#trade" data-toggle="tab">
-                            Thông tin
+                            ThÃŽng tin
                         </a>
                     </li>
@@ -137,6 +137,6 @@
                 <div class="tab-content history-tab-content">
                     <div class="tab-pane in active" id="regis">
-						<div class="col-sm-12">
-							<h5>Tài khoản SBG Online: <b><span class="blue"><span id="topup-money"><?php echo number_format($acc_balanced, 0); ?></span> VNĐ <span></b></h5>
+						<div>
+							<h5>TÃ i khoáº£n SBG Online: <b><span class="blue"><span id="topup-money"><?php echo number_format($acc_balanced, 0); ?></span> VNÄ <span></b></h5>
 						</div>
                         <div class="table-responsive">
@@ -145,11 +145,11 @@
                                     <tr>
                                         <th class="center">
-                                            Từ
+                                            Tá»«
                                         </th>
-										<th class="center"> Số tiền (VNĐ) </th>
-                                        <th class="center"> Gói dịch vụ </th>
+										<th class="center"> Sá» tiá»n (VNÄ) </th>
+                                        <th class="center"> GÃ³i dá»ch vá»¥ </th>
                                         <th>
                                             <i class="icon-time bigger-110 hidden-480"></i>
-                                            Thời gian
+                                            Thá»i gian
                                         </th>
                                     </tr>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/reportpackage/province.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/reportpackage/province.php	(revision 838)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/reportpackage/province.php	(revision 883)
@@ -9,5 +9,5 @@
                 BÃ¡o cÃ¡o doanh thu theo tá»nh / thÃ nh phá» theo gÃ³i cÆ°á»c.
             <div class="pull-right" style="margin:5px;">
-                    <a style="color:#fff" href="<?php echo base_url();?>admin/reportpackage/export/<?php echo $month;?>/<?php echo $year;?>">Xuáº¥t ra Excel</a>
+                    <a style="color:#fff" href="<?php echo base_url();?>admin/reportpackage/export/<?php echo $date;?>/<?php echo $month;?>/<?php echo $year;?>/-/<?php echo $to_date;?>/<?php echo $to_month;?>/<?php echo $to_year;?>">Xuáº¥t ra Excel</a>
                 </div>
             </div>
@@ -17,6 +17,17 @@
                     <form autocomplete="off" onsubmit="return false;" id="province" >
                         <div class="row">
-                            <div class="col-sm-6">
-                                <div class="" style="display: inline-block"><label>ThÃ¡ng
+                            <div class="col-sm-1">
+                                <div class="" style="display: inline-block"><label><strong>Tá»«: </strong></label></div>
+							</div>
+							<div class="col-sm-6">
+								<div class="" style="display: inline-block"><label>NgÃ y</label>
+
+                                        <select aria-controls="sample-table-2" size="1" name="date" onchange="filter();">                                      
+                                            <?php for ($i=1;$i<=31;$i++) { ?>
+                                            <option value="<?php echo $i;?>" <?php if($date==$i) { ?> selected <?php }?>><?php echo $i;?></option>
+                                            <?php }?>
+                                        </select>
+                                </div>
+								<div class="" style="display: inline-block"><label>ThÃ¡ng</label>
 
                                         <select aria-controls="sample-table-2" size="1" name="month" onchange="filter();">                                      
@@ -34,5 +45,6 @@
                                         </select>
                                 </div>
-                            </div>
+							</div>
+							
 
                             <div class="col-sm-6">
@@ -40,4 +52,37 @@
                             </div>
                         </div>
+						
+						<div class="row">
+							<div class="col-sm-1">
+                                <div class="" style="display: inline-block"><label><strong>Äáº¿n: </strong></label></div>
+							</div>
+							<div class="col-sm-6">
+								<div class="" style="display: inline-block"><label>NgÃ y</label>
+
+                                        <select aria-controls="sample-table-2" size="1" name="to_date" onchange="filter();">                                      
+                                            <?php for ($i=1;$i<=31;$i++) { ?>
+                                            <option value="<?php echo $i;?>" <?php if($to_date==$i) { ?> selected <?php }?>><?php echo $i;?></option>
+                                            <?php }?>
+                                        </select>
+                                </div>
+                                <div class="" style="display: inline-block"><label>ThÃ¡ng</label>
+
+                                        <select aria-controls="sample-table-2" size="1" name="to_month" onchange="filter();">                                      
+                                            <?php for ($i=1;$i<=12;$i++) { ?>
+                                            <option value="<?php echo $i;?>" <?php if($to_month==$i) { ?> selected <?php }?>><?php echo $i;?></option>
+                                            <?php }?>
+                                        </select>
+                                </div>
+                                <div class=""  style="display: inline-block"><label>NÄm
+
+                                        <select aria-controls="sample-table-2" size="1" name="to_year" onchange="filter();">                                      
+                                            <?php for ($i=2014;$i<=date("Y");$i++) { ?>
+                                            <option value="<?php echo $i;?>" <?php if($to_year==$i) { ?> selected <?php }?>><?php echo $i;?></option>
+                                            <?php }?>
+                                        </select>
+                                </div>
+                            </div>
+						</div>
+						
                           </form>
                     <table class="table table-striped table-bordered table-hover dataTable" id="sample-table-2" aria-describedby="sample-table-2_info">
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php	(revision 838)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/reportprovince/province.php	(revision 883)
@@ -17,45 +17,5 @@
                 <div role="grid" class="dataTables_wrapper" id="sample-table-2_wrapper">
                     <form autocomplete="off" onsubmit="return false;" id="province" >
-                        <div class="row">
-                            <div class="col-sm-1">
-                                <div class="" style="display: inline-block"><label><strong>Tá»«: </strong></label></div>
-							</div>
-							<div class="col-sm-6">
-								<div class="" style="display: inline-block"><label>NgÃ y</label>
-
-                                        <select aria-controls="sample-table-2" size="1" name="date" onchange="filter();">                                      
-                                            <?php for ($i=1;$i<=31;$i++) { ?>
-                                            <option value="<?php echo $i;?>" <?php if($date==$i) { ?> selected <?php }?>><?php echo $i;?></option>
-                                            <?php }?>
-                                        </select>
-                                </div>
-								<div class="" style="display: inline-block"><label>ThÃ¡ng</label>
-
-                                        <select aria-controls="sample-table-2" size="1" name="month" onchange="filter();">                                      
-                                            <?php for ($i=1;$i<=12;$i++) { ?>
-                                            <option value="<?php echo $i;?>" <?php if($month==$i) { ?> selected <?php }?>><?php echo $i;?></option>
-                                            <?php }?>
-                                        </select>
-                                </div>
-                                <div class=""  style="display: inline-block"><label>NÄm
-
-                                        <select aria-controls="sample-table-2" size="1" name="year" onchange="filter();">                                      
-                                            <?php for ($i=2014;$i<=date("Y");$i++) { ?>
-                                            <option value="<?php echo $i;?>" <?php if($year==$i) { ?> selected <?php }?>><?php echo $i;?></option>
-                                            <?php }?>
-                                        </select>
-                                </div>
-							</div>
-							
-
-                            <div class="col-sm-6">
-
-                            </div>
-                        </div>
-						
 						<div class="row">
-							<div class="col-sm-1">
-								<div class="" style="display: inline-block"><label><strong>Äáº¿n: </strong></label></div>
-							</div>
 							<div class="col-sm-6">
 								<div class="" style="display: inline-block"><label>NgÃ y</label>
@@ -108,7 +68,7 @@
 								<td style="font-weight:bold;"><?php echo $totalTbth; ?></td>
 								<td style="font-weight:bold;"><?php echo $totalTbn; ?></td>
-								<td style="font-weight:bold;"><?php echo $totalDtng; ?></td>
-								<td style="font-weight:bold;"><?php echo $totalDtth; ?></td>
-								<td style="font-weight:bold;"><?php echo $totalDtn; ?></td>
+								<td style="font-weight:bold;"><?php echo number_format($totalDtng, 0); ?></td>
+								<td style="font-weight:bold;"><?php echo number_format($totalDtth, 0); ?></td>
+								<td style="font-weight:bold;"><?php echo number_format($totalDtn, 0); ?></td>
 								
 							</tr>
@@ -127,7 +87,7 @@
                                     <td class="hidden-480 "><?php echo $province['tbt']; ?></td>
                                     <td class=" "><?php echo $province['tbn']; ?></td>
-                                    <td class=" "><?php echo $province['dtng']; ?></td>
-                                    <td class=" "><?php echo $province['dtt']; ?></td>
-                                    <td class=" "><?php echo $province['dtn']; ?></td>
+                                    <td class=" "><?php echo number_format($province['dtng'], 0); ?></td>
+                                    <td class=" "><?php echo number_format($province['dtt'], 0); ?></td>
+                                    <td class=" "><?php echo number_format($province['dtn'], 0); ?></td>
 
                                 </tr>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 838)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/index.php	(revision 883)
@@ -90,11 +90,11 @@
 				$('#table_content').show();
 				$("#content").html(data);
-				$("#keyword").focus();
-				$("#keyword").setCursorToTextEnd();
 				$('.daterangepicker').daterangepicker({
 					format: 'DD/MM/YYYY'
 				});
+				$("#keyword").focus();
+				$("#keyword").setCursorToTextEnd();
+				init_page();
 				$('input[name="daterange"]').val(daterange);
-				init_page();
 			},
 			error: function (jqXHR, textStatus, errorThrown)
@@ -104,4 +104,8 @@
         });
 	}
+	//$(document).ready(function(){
+		
+	//});
+	
 		
 </script>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 838)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/user/listview.php	(revision 883)
@@ -45,4 +45,9 @@
                     ThÃªm ngÆ°á»i dÃ¹ng
                 </button-->
+				<div class="pull-right" style="margin:5px;">
+                    
+					<a style="color:#fff" href="<?php echo base_url();?>admin/user/export/<?php echo $current_page; ?>/<?php echo $perpage; ?>/<?php echo ($keyword)?$keyword:'default'; ?>/<?php echo $status; ?>/<?php echo ($province)?$povince:'default'; ?>/<?php echo ($district)?$district:'default';?>/<?php echo ($daterange)?$daterange:'default'; ?>/<?php echo $sorting_order; ?>/<?php echo $sorting_field;?>">Xuáº¥t ra Excel</a>
+					
+                </div>
 
             </div>
@@ -76,10 +81,22 @@
                                 </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;">
+								<div class="dataTables_province" style="float: right;" id="sample-table-2_status"><label>Lá»c theo Tá»nh/TP:
+									<select onchange="filter();" name="province" class="form-field-province" 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>
+											<option <?php if ($key == $province) echo "selected"; ?> value="<?php echo $key; ?>"><?php echo $pro; ?></option>
 										<?php endforeach; ?>
+									</select>
+                                </div>
+								
+								<div class="dataTables_district" style="float: right;" id="sample-table-2_status"><label>Lá»c theo Quáº­n/Huyá»n:
+									<select onchange="filter();" name="district" id="form-field-district" class="form-field-district" size="1" style="width: 176px; height: 28px;">
+										<?php if ($districts):?>
+											<option value=''></option>
+											<?php foreach ($districts as $key => $dist): ?>
+												<option <?php if ($dist['district_id'] == $district) echo "selected"; ?> value="<?php echo $dist['district_id']; ?>"><?php echo $dist['district_name']; ?></option>
+											<?php endforeach; ?>
+											<?php endif;?>
 									</select>
                                 </div>
@@ -92,9 +109,8 @@
                             </div>
                         </div>
-
+						<input type="hidden" name="sorting_order" id="sorting_order" value="<?php echo $sorting_order; ?>" />
+						<input type="hidden" name="sorting_field" id="sorting_field" value="<?php echo $sorting_field; ?>"/>
                 </div>
 
-                <input type="hidden" name="sorting_order" id="sorting_order" value="<?php echo $sorting_order; ?>" />
-                <input type="hidden" name="sorting_field" id="sorting_field" value="<?php echo $sorting_field; ?>"/>
                 </form>
                 <!-- Table Content -->
@@ -104,10 +120,10 @@
                         <thead>
                             <tr role="row">
-                                <th class="center sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 44px;" aria-label="">
+                                <!--<th class="center sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 44px;" aria-label="">
                                     <label>
                                         <input type="checkbox" class="ace">
                                         <span class="lbl"></span>
                                     </label>
-                                </th>
+                                </th>-->
                                 <th class="<?php
                                 if ($sorting_field == 'cellphone') {
@@ -117,11 +133,5 @@
                                 }
                                 ?>" 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') {
-                                    echo $sorting_order;
-                                } else {
-                                    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">Há» tÃªn</th>
+                                <th style="width: 156px;">Há» tÃªn</th>
 								
                                 <th class="<?php
@@ -152,5 +162,6 @@
                                     NgÃ y háº¿t háº¡n
                                 </th>
-                                <th style="width: 140px;">Tá»nh/TP</th>
+                                <th style="width: 130px;">Tá»nh/TP</th>
+								 <th style="width: 150px;">Quáº­n/Huyá»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>
                             </tr>
@@ -163,4 +174,5 @@
 							?>
                                 <tr class="odd">
+								<!--
                                     <td class="center  sorting_1">
                                         <label>
@@ -168,5 +180,5 @@
                                             <span class="lbl"></span>
                                         </label>
-                                    </td>
+                                    </td>-->
                                     <td class=" ">
                                         <a onclick="getUserHistory(<?php echo $user['us_id']; ?>, 1);" data-toggle="modal"><?php echo $user['username']; ?></a>
@@ -180,4 +192,5 @@
                                     <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><?php echo $user['district_name']; ?></td>
 									<td class=" ">
 									<?php if (strtotime($user['expire_date']) > time() && $user['p_id'] != 5 ): ?>
@@ -242,5 +255,5 @@
                 <div class="tab-content history-tab-content">
                     <div class="tab-pane in active" id="regis">
-						<div class="col-sm-12">
+						<div>
 							<h5>TÃ i khoáº£n SBG Online: <b><span class="blue"><span id="topup-money"><?php echo number_format($acc_balanced, 0); ?></span> VNÄ <span></b></h5>
 						</div>
