diff --git a/public_html/doc/customer_list.php b/public_html/doc/customer_list.php index e1c4395..448dd95 100644 --- a/public_html/doc/customer_list.php +++ b/public_html/doc/customer_list.php @@ -10,18 +10,29 @@ if (in_array($_SESSION['ss_LEVEL'], $permit)) { } else $setTag = "DISABLED"; -if ($cstatus == 'T') $status_query = " AND (tbl_customer.c_status = 'A' OR tbl_customer.c_status = 'I') "; -else if ($cstatus == 'I') $status_query = " AND (tbl_customer.c_status = 'I') "; +if ($cstatus == 'T') + $status_query = " AND (tbl_customer.c_status = 'A' OR tbl_customer.c_status = 'I') "; +else if ($cstatus == 'I') + $status_query = " AND (tbl_customer.c_status = 'I') "; else { $cstatus = 'A'; $status_query = " AND (tbl_customer.c_status = 'A') "; } +if ($cistop == 'A') { + $cistop_query = " AND tbl_customer.c_is_top = 'A' "; +} else if ($cistop == 'G') { + $cistop_query = " AND tbl_customer.c_is_top = 'G' "; +} else { + $cistop = 'T'; + $cistop_query = ""; +} if ($_SESSION['ss_LEVEL'] == 9) { - $add_allquery = $status_query. " AND c_driveruid = '".$_SESSION['ss_UID']."' "; + $add_allquery = $status_query . $cistop_query . " AND c_driveruid = '".$_SESSION['ss_UID']."' "; +} else { + $add_allquery = $status_query . $cistop_query; } -else $add_allquery = $status_query. ""; //$add_query .= "tbl_groups INNER JOIN naloxca_bbs.tbl_customer ON (tbl_groups.g_uid = tbl_customer.m_gid) "; $add_srchquery = ""; @@ -118,7 +129,8 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { $c_addressSTR = str_replace("\\", "", $c_address); $c_containerSTR = str_replace("\\", "", $c_container); $c_statusSTR = $arrStatus[$c_status]; - + $c_istopSTR = ($c_is_top === 'A') ? 'A Rank' : (($c_is_top === 'G') ? 'Ghost' : ''); + $todayQty = number_format(round(floatval($c_fullquantity - $c_fullquantitydaily))); //$qry_driver = "SELECT m_firstname, m_lastname FROM tbl_member WHERE m_uid = '$c_driveruid' "; //$rt_driver = $jdb->fQuery($qry_driver, "fetch query error"); @@ -154,6 +166,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { $m_initial $c_phoneSTR $c_statusSTR + $c_istopSTR "; @@ -193,12 +206,19 @@ function goSearch(f){ $(document).ready(function(){ - $("#form_cstatus").change(function(){ - //$(this).css("background-color", "#FFD2A6"); - $('#form_cstatus').submit(); - }); + // $("#cstatus").change(function(){ + // //$(this).css("background-color", "#FFD2A6"); + // $('#customerFilterForm').submit(); + // }); - + $("input[name='cstatus']").change(function () { + $('#customerFilterForm').submit(); + }); + + $("input[name='cistop']").change(function () { + $('#customerFilterForm').submit(); + }); + $('.customerShortInfo').click(function(){ var ccuid = $(this).data('id'); @@ -301,7 +321,14 @@ $(document).ready(function(){
-
+ + + + + + + + - - - - + + + + - -
- -
- - - +
- -
- -
- -
-
+
+
+ + + + + +
+
+
+ + + + + +
+
- - + ADD - - +
-
@@ -371,19 +400,19 @@ $(document).ready(function(){ No Option Liter - Restaurant Name - Account - Address - City - Postal Code - Payment - Rate - Container - Detail - Driver - Phone - Status - + Restaurant Name + Account + Address + City + Postal Code + Payment + Rate + Container + Detail + Driver + Phone + Status + Rank @@ -586,7 +615,7 @@ $(document).ready(function(){ @@ -626,4 +655,51 @@ $(document).ready(function(){
- \ No newline at end of file + + + \ No newline at end of file diff --git a/public_html/lib/order_lib.php b/public_html/lib/order_lib.php index aeee835..bcf4fd5 100644 --- a/public_html/lib/order_lib.php +++ b/public_html/lib/order_lib.php @@ -363,7 +363,7 @@ $(document).ready(function(){