diff --git a/modul/administrasi/user-management/usr.list.php b/modul/administrasi/user-management/usr.list.php
index d4aa873..f85f7fb 100755
--- a/modul/administrasi/user-management/usr.list.php
+++ b/modul/administrasi/user-management/usr.list.php
@@ -3,21 +3,21 @@
global $db;
$requestData= $_REQUEST;
$today = date("Y-m-d");
-$columns = array(
+$columns = array(
0 => 'user_id',
1 => 'username',
2 => 'password',
- 3 => 'created_on',
+ 3 => 'created_on',
4 => 'groups_name',
5 => 'status',
-
+
);
$data = $db->query("SELECT COUNT(user_id) as jumlah FROM users WHERE role <> '0'");
$count = $data[0]["jumlah"];
$totalData = $count;
$totalFiltered = $totalData;
-$sql = "SELECT user_detail.first_name as first_name,users.user_id as user_id, users.username as username, users.password as password, users.created_on as created_on, groups.name, users.status FROM `users` join user_detail on users.user_id = user_detail.user_id join groups on users.group_id = groups.group_id WHERE users.role <> '0' ";
+$sql = "SELECT user_detail.first_name as first_name,users.user_id as user_id, users.username as username, users.created_on as created_on, groups.name, users.status FROM `users` join user_detail on users.user_id = user_detail.user_id join groups on users.group_id = groups.group_id WHERE users.role <> '0' ";
if( !empty($requestData['columns'][0]['search']['value']) ){ //name
$sql.=" AND users.user_id LIKE '".$requestData['columns'][0]['search']['value']."%' ";
}
@@ -42,21 +42,21 @@ $sql.=" ORDER BY ". $columns[$requestData['order'][0]['column']]." ".$requestD
$data = $db->query($sql);
$qweqwe = array();
foreach ($data as $key => $value) {
- $nestedData = array();
-
+ $nestedData = array();
+
$nestedData[] = $value["user_id"];
$nestedData[] = strtoupper($value["username"]);
$nestedData[] = getProfileData($value["user_id"], "first_name") . " " . getProfileData($value["user_id"], "last_name");
- $nestedData[] = $value["password"];
+ //$nestedData[] = $value["password"];
$nestedData[] = date('F d, Y', strtotime($value["created_on"]));
$nestedData[] = $value["name"];
$nestedData[] = ($value["status"] != "0" ? "ACTIVE" : "BLOCKED");
$nestedData[] = ($value["status"] == "0" ? " UNBLOCK" : " BLOCK"). " LOGIN ";
-
+
$qweqwe[] = $nestedData;
}
$json_data = array(
- "draw" => intval( $requestData['draw'] ), // for every request/draw by clientside , they send a number as a parameter, when they recieve a response/data they first check the draw number, so we are sending same number in draw.
+ "draw" => intval( $requestData['draw'] ), // for every request/draw by clientside , they send a number as a parameter, when they recieve a response/data they first check the draw number, so we are sending same number in draw.
"recordsTotal" => intval( $totalData ), // total number of records
"recordsFiltered" => intval( $totalFiltered ), // total number of records after searching, if there is no searching then totalFiltered = totalData
"data" => $qweqwe // total data array
diff --git a/modul/administrasi/user-management/usr.tpl.php b/modul/administrasi/user-management/usr.tpl.php
index 4a314e8..6ad6117 100755
--- a/modul/administrasi/user-management/usr.tpl.php
+++ b/modul/administrasi/user-management/usr.tpl.php
@@ -94,9 +94,7 @@
|
NAME
|
-
- PASSWORD
- |
+
REGISTER DATE
|
diff --git a/modul/common/dashboard/dashboard.so.list.php b/modul/common/dashboard/dashboard.so.list.php
index 54dbbb0..780061a 100755
--- a/modul/common/dashboard/dashboard.so.list.php
+++ b/modul/common/dashboard/dashboard.so.list.php
@@ -5,12 +5,12 @@ $requestData= $_REQUEST;
$cc = 1;
- $columns = array(
+ $columns = array(
0 => 'so_id',
1 => 'created_on',
3 => 'order_no',
4 => 'marking',
- 5 => 'supplier_company_name',
+ 5 => 'supplier_company_name',
);
$count = $data[0]["jumlah"];
$totalData = $count;
@@ -28,13 +28,13 @@ $requestData= $_REQUEST;
$data = $db->query($sql);
$qweqwe = array();
foreach ($data as $key => $value) {
- $nestedData = array();
-
+ $nestedData = array();
+
$nestedData[] = $cc;
$nestedData[] = date("d/m/Y", strtotime($value['created_on']));
$nestedData[] = getGeneralStatus($value['so_id']);
$nestedData[] = $value['order_no'];
- $nestedData[] = $value['marking'];
+ $nestedData[] = ''.$value['marking'].'';
$nestedData[] = $value['supplier_company_name'];
if($_SESSION['group_id'] <> 1){
$nestedData[] = getCompanyData($value['forwarder_id'], "company_id", "name");
@@ -66,12 +66,12 @@ $requestData= $_REQUEST;
';
-
+
$qweqwe[] = $nestedData;
$cc++;
}
$json_data = array(
- "draw" => intval( $requestData['draw'] ), // for every request/draw by clientside , they send a number as a parameter, when they recieve a response/data they first check the draw number, so we are sending same number in draw.
+ "draw" => intval( $requestData['draw'] ), // for every request/draw by clientside , they send a number as a parameter, when they recieve a response/data they first check the draw number, so we are sending same number in draw.
"recordsTotal" => intval( $totalData ), // total number of records
"recordsFiltered" => intval( $totalFiltered ), // total number of records after searching, if there is no searching then totalFiltered = totalData
"data" => $qweqwe // total data array
diff --git a/modul/orders/shipping-order/create.tpl.php b/modul/orders/shipping-order/create.tpl.php
index 2e6b38f..2194e0f 100755
--- a/modul/orders/shipping-order/create.tpl.php
+++ b/modul/orders/shipping-order/create.tpl.php
@@ -442,7 +442,7 @@