Index: pro-violet-viettel/sourcecode/application/modules/admin/views/report/index.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/report/index.php	(revision 430)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/report/index.php	(revision 441)
@@ -82,5 +82,5 @@
     {
         $.ajax({
-            url: 'http://viettel.violet.vn/admin/mau_tin_nhan/trang/1',
+            url: 'http://viettel.violet.vn/admin/doanh_thu_tong_hop/trang/1',
             type: "POST",
             data: $("#collaborator").serialize(),
@@ -120,5 +120,5 @@
 			}
 		</style>
-<div class="main-content" id="content">
+<div class="main-content" >
     <div id="breadcrumbs" class="breadcrumbs">
 
@@ -160,9 +160,9 @@
     </div><!-- /.page-header -->
     
-     <div class="row">
-         
-         
-    <?php echo $statistics; ?>     
-    <?php //echo $content; ?>
+     <div class="row">  
+    <?php echo $statistics; ?>   
+     </div>
+     <div class="row" id="content">    
+    <?php echo $content; ?>
      </div>
     </div>
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/report/listview.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/report/listview.php	(revision 430)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/report/listview.php	(revision 441)
@@ -48,9 +48,9 @@
                                     </label>
                                 </th>
-                             
-                                <th class="<?php if ($sorting_field == 'sms_content') {echo $sorting_order;} else {echo "sorting";}?>" id="sms_content" 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">Sá» Äiá»n thoáº¡i</th>
-                                <th class="<?php if ($sorting_field == 'sms_reply') {echo $sorting_order;} else {echo "sorting";}?>" id="sms_reply" 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">Há» tÃªn</th>
-                                <th class="<?php if ($sorting_field == 'service_id') {echo $sorting_order;} else {echo "sorting";}?>" id="service_id" 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 == 'commandcode') {echo $sorting_order;} else {echo "sorting";}?>" id="commandcode" 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 "sorting";}?>" 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">Há» tÃªn</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">Sá» Äiá»n thoáº¡i</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>
@@ -70,10 +70,11 @@
                                 </td>
 
-                                
-                                <td class=" "><?php echo $paidlog['cellphone']?></td>
                                 <td class=" ">
                                     <a href="#">Ho va ten</a>
                                 </td>
+                                <td class=" "><?php echo $paidlog['cellphone']?></td>
+                                
                                 <td class="hidden-480 "><?php echo $paidlog['amount']?></td>
+                                <td class="hidden-480 "><?php if ($paidlog['paid_type']==1) {echo "SMS";} else { echo "Card";}?></td>
                                 <td class=" "><?php echo $paidlog['paid_time']?></td>
 
Index: pro-violet-viettel/sourcecode/application/modules/admin/views/report/statistics.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/views/report/statistics.php	(revision 430)
+++ pro-violet-viettel/sourcecode/application/modules/admin/views/report/statistics.php	(revision 441)
@@ -1,113 +1,87 @@
 <div class="col-xs-12">
-								<!-- PAGE CONTENT BEGINS -->
-								<div class="col-xs-6 no-padding">
-									<div class="widget-box no-border">
-										<div class="widget-header widget-header-flat">
-											<h4 class="lighter">
-												<i class="icon-signal"></i>
-												Doanh thu
-											</h4>
+    <!-- PAGE CONTENT BEGINS -->
+    <div class="col-xs-6 no-padding">
+        <div class="widget-box no-border">
+            <div class="widget-header widget-header-flat">
+                <h4 class="lighter">
+                    <i class="icon-signal"></i>
+                    Doanh thu
+                </h4>
 
-											<div class="widget-toolbar">
-												<a data-action="collapse" href="#">
-													<i class="icon-chevron-up"></i>
-												</a>
-											</div>
-										</div>
-										<div class="widget-body">
-												<div class="table-responsive">
-													<table class="table table-striped table-bordered table-hover" id="sample-table-1">
-														<thead style="background-color: blue">
-															<tr>
-																<th>Thá»i gian</th>
-																<th>Doanh thu</th>
-															</tr>
-														</thead>
+                <div class="widget-toolbar">
+                    <a data-action="collapse" href="#">
+                        <i class="icon-chevron-up"></i>
+                    </a>
+                </div>
+            </div>
+            <div class="widget-body">
+                <div class="table-responsive">
+                    <table class="table table-striped table-bordered table-hover" id="sample-table-1">
+                        <thead style="background-color: blue">
+                            <tr>
+                                <th>Thá»i gian</th>
+                                <th>Doanh thu</th>
+                            </tr>
+                        </thead>
 
-														<tbody>
-															<tr>
-																<td>Tuáº§n trÆ°á»c</td>
-																<td>
-																	$1
-																</td>
-															</tr>
-															<tr>
-																<td>ThÃ¡ng trÆ°á»c</td>
-																<td>
-																	$1111111111
-																</td>
-															</tr>
-															<tr>
-																<td>QuÃœ trÆ°á»c</td>
-																<td>
-																	$1111111111
-																</td>
-															</tr>
-															<tr>
-																<td>NÄm trÆ°á»c</td>
-																<td>
-																	$1111111111
-																</td>
-															</tr>
-														</tbody>
-													</table>
-												</div><!-- /.table-responsive -->
-										</div>
-									</div>
-								</div>
-								
-								<div class="col-xs-6">
-									<div class="widget-box no-border">
-										<div class="widget-header widget-header-flat">
-											<h4 class="lighter">
-												<i class="icon-signal"></i>
-												Biá»u Äá» doanh thu
-											</h4>
+                        <tbody>
+                            <tr>
+                                <td>Tuáº§n trÆ°á»c</td>
+                                <td>
+                                    <?php echo $revenue['last_week'];?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>ThÃ¡ng trÆ°á»c</td>
+                                <td>
+                                    <?php echo $revenue['last_month'];?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>QuÃœ trÆ°á»c</td>
+                                <td>
+                                    <?php echo $revenue['last_quarter'];?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>NÄm trÆ°á»c</td>
+                                <td>
+                                    <?php echo $revenue['last_year'];?>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div><!-- /.table-responsive -->
+            </div>
+        </div>
+    </div>
 
-											<div class="widget-toolbar">
-												<a data-action="collapse" href="#">
-													<i class="icon-chevron-up"></i>
-												</a>
-											</div>
-										</div>
+    <div class="col-xs-6">
+        <div class="widget-box no-border">
+            <div class="widget-header widget-header-flat">
+                <h4 class="lighter">
+                    <i class="icon-signal"></i>
+                    Biá»u Äá» doanh thu
+                </h4>
 
-										<div class="widget-body">
-											<div class="widget-main padding-4">
-												<div id="sales-charts" style="width: 100%; height: 200px; padding: 0px; position: relative;"><canvas class="flot-base" style="direction: ltr; position: absolute; left: 0px; top: 0px; width: 534px; height: 200px;" width="534" height="200"></canvas><div class="flot-text" style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; font-size: smaller; color: rgb(84, 84, 84);"><div class="flot-x-axis flot-x1-axis xAxis x1Axis" style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; display: block;"><div style="position: absolute; max-width: 76px; top: 184px; left: 29px; text-align: center;" class="flot-tick-label tickLabel">0.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 110px; text-align: center;" class="flot-tick-label tickLabel">1.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 192px; text-align: center;" class="flot-tick-label tickLabel">2.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 274px; text-align: center;" class="flot-tick-label tickLabel">3.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 355px; text-align: center;" class="flot-tick-label tickLabel">4.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 437px; text-align: center;" class="flot-tick-label tickLabel">5.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 519px; text-align: center;" class="flot-tick-label tickLabel">6.0</div></div><div class="flot-y-axis flot-y1-axis yAxis y1Axis" style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; display: block;"><div style="position: absolute; top: 172px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-2.000</div><div style="position: absolute; top: 150px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-1.500</div><div style="position: absolute; top: 129px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-1.000</div><div style="position: absolute; top: 107px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-0.500</div><div style="position: absolute; top: 86px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">0.000</div><div style="position: absolute; top: 65px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">0.500</div><div style="position: absolute; top: 43px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">1.000</div><div style="position: absolute; top: 22px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">1.500</div><div style="position: absolute; top: 1px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">2.000</div></div></div><canvas class="flot-overlay" style="direction: ltr; position: absolute; left: 0px; top: 0px; width: 534px; height: 200px;" width="534" height="200"></canvas><div class="legend"><div style="position: absolute; width: 86px; height: 66px; top: 13px; right: 13px; background-color: rgb(255, 255, 255); opacity: 0.85;"> </div><table style="position:absolute;top:13px;right:13px;;font-size:smaller;color:#545454"><tbody><tr><td class="legendColorBox"><div style="border:1px solid #ccc;padding:1px"><div style="width:4px;height:0;border:5px solid #1abc9c;overflow:hidden"></div></div></td><td class="legendLabel">SMS</td></tr><tr><td class="legendColorBox"><div style="border:1px solid #ccc;padding:1px"><div style="width:4px;height:0;border:5px solid #e67e22;overflow:hidden"></div></div></td><td class="legendLabel">Tháº» cÃ o</td></tr><tr><td class="legendColorBox"><div style="border:1px solid #ccc;padding:1px"><div style="width:4px;height:0;border:5px solid #3498db;overflow:hidden"></div></div></td><td class="legendLabel">Cá»ng tÃ¡c viÃªn</td></tr></tbody></table></div></div>
-											</div><!-- /widget-main -->
-										</div><!-- /widget-body -->
-									</div><!-- /widget-box -->
-								</div>
+                <div class="widget-toolbar">
+                    <a data-action="collapse" href="#">
+                        <i class="icon-chevron-up"></i>
+                    </a>
+                </div>
+            </div>
 
-								<div class="clearfix"></div>
+            <div class="widget-body">
+                <div class="widget-main padding-4">
+                    <div id="sales-charts" style="width: 100%; height: 200px; padding: 0px; position: relative;"><canvas class="flot-base" style="direction: ltr; position: absolute; left: 0px; top: 0px; width: 534px; height: 200px;" width="534" height="200"></canvas><div class="flot-text" style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; font-size: smaller; color: rgb(84, 84, 84);"><div class="flot-x-axis flot-x1-axis xAxis x1Axis" style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; display: block;"><div style="position: absolute; max-width: 76px; top: 184px; left: 29px; text-align: center;" class="flot-tick-label tickLabel">0.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 110px; text-align: center;" class="flot-tick-label tickLabel">1.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 192px; text-align: center;" class="flot-tick-label tickLabel">2.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 274px; text-align: center;" class="flot-tick-label tickLabel">3.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 355px; text-align: center;" class="flot-tick-label tickLabel">4.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 437px; text-align: center;" class="flot-tick-label tickLabel">5.0</div><div style="position: absolute; max-width: 76px; top: 184px; left: 519px; text-align: center;" class="flot-tick-label tickLabel">6.0</div></div><div class="flot-y-axis flot-y1-axis yAxis y1Axis" style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; display: block;"><div style="position: absolute; top: 172px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-2.000</div><div style="position: absolute; top: 150px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-1.500</div><div style="position: absolute; top: 129px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-1.000</div><div style="position: absolute; top: 107px; left: 1px; text-align: right;" class="flot-tick-label tickLabel">-0.500</div><div style="position: absolute; top: 86px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">0.000</div><div style="position: absolute; top: 65px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">0.500</div><div style="position: absolute; top: 43px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">1.000</div><div style="position: absolute; top: 22px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">1.500</div><div style="position: absolute; top: 1px; left: 4px; text-align: right;" class="flot-tick-label tickLabel">2.000</div></div></div><canvas class="flot-overlay" style="direction: ltr; position: absolute; left: 0px; top: 0px; width: 534px; height: 200px;" width="534" height="200"></canvas><div class="legend"><div style="position: absolute; width: 86px; height: 66px; top: 13px; right: 13px; background-color: rgb(255, 255, 255); opacity: 0.85;"> </div><table style="position:absolute;top:13px;right:13px;;font-size:smaller;color:#545454"><tbody><tr><td class="legendColorBox"><div style="border:1px solid #ccc;padding:1px"><div style="width:4px;height:0;border:5px solid #1abc9c;overflow:hidden"></div></div></td><td class="legendLabel">SMS</td></tr><tr><td class="legendColorBox"><div style="border:1px solid #ccc;padding:1px"><div style="width:4px;height:0;border:5px solid #e67e22;overflow:hidden"></div></div></td><td class="legendLabel">Tháº» cÃ o</td></tr><tr><td class="legendColorBox"><div style="border:1px solid #ccc;padding:1px"><div style="width:4px;height:0;border:5px solid #3498db;overflow:hidden"></div></div></td><td class="legendLabel">Cá»ng tÃ¡c viÃªn</td></tr></tbody></table></div></div>
+                </div><!-- /widget-main -->
+            </div><!-- /widget-body -->
+        </div><!-- /widget-box -->
+    </div>
 
-								<div style="padding-bottom:4px" class="table-header">
-									Thá»ng kÃª
-								</div>
+    <div class="clearfix"></div>
 
-								<div class="table-responsive">
-									<div role="grid" class="dataTables_wrapper" id="sample-table-2_wrapper"><div class="row"><div class="col-sm-6"><div id="sample-table-2_length" class="dataTables_length"><label>Hiá»n thá» <select name="sample-table-2_length" size="1" aria-controls="sample-table-2"><option value="10" selected="selected">10</option><option value="25">25</option><option value="50">50</option><option value="100">100</option></select> báº£n ghi</label></div></div><div class="col-sm-6"><div class="dataTables_filter" id="sample-table-2_filter"><label>TÃ¬m kiáº¿m: <input type="text" aria-controls="sample-table-2"></label></div></div></div><table class="table table-striped table-bordered table-hover dataTable" id="sample-table-2" aria-describedby="sample-table-2_info">
-										<thead>
-											<tr role="row"><th class="sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 249px;" aria-label="Sá» Äiá»n thoáº¡i">Sá» Äiá»n thoáº¡i</th><th class="sorting" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 289px;" aria-label="Há» tÃªn: activate to sort column ascending">Há» tÃªn</th><th class="hidden-480 sorting" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 196px;" aria-label="Tiá»n: activate to sort column ascending">Tiá»n</th><th class="sorting" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 329px;" aria-label="
-													
-													NgÃ y ÄÄng kÃœ
-												: activate to sort column ascending">
-													<i class="icon-time bigger-110 hidden-480"></i>
-													NgÃ y ÄÄng kÃœ
-												</th></tr>
-										</thead>
 
-										
-									<tbody role="alert" aria-live="polite" aria-relevant="all"><tr class="odd">
-												<td class="  sorting_1">
-													<a href="#">0918273645</a>
-												</td>
-												<td class=" ">Nguyá»
-n VÄn VÄn</td>
-												<td class="hidden-480 ">3,330 VND</td>
-												<td class=" ">12/10/2104</td>
-											</tr></tbody></table><div class="row"><div class="col-sm-6"><div class="dataTables_info" id="sample-table-2_info">Hiá»n thá» 1 Äáº¿n 1 cá»§a 1 báº£n ghi</div></div><div class="col-sm-6"><div class="dataTables_paginate paging_bootstrap"><ul class="pagination"><li class="prev disabled"><a href="#"><i class="icon-double-angle-left"></i></a></li><li class="active"><a href="#">1</a></li><li class="next disabled"><a href="#"><i class="icon-double-angle-right"></i></a></li></ul></div></div></div></div>
-								</div>
 
-								<!-- PAGE CONTENT ENDS -->
-							</div>
+    <!-- PAGE CONTENT ENDS -->
+</div>
