Changeset 818 for pro-violet-viettel/sourcecode/application/modules/admin/views/report

Timestamp:

Mar 24, 2015 2:15:02 PM (10 years ago)

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules/admin/views/report

Files:

• index.php (modified) (5 diffs)
• listview.php (modified) (4 diffs)

pro-violet-viettel/sourcecode/application/modules/admin/views/report/index.php

@@ -1 @@
-<?php
+<?php
 $base_url = base_url();
 $this->load->view('layout/admin/header', array('base_url' => $base_url));
-$this->load->view('layout/admin/sidebar', array('base_url' => $base_url, 'method'=>$this->router->method, 'class'=>$this->router->class  ));
+$this->load->view('layout/admin/sidebar', array('base_url' => $base_url, 'method'=>$this->router->method, 'class'=>$this->router->class));
 ?>
 <script type="text/javascript">
@@ -26 +26 @@
             });
             return false;
-        })
+        });
         $('#keyword').keyup(function (event) {
             if (event.keyCode == '13') {
@@ -157 +157 @@
         <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 +169 @@
         <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 +183 @@
     <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>

pro-violet-viettel/sourcecode/application/modules/admin/views/report/listview.php

@@ -3 +3 @@
                 <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>
+                </div>
                 </div>
 
@@ -48 +51 @@
                                                 <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">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 == '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> 
@@ -66 +69 @@
 
                                                         <td class=" ">
-                                                                <a onclick="getUserHistory(<?php echo $paidlog['us_id']; ?>, 1);" data-toggle="modal"><?php echo $paidlog['username'];?></a>
+                                                                <a onclick="getUserHistory(<?php echo $paidlog['us_id']; ?>, 1);" data-toggle="modal"><?php echo $paidlog['cellphone']?></a>
                                                         </td>
-                                                        <td class=" "><?php echo $paidlog['cellphone']?></td>
+                                                        <td class=" "><?php echo $paidlog['username'];?></td>
                                                         
                                                         <td class="hidden-480 "><?php echo number_format($paidlog['amount'],0);?></td>
@@ -134 +137 @@
                 <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>
                         <div class="table-responsive">
                             <table id="sample-table-1" class="table table-striped table-bordered table-hover">