diff --git a/public_html/assets/internal_api.php b/public_html/assets/internal_api.php index cc3ded1..2d5e4e3 100644 --- a/public_html/assets/internal_api.php +++ b/public_html/assets/internal_api.php @@ -88,6 +88,7 @@ class API extends CONF { IFNULL(tc.c_geolat,'') as lat, IFNULL(tc.c_geolon,'') as lon, td.d_ruid, + td.d_druid, td.r_note FROM (SELECT @@ -123,6 +124,7 @@ class API extends CONF { td.d_estquantity, td.d_ordertype, td.d_driveruid, + td.d_druid, td.d_createruid, td.d_status FROM @@ -131,7 +133,7 @@ class API extends CONF { ON td.d_ruid = tr.r_uid) td WHERE tc.c_uid = td.d_customeruid - AND td.d_driveruid = ".(int)$_POST['driver']." + AND td.d_druid = ".(int)$_POST['driver']." AND td.d_orderdate = '".$_POST['search_date']."' ".$optionCondition.$searchCondition." GROUP BY tc.c_uid @@ -199,6 +201,7 @@ class API extends CONF { "last_paid_date" => $rstOptionPoint['c_lastpaiddate'], "duid" => $rstOptionPoint['d_uid'], "druid" => $rstOptionPoint['d_ruid'], + "ddruid" => $rstOptionPoint['d_druid'], "rnote" => $rstOptionPoint['r_note'], "orderFlag" => $orderFlag ); @@ -236,6 +239,17 @@ class API extends CONF { } } + $sqDriverRegion = qry("SELECT + m_uid + FROM + tbl_member + WHERE + m_currentdriver = ".(int)$_POST['driver']); + $rstDriverRegion = fetch_array($sqDriverRegion); + $driverid = $rstDriverRegion['m_uid']; + + + if(strlen($qtyCondition) > 0){ $qtyCondition .= ")"; @@ -295,7 +309,7 @@ class API extends CONF { WHERE c_status = 'A') tc WHERE - tc.c_driveruid = ".(int)$_POST['driver']." + tc.c_driveruid = ".(int)$driverid." ".$uidList." ".$qtyCondition.$searchCondition." GROUP BY tc.c_uid"); @@ -527,6 +541,7 @@ class API extends CONF { IFNULL(td.d_estquantity,0) as d_estquantity, td.d_ordertype, td.d_uid, + td.d_druid, td.d_driveruid, td.d_createruid, td.d_status, @@ -575,6 +590,8 @@ class API extends CONF { td.d_estquantity, td.d_ordertype, td.d_driveruid, + td.d_ruid, + td.d_druid, td.d_createruid, td.d_status, tr.r_note @@ -584,7 +601,7 @@ class API extends CONF { WHERE tc.c_uid = td.d_customeruid - AND td.d_driveruid = ".(int)$_POST['driver']." + AND td.d_druid = ".(int)$_POST['driver']." AND td.d_orderdate = '".$_POST['search_date']."' GROUP BY tc.c_uid @@ -651,6 +668,7 @@ class API extends CONF { "last_pickup_date" => $rstOptionPoint['c_lastpickupdate'], "last_paid_date" => $rstOptionPoint['c_lastpaiddate'], "duid" => $rstOptionPoint['d_uid'], + "druid" => $rstOptionPoint['d_druid'], "rnote" => $rstOptionPoint['r_note'], "orderFlag" => $orderFlag ); @@ -687,6 +705,16 @@ class API extends CONF { } } + $sqDriverRegion = qry("SELECT + m_uid + FROM + tbl_member + WHERE + m_currentdriver = ".(int)$_POST['driver']); + $rstDriverRegion = fetch_array($sqDriverRegion); + $driverid = $rstDriverRegion['m_uid']; + + if(strlen($qtyCondition) > 0){ $qtyCondition .= ")"; @@ -752,7 +780,7 @@ class API extends CONF { WHERE c_status = 'A') tc WHERE - tc.c_driveruid = ".(int)$_POST['driver']." + tc.c_driveruid = ".(int)$driverid." ".$uidList." ".$qtyCondition." GROUP BY tc.c_uid @@ -840,6 +868,7 @@ class API extends CONF { td.d_quantity, td.d_driveruid, td.d_paystatus, + IFNULL(td.d_drinitial,'-') as d_drinitial, IFNULL(td.d_payamount,'') as d_payamount, tm.m_initial FROM @@ -858,6 +887,9 @@ class API extends CONF { } else if ($rstHistory['d_paystatus'] === 'N') { $d_paystatusSTR = "Unpaid"; + } + else if ($rstHistory['d_paystatus'] === 'G') { + $d_paystatusSTR = "Paid (Grease Trap)"; } else $d_paystatusSTR = ""; @@ -865,7 +897,7 @@ class API extends CONF { $result[] = array( "date" => $rstHistory['d_orderdate'], "quantity" => $rstHistory['d_quantity'], - "driver" => $rstHistory['m_initial'], + "driver" => $rstHistory['d_drinitial'], "paid" => $d_paystatusSTR ); } @@ -948,7 +980,7 @@ class API extends CONF { GROUP BY d_customeruid) s ON s.d_customeruid = td.d_customeruid WHERE tc.c_uid = td.d_customeruid - AND td.d_driveruid = '".$_POST['driver']."' + AND td.d_druid = '".$_POST['driver']."' AND td.d_orderdate = '".$_POST['route_date']."'"); $results = array(); while($rstAddress = fetch_array($sqAddress)) { @@ -1127,7 +1159,17 @@ class API extends CONF { 0, ($customer['c_fullquantity'] - $customer['c_fullquantitydaily']) + ($days * $customer['c_fullquantitydaily']) ); - + + $driveruid = (int)$_POST['driveruid']; + + $sqDriverInfo = qry("SELECT + m_currentdriverinitial + FROM + tbl_member + WHERE + m_currentdriver = '".$driveruid."' "); + $rstDriverInfo = fetch_array($sqDriverInfo); + // insert into tbl_daily $c_name = addslashes($customer['c_name']); qry(" @@ -1139,10 +1181,11 @@ class API extends CONF { d_oil_2y, d_oil_1y, d_oil_0y, d_fullcycle, d_fullcycleforced, d_lastpickupdate, d_lastpickupquantity, d_lastpaiddate, + d_druid, d_drinitial, d_regionuid, d_region, d_estquantity, d_createruid, d_createddate, d_status ) VALUES ( '{$_POST['orderdate']}', - '{$_POST['driveruid']}', + '{$customer['c_driveruid']}', {$customer_uid}, '{$customer['c_accountno']}', '{$c_name}', @@ -1165,6 +1208,12 @@ class API extends CONF { '{$customer['c_lastpickupdate']}', '{$customer['c_lastpickupquantity']}', '{$customer['c_lastpaiddate']}', + + '{$driveruid}', + '{$rstDriverInfo['m_currentdriverinitial']}', + '{$customer['c_regionuid']}', + '{$customer['c_region']}', + {$estquantity}, '{$_POST['d_createruid']}', '".date("YmdHis")."', @@ -1307,6 +1356,7 @@ class API extends CONF { td.d_orderdate, td.d_ordertype, td.d_driveruid, + td.d_druid, td.d_ruid, td.d_visitdate, td.d_quantity, @@ -1344,6 +1394,7 @@ class API extends CONF { "d_customeruid" => $rstInput['d_customeruid'], "d_orderdate" => $rstInput['d_orderdate'], "d_driveruid" => $rstInput['d_driveruid'], + "d_druid" => $rstInput['d_druid'], "d_visitdate" => $rstInput['d_visitdate'], "d_quantity" => $rstInput['d_quantity'], "d_payamount" => $rstInput['d_payamount'], @@ -1361,21 +1412,36 @@ class API extends CONF { $sqInput = qry("SELECT c_driveruid, c_sludge, - c_paymenttype + c_paymenttype, + c_rate, + c_name FROM tbl_customer WHERE c_uid='".$_POST['c_uid']."'"); - $rstInput = fetch_array($sqInput); + $rstInput = fetch_array($sqInput); + + $sqDriverInfo = qry("SELECT + m_currentdriver + FROM + tbl_member + WHERE + m_uid = ".$rstInput['c_driveruid']); + $rstDriverInfo = fetch_array($sqDriverInfo); + + $result = array( "d_uid" => '', "d_customeruid" => $_POST['c_uid'], "d_orderdate" => $_POST['orderdate'], "d_driveruid" => $rstInput['c_driveruid'], + "d_druid" => $rstDriverInfo['m_currentdriver'], "d_visitdate" => $_POST['orderdate'], "d_sludge" => $rstInput['c_sludge'], - "d_paymenttype" => $rstInput['c_paymenttype'] + "d_paymenttype" => $rstInput['c_paymenttype'], + "d_name" => $rstInput['c_name'], + "d_rate" => $rstInput['c_rate'] ); } @@ -1402,6 +1468,7 @@ class API extends CONF { "d_customeruid" => $_POST['customeruid'], "d_orderdate" => $_POST['orderdate'], "d_driveruid" => $_POST['driveruid'], + "d_druid" => $_POST['druid'], "d_visitdate" => $_POST['visitdate']."000000", "d_sludge" => $_POST['sludge'], "d_paymenttype" => $_POST['paymenttype'], @@ -1470,8 +1537,9 @@ class API extends CONF { // 1) 고객 정보 먼저 조회 $sqCus = qry(" SELECT - c_paymenttype, c_paymentcycle, c_rate, - c_fullquantity, c_fullquantitydaily + c_paymenttype, c_paymentcycle, c_rate, + c_fullquantity, c_fullquantitydaily, + c_regionuid, c_region FROM tbl_customer WHERE c_uid = '".(int)$_POST['customeruid']."' "); @@ -1491,12 +1559,22 @@ class API extends CONF { // 기존 insert 문 그대로 사용 + + $sqMem = qry(" + SELECT + m_currentdriverinitial + FROM tbl_member + WHERE m_currentdriver = '".$_POST['druid']."' + "); + $rstMem = fetch_array($sqMem); + qry("INSERT INTO tbl_daily ( d_orderdate, d_driveruid, d_customeruid, d_accountno, d_name, d_paymenttype, d_cycle, d_rate, d_form_eu, d_form_corsia, d_maincontainer, d_container, d_location, d_address, d_city, d_postal, d_oil_2y, d_oil_1y, d_oil_0y, d_fullcycle, d_fullcycleforced, d_fullcycleflag, d_lastpickupdate, d_lastpickupquantity, d_lastpaiddate, + d_druid, d_drinitial, d_regionuid, d_region, d_estquantity, d_createruid, d_createddate, d_inputdate, d_quantity, d_sludge, d_paystatus, d_payamount, @@ -1508,6 +1586,7 @@ class API extends CONF { c_address, c_city, c_postal, 0, 0, 0, c_fullcycle, c_fullcycleforced, c_fullcycleflag, c_lastpickupdate, c_lastpickupquantity, c_lastpaiddate, + '".$_POST['druid']."', '{$rstMem['m_currentdriverinitial']}','{$customer['c_regionuid']}', '{$customer['c_region']}', IFNULL((c_fullquantity - c_fullquantitydaily + (".(int)$interval->days." * c_fullquantitydaily)),0), '".$_POST['createruid']."', '".date('YmdHis')."', '".date('YmdHis')."', ".$_POST['quantity'].", '".$_POST['sludge']."', '".$paystatusSTR."', '".$_POST['payamount']."', @@ -1661,7 +1740,7 @@ class API extends CONF { FROM tbl_member WHERE - m_uid=".(int)$_POST['driver']); + m_currentdriver=".(int)$_POST['driver']); if(db_num_rows($sqCenter) > 0) { $rstCenter = fetch_array($sqCenter); if($rstCenter['m_geolat'] !== null && $rstCenter['m_geolon'] !== null) { @@ -1695,7 +1774,7 @@ class API extends CONF { tbl_daily WHERE d_status = 'F' AND d_orderdate = '".$_POST['route_date']."' - AND d_driveruid = '".$_POST['driver']."' "); + AND d_druid = '".$_POST['driver']."' "); $rstQuantity = fetch_array($sqQuantity); diff --git a/public_html/doc/customer_detail.php b/public_html/doc/customer_detail.php index cae8cab..25e2183 100644 --- a/public_html/doc/customer_detail.php +++ b/public_html/doc/customer_detail.php @@ -163,18 +163,38 @@ foreach ($arrSchedule AS $key=>$value) "; } +$curDR = ""; -// Get Driver Info -$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 ORDER by m_initial ASC "; +// Get Driver Info => Region +$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_region != '' ORDER by m_initial ASC "; $rt_driver = $jdb->nQuery($qry_driver, "list error"); while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { - if ($lt_driver['m_uid'] == $c_driveruid) $selectStr = "selected"; + if ($lt_driver['m_uid'] == $c_driveruid) { + $selectStr = "selected"; + $curDR = $lt_driver['m_currentdriver']; + } + else $selectStr = ""; + + $c_driveruidSTR .= " + "; + +} + + + +// Get Driver Info (Request) +$qry_dr = "SELECT * FROM tbl_driver WHERE dr_status = 'A' ORDER by dr_initial ASC "; +$rt_dr = $jdb->nQuery($qry_dr, "list error"); + +while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) { + + if ($lt_dr['dr_uid'] == $curDR) $selectStr = "selected"; else $selectStr = ""; - $c_driveruidSTR .= " - "; + $c_driveruidSTRRQ .= " + "; } @@ -349,9 +369,35 @@ if ($mode == "update") { if ($_SESSION['ss_LEVEL'] == 7) $PICKUPstr = ""; -if ($_SESSION['ss_LEVEL'] == 9) $add_qry = " AND m_uid = '".$_SESSION['ss_UID']."' "; +if ($_SESSION['ss_LEVEL'] == 9) $add_qry = " AND dr_uid = '".$_SESSION['ss_DRUID']."' "; else $add_qry = ""; +if ($mode == "update") { + // Get Region Info + $qry_rg = "SELECT * FROM tbl_member WHERE m_uid = ".$c_driveruid; + $rt_rg = $jdb->fQuery($qry_rg, "list error"); + + // Get Driver Info + $qry_driver = "SELECT * FROM tbl_driver WHERE dr_uid >= 1 AND dr_status = 'A' ".$add_qry." ORDER by dr_initial ASC "; + $rt_driver = $jdb->nQuery($qry_driver, "list error"); + + while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { + + if ($lt_driver['dr_uid'] == $rt_rg['m_currentdriver']) $selectStr = "selected"; + else $selectStr = ""; + + if ($d_mode == "update") { + if ($lt_driver['dr_uid'] == $d_druid) $selectStr = "selected"; + else $selectStr = ""; + } + + $c_driveruidSTRM .= " + "; + + } +} + +/* // Get Driver Info $qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 ".$add_qry." ORDER by m_initial ASC "; $rt_driver = $jdb->nQuery($qry_driver, "list error"); @@ -370,7 +416,7 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { "; } - +*/ @@ -1090,7 +1136,7 @@ $(document).ready(function() - Driver + Region (Default Driver) + + + @@ -2276,7 +2325,17 @@ $(document).ready(function(){ + + + Driver + + + + + Oil Quantity @@ -2405,6 +2465,7 @@ $(document).ready(function(){ + @@ -2419,9 +2480,9 @@ $(document).ready(function(){ Driver - - + diff --git a/public_html/doc/customer_list.php b/public_html/doc/customer_list.php index f6cd51a..9d91e7c 100644 --- a/public_html/doc/customer_list.php +++ b/public_html/doc/customer_list.php @@ -70,7 +70,7 @@ if($switch) { $switched1 = explode("^", $switched); $add_query .= " ORDER BY $switched1[0] $switched1[1] "; } else { - if ($cstatus == 'I') $add_query .= " ORDER BY c_removaldate DESC, c_name ASC"; + if ($cstatus == 'I') $add_query .= " ORDER BY c_inactivedate DESC, c_name ASC"; else $add_query .= " ORDER BY c_uid DESC"; } @@ -163,6 +163,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { $c_rate $c_maincontainer $c_container + ".trim($m_region)." $m_initial $c_phoneSTR $c_statusSTR @@ -177,7 +178,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { if( $total_count < 1 ) { $strList = " - No Data + No Data "; } @@ -409,6 +410,7 @@ $(document).ready(function(){ Rate Container Detail + Region Driver Phone Status diff --git a/public_html/doc/customer_process.php b/public_html/doc/customer_process.php index 3f2a232..ada786d 100644 --- a/public_html/doc/customer_process.php +++ b/public_html/doc/customer_process.php @@ -144,6 +144,10 @@ if ($actionStr == "CUSTOMERINFO") { $columns[] = "c_expoilmonth"; $columns[] = "c_hstno"; $columns[] = "c_identcode"; + + $columns[] = "c_regionuid"; + $columns[] = "c_region"; + // integration flag $columns[] = "c_is_transfer"; @@ -229,6 +233,13 @@ if ($actionStr == "CUSTOMERINFO") { $values[] = $c_expoilmonth; $values[] = str_replace("\\", "", trim($c_hstno)); $values[] = str_replace("\\", "", trim($c_identcode)); + + $qry_dvr = "SELECT m_regionuid, m_region FROM tbl_member WHERE m_uid = '".$c_driveruid."' "; + $rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error"); + + $values[] = $rt_dvr['m_regionuid']; + $values[] = str_replace("\\", "", trim($rt_dvr['m_region'])); + // c_is_transfer $values[] = "N"; diff --git a/public_html/doc/driver_list.php b/public_html/doc/driver_list.php new file mode 100644 index 0000000..78fb811 --- /dev/null +++ b/public_html/doc/driver_list.php @@ -0,0 +1,735 @@ +checkLevelModal(5); + +// Delete (Admin : 1 ) +$permit = array("1"); +if (in_array($_SESSION['ss_LEVEL'], $permit)) { + $setTag = "ENABLED"; +} +else $setTag = "DISABLED"; + +$add_srchquery = ""; +$add_query = ""; + +// searching +if($key_word) { + + $key_wordStr = urldecode(trim($key_word)); + $add_srchquery .= " AND ((dr_firstname LIKE '%$key_wordStr%') OR (dr_lastname LIKE '%$key_wordStr%') OR (dr_cell LIKE '%$key_wordStr%'))"; +} + +// sorting +if($switch) { + $switched = $func -> switchOrder($switch, $switched); + $add_query .= " ORDER BY $switch $switched "; + $switched = $switch . "^" . $switched; +}else if($switched) { + $switched1 = explode("^", $switched); + $add_query .= " ORDER BY $switched1[0] $switched1[1] "; +} else { + $add_query .= " ORDER BY dr_initial ASC"; +} + +$getSWHStr = $switched; + +// $query = "SELECT * FROM tbl_sampletypes +// INNER JOIN tbl_members ON (tbl_sampletypes.t_uid = tbl_members.m_gid) +// where tbl_members.dr_uid != '' +// ORDER BY tbl_members.dr_uid DESC "; + +//total record +$query = "SELECT COUNT(dr_uid) FROM tbl_driver + WHERE dr_uid <> '' AND dr_status != 'D' " . $add_allquery . $add_srchquery . $add_query; + +$total_count=$jdb->rQuery($query, "record query error"); +//echo "




[$total_count][$query]
"; + +//¡ +if(!$page) $page = 1; + +if(!$list_count) $list_count = $INIT_PAGECNT; //¸Ʈ +if(!$page_count) $page_count = $INIT_PAGEVIEWCNT; // + +$list_number = $total_count - (($page-1)*$list_count); +$start_number = $list_count * ($page-1); + +$add_query .= " LIMIT $start_number, $INIT_PAGECNT"; +$query = "SELECT * FROM tbl_driver + WHERE dr_uid <> '' AND dr_status != 'D' " . $add_allquery . $add_srchquery . $add_query; +//echo "[$query]"; + +$result=$jdb->nQuery($query, "list error"); + +while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { + for($i=0; $i $value ) + $$key = $value; + } + + //$logindateStr = $func -> convertFormat ($MLOGINDATE, 1); + //$signupdateStr = $func -> convertFormat ($MSIGNUPDATE, 1); + + //$qry = "SELECT CNAME FROM tbl_company WHERE CUID = '$MCOMPANY' "; + //$rtd=$jdb->fQuery($qry, "fetch query error"); + //if ($MCOMPANY == "0" || $MCOMPANY == "") $companyStr = "-"; + //else $companyStr = $rtd[CNAME]; + + $dr_cell = preg_replace('/[^A-Za-z0-9\-]/', '', $dr_cell); + $dr_cell = str_replace("-", "", $dr_cell); + $dr_cellSTR = substr ($dr_cell, 0, 3)."-".substr ($dr_cell, 3, 3)."-".substr ($dr_cell, 6, 4); + + $dr_firstnameSTR = str_replace("\\", "", $dr_firstname); + $dr_lastnameSTR = str_replace("\\", "", $dr_lastname); + $dr_initialSTR = str_replace("\\", "", $dr_initial); + $dr_statusSTR = $arrStatus[$dr_status]; + + //$qry_driver = "SELECT m_firstname, m_lastname FROM tbl_member WHERE dr_uid = '$c_driveruid' "; + //$rt_driver = $jdb->fQuery($qry_driver, "fetch query error"); + + if ($setTag == "ENABLED") { + $OPTIONstr = ""; + //$OPTIONTITLEstr = "OPTION"; + } + else { + $OPTIONstr = ""; + //$OPTIONTITLEstr = ""; + } + + $strList .= " + + + $list_number + $dr_initialSTR + $dr_firstnameSTR + $dr_lastnameSTR + $dr_cellSTR + $dr_statusSTR + $OPTIONstr + + + "; + + $list_number--; +} + + +if( $total_count < 1 ) { + $strList = " + No Data + "; +} + + +addLog ("add", "DRIVER LIST", "VIEW", $lguserid, $query, $lgno); + +?> + + + + + + + + + + + + + + +
+ + + + +
+ + + +
+ + + + +
+ + +
+ + +
+
+ +
+

DRIVER

+
    +
  1. HOME
    2. +
  2. DRIVER
    3. +
+
+ +
+
+ +
+ + +
+ +
+ + + + + + + + +
+ +
+
+ + + +
+
+ + 		+ + + ADD + + +
+
+ + + +
+ +
+ + + + + + + + +
+ + + + +
+ + +
+ + + 		+ + + + + +
+ + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
NoInitialFirst NameLast NameCellStatusOption
+
+ + +
+ +
+ + + +
+ +
+ + + + + + +
+ + + + + diff --git a/public_html/doc/export_process.php b/public_html/doc/export_process.php index efadb63..0ffb674 100644 --- a/public_html/doc/export_process.php +++ b/public_html/doc/export_process.php @@ -54,11 +54,22 @@ if ($actionStr == "CUSTOMER") { } else if ($col == 'c_driveruid') { - $qry_driver = "SELECT m_initial FROM tbl_member WHERE m_uid = " . $list[$col]; + $qry_driver = "SELECT m_region FROM tbl_member WHERE m_uid = " . $list[$col]; $rt_driver = $jdb->fQuery($qry_driver, "query error"); - echo "" . $rt_driver['m_initial'] . "\n"; + echo "" . $rt_driver['m_region'] . "\n"; } + else if ($col == 'm_currentdriverinitial') { + if ($list['c_driveruid'] !== null && $list['c_driveruid'] !== "") { + $qry_driver = "SELECT m_currentdriverinitial FROM tbl_member WHERE m_uid = " . $list['c_driveruid']; + $rt_driver = $jdb->fQuery($qry_driver, "query error"); + $currentdriverinitialSTR = $rt_driver['m_currentdriverinitial']; + }else { + $currentdriverinitialSTR = ""; + } + echo "" . $currentdriverinitialSTR . "\n"; + } + else if ($col == 'c_area') { $qry_city = "SELECT a_text FROM tbl_area WHERE a_city = '" . $list['c_city'] . "'"; $rt_city = $jdb->fQuery($qry_city, "query error"); @@ -185,11 +196,17 @@ if ($actionStr == "CUSTOMER") { } else if ($col == 'c_driveruid') { - $qry_driver = "SELECT m_initial FROM tbl_member WHERE m_uid = " . $cus[$col]; + $qry_driver = "SELECT m_region FROM tbl_member WHERE m_uid = " . $cus[$col]; $rt_driver = $jdb->fQuery($qry_driver, "query error"); - echo "" . $rt_driver['m_initial'] . "\n"; + echo "" . $rt_driver['m_region'] . "\n"; } + else if ($col == 'm_currentdriverinitial') { + $qry_driver = "SELECT m_currentdriverinitial FROM tbl_member WHERE m_uid = " . $cus['c_driveruid']; + $rt_driver = $jdb->fQuery($qry_driver, "query error"); + echo "" . $rt_driver['m_currentdriverinitial'] . "\n"; + } + else if ($col == 'c_area') { $qry_city = "SELECT a_text FROM tbl_area WHERE a_city = '" . $cus['c_city'] . "'"; $rt_city = $jdb->fQuery($qry_city, "query error"); @@ -281,7 +298,7 @@ if ($actionStr == "CUSTOMER") { $query = "SELECT * FROM tbl_daily WHERE d_orderdate = '$d_orderdate' - AND d_driveruid = '$d_driveruid' " . $add_query; + AND d_druid = '$d_druid' " . $add_query; $result = $jdb->nQuery($query, "list error"); @@ -297,7 +314,7 @@ if ($actionStr == "CUSTOMER") { $d_nameSTR = str_replace("\\", "", $d_name); $d_maincontainerSTR = $arrBin[$d_maincontainer]; - $qry_driver = "SELECT m_initial FROM tbl_member WHERE m_uid = " . $d_driveruid; + $qry_driver = "SELECT m_initial FROM tbl_member WHERE m_currentdriver = " . $d_druid; $rt_driver = $jdb->fQuery($qry_driver, "query error"); $d_driveruidSTR = $rt_driver['m_initial']; @@ -417,9 +434,10 @@ if ($actionStr == "CUSTOMER") { $max_paymenttype = str_replace("\\", "", $rt_maxuid['d_paymenttype']); $max_rateSTR = $rt_maxuid['d_rate']; - $qry_dvr = "SELECT m_initial FROM tbl_member WHERE m_uid = '" . $rt_maxuid['d_driveruid'] . "'"; + $qry_dvr = "SELECT m_initial, m_region FROM tbl_member WHERE m_uid = '" . $rt_maxuid['d_driveruid'] . "'"; $rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error"); $max_driverSTR = $rt_dvr['m_initial']; + $m_regionSTR = $rt_dvr['m_region']; $get1Mon = date("Ym"); $get1_12Mon = date("Y"); @@ -480,16 +498,14 @@ if ($actionStr == "CUSTOMER") { } echo "\n"; - if ($searchtype == "D" && $searchDriver) { - $qrySTR = " AND (d.d_driveruid = '" . $searchDriver . "') "; - } else { - $qrySTR = ""; - } - - if ($_SESSION['ss_LEVEL'] == 9) { - $qrySTR = " AND (d.d_driveruid = '" . $_SESSION['ss_UID'] . "') "; - } + if ($searchtype == "D" && $searchDriver) { + $qrySTR = " AND (d.d_druid = '".$searchDriver."') "; + } + if ($_SESSION['ss_LEVEL'] == 9) { + $qrySTR = " AND (d.d_druid = '".$_SESSION['ss_DRUID']."') "; + } + if ($cstatus == 'T') { $status_query = " AND (c.c_status = 'A' OR c.c_status = 'I') "; } else if ($cstatus == 'I') { @@ -533,9 +549,10 @@ if ($actionStr == "CUSTOMER") { $d_addressSTR = str_replace("\\", "", $d_address); $d_accountnoSTR = str_replace("\\", "", $d_accountno); - $qry_dvr = "SELECT m_initial FROM tbl_member WHERE m_uid = '" . $d_driveruid . "'"; - $rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error"); - $d_driverSTR = $rt_dvr['m_initial']; + $d_regionSTR = str_replace("\\", "", $d_region); + $d_driverSTR = str_replace("\\", "", $d_drinitial); + + echo ""; foreach ($receiptArray as $colKey => $colValue) { diff --git a/public_html/doc/forecast.php b/public_html/doc/forecast.php index dec1656..c205f3a 100644 --- a/public_html/doc/forecast.php +++ b/public_html/doc/forecast.php @@ -37,7 +37,7 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { else $selectStr = ""; $c_driveruidSTR .= " - "; + "; } @@ -240,7 +240,7 @@ $(document).ready(function(){ - + - @@ -481,7 +425,6 @@ addLog ("add", "EXPENSE LIST", "VIEW", $lguserid, $query, $lgno); -
'.$driver['name'].''; + echo ''; } ?> @@ -373,6 +377,7 @@ function popup(){ + @@ -392,10 +397,10 @@ function popup(){ - + + @@ -121,7 +145,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { if( $total_count < 1 ) { $strList = " - + "; } @@ -493,6 +517,7 @@ $(document).ready(function(){ + diff --git a/public_html/doc/oilhistory_detail.php b/public_html/doc/oilhistory_detail.php index e0104f8..eecf303 100644 --- a/public_html/doc/oilhistory_detail.php +++ b/public_html/doc/oilhistory_detail.php @@ -113,9 +113,7 @@ while($list=mysqli_fetch_array($rt_oilh, MYSQLI_ASSOC)) { if ($d_paystatus == "N" && $d_paynote != '') $d_paystatusSTR = $d_paynote; $d_quantitySTR = number_format(floatval($d_quantity)); - - $qry_dvr = "SELECT m_initial FROM tbl_member WHERE m_uid = '".$d_driveruid."' "; - $rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error"); + $strList .= " @@ -123,7 +121,7 @@ while($list=mysqli_fetch_array($rt_oilh, MYSQLI_ASSOC)) { - + diff --git a/public_html/doc/oilhistory_list.php b/public_html/doc/oilhistory_list.php index 9413908..54ed963 100644 --- a/public_html/doc/oilhistory_list.php +++ b/public_html/doc/oilhistory_list.php @@ -174,7 +174,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { $max_cycle = $arrPaymentCycle[str_replace("\\", "", $rt_maxuid['c_paymentcycle'])]; $max_paymenttype = str_replace("\\", "", $rt_maxuid['c_paymenttype']); - $qry_dvr = "SELECT m_initial FROM tbl_member WHERE m_uid = '".$rt_maxuid['c_driveruid']."' "; + $qry_dvr = "SELECT m_initial, m_region FROM tbl_member WHERE m_uid = '".$rt_maxuid['c_driveruid']."' "; $rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error"); //$qry_eu = "SELECT c_form_eu FROM tbl_customer WHERE c_driveruid = '".$rt_maxuid['d_driveruid']."' "; @@ -239,7 +239,8 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { - + + @@ -255,7 +256,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { if( $total_count < 1 ) { $strList = " - + "; } @@ -308,8 +309,9 @@ if (($searchtype == "D" && $searchDriver && $setTag == "ENABLED") || ($_SESSION[ + // Get Driver Info -$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; +$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_regionuid != '' ORDER by m_region ASC "; $rt_driver = $jdb->nQuery($qry_driver, "list error"); while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { @@ -318,13 +320,12 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { else $selectStr = ""; $c_driveruidSTR .= " - "; + "; } - // 검색시 조건 유지를 위해 if ($searchtype == 'D') $setDisplayRStr = " style='DISPLAY:none'"; else if ($searchtype == 'R' || $searchtype == '') $setDisplayDStr = " style='DISPLAY:none'"; @@ -412,7 +413,7 @@ $(document).ready(function(){ - + @@ -507,7 +508,7 @@ $(document).ready(function(){
-
Driver :
+
Region (Driver) : ()
Driver - '.$driver['name'].''; + echo ''; } ?> @@ -524,7 +529,7 @@ function popup(){ @@ -868,7 +873,7 @@ function popup(){ $(window).ready(function(){ - $("#driver").val("").change(); + $("#driver").val("").change(); initMap(); @@ -1214,6 +1219,7 @@ function popup(){ //"ruid" : jQuery("#map-modal-input .d_ruid").val(), "visitdate" : replaceAll(jQuery("#map-modal-input .d_visitdate").val(), '-' ,''), "driveruid" : jQuery("#map-modal-input .d_driveruid").val(), + "druid" : jQuery("#map-modal-input .d_druid").val(), "quantity" : jQuery("#map-modal-input .d_quantity").val(), "sludge" : jQuery("#map-modal-input .d_sludge").val(), "note" : jQuery("#map-modal-input .d_note").val(), @@ -1428,6 +1434,7 @@ function popup(){ jQuery("#map-modal-input .shortinput-store-name").text(json.result['d_name']); jQuery("#map-modal-input .shortinput-rate").text(json.result['d_rate']); jQuery("#map-modal-input .d_driveruid").val(json.result['d_driveruid']); + jQuery("#map-modal-input .d_druid").val(json.result['d_druid']); jQuery("#map-modal-input .d_paymenttype").val(json.result['d_paymenttype']); jQuery("#map-modal-input .d_sludge").val(json.result['d_sludge']); @@ -2474,7 +2481,7 @@ function popup(){
Address
- diff --git a/public_html/doc/member_list.php b/public_html/doc/member_list.php index 7b4b537..9396dd6 100644 --- a/public_html/doc/member_list.php +++ b/public_html/doc/member_list.php @@ -1,9 +1,9 @@ checkLevelModal(5); -// Delete (Admin : 1 ) +// Delete ±â´É Á¦ÇÑ (Admin : 1 ¸¸ °¡´É) $permit = array("1"); if (in_array($_SESSION['ss_LEVEL'], $permit)) { $setTag = "ENABLED"; @@ -46,11 +46,11 @@ $query = "SELECT COUNT(m_uid) FROM tbl_member $total_count=$jdb->rQuery($query, "record query error"); //echo "




[$total_count][$query]
"; -//¡ +//ÆäÀÌ¡º¯¼ö¼³Á¤ if(!$page) $page = 1; -if(!$list_count) $list_count = $INIT_PAGECNT; //¸Ʈ -if(!$page_count) $page_count = $INIT_PAGEVIEWCNT; // +if(!$list_count) $list_count = $INIT_PAGECNT; //Ãâ·Â¸®½ºÆ® °¹¼ö +if(!$page_count) $page_count = $INIT_PAGEVIEWCNT; //Ãâ·ÂÆäÀÌÁö °¹¼ö $list_number = $total_count - (($page-1)*$list_count); $start_number = $list_count * ($page-1); @@ -77,19 +77,42 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { //if ($MCOMPANY == "0" || $MCOMPANY == "") $companyStr = "-"; //else $companyStr = $rtd[CNAME]; - $m_cell = preg_replace('/[^A-Za-z0-9\-]/', '', $m_cell); - $m_cell = str_replace("-", "", $m_cell); - $m_cellSTR = substr ($m_cell, 0, 3)."-".substr ($m_cell, 3, 3)."-".substr ($m_cell, 6, 4); $m_firstnameSTR = str_replace("\\", "", $m_firstname); $m_lastnameSTR = str_replace("\\", "", $m_lastname); - $m_initialSTR = str_replace("\\", "", $m_initial); + //$m_initialSTR = str_replace("\\", "", $m_initial); $m_statusSTR = $arrStatus[$m_status]; $m_levelSTR = $arrMemberLevel[$m_level]; + $m_regionSTR = str_replace("\\", "", $m_region); - //$qry_driver = "SELECT m_firstname, m_lastname FROM tbl_member WHERE m_uid = '$c_driveruid' "; - //$rt_driver = $jdb->fQuery($qry_driver, "fetch query error"); + if ($m_level == 9) { + $qry_driver = "SELECT * FROM tbl_driver WHERE dr_uid = '$m_currentdriver' "; + $rt_driver = $jdb->fQuery($qry_driver, "fetch query error"); + $m_cell = preg_replace('/[^A-Za-z0-9\-]/', '', $rt_driver['dr_cell']); + $m_cell = str_replace("-", "", $m_cell); + $m_cellSTR = substr ($m_cell, 0, 3)."-".substr ($m_cell, 3, 3)."-".substr ($m_cell, 6, 4); + + $m_firstnameSTR = str_replace("\\", "", $rt_driver['dr_firstname']); + $m_lastnameSTR = str_replace("\\", "", $rt_driver['dr_lastname']); + $m_initialSTR = str_replace("\\", "", $rt_driver['dr_initial']); + + } + else { + $m_cell = preg_replace('/[^A-Za-z0-9\-]/', '', $m_cell); + $m_cell = str_replace("-", "", $m_cell); + $m_cellSTR = substr ($m_cell, 0, 3)."-".substr ($m_cell, 3, 3)."-".substr ($m_cell, 6, 4); + + $m_firstnameSTR = str_replace("\\", "", $m_firstname); + $m_lastnameSTR = str_replace("\\", "", $m_lastname); + $m_initialSTR = ""; + + } + + $m_statusSTR = $arrStatus[$m_status]; + $m_levelSTR = $arrMemberLevel[$m_level]; + + if ($setTag == "ENABLED") { $OPTIONstr = ""; //$OPTIONTITLEstr = "OPTION"; @@ -103,10 +126,11 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
$list_number$m_userid$m_userid $m_firstnameSTR $m_lastnameSTR $m_initialSTR$m_regionSTR $m_cellSTR $m_statusSTR $m_levelSTR
No Data
No Data
First Name Last Name InitialRegion Cell Type Status
$d_visitdateSTR $d_quantitySTR $d_sludge".$rt_dvr['m_initial']."".$d_drinitial." $d_paystatusSTR
$max_sludgeSTR $max_cycle $max_addressSTR ".$rt_dvr['m_initial']."".$rt_dvr['m_region']." ".$rt_dvr['m_initial']." $get1MonQ $get2MonQ $get3MonQ
No Data
No Data
@@ -541,7 +542,8 @@ $(document).ready(function(){ - + + diff --git a/public_html/doc/order_driver.php b/public_html/doc/order_driver.php index bb0df50..c690290 100644 --- a/public_html/doc/order_driver.php +++ b/public_html/doc/order_driver.php @@ -50,9 +50,10 @@ $add_query = ""; if ($d_orderdate) $orderdate = $func -> convertFormat ($d_orderdate, 3); else if ($orderdate) $d_orderdate = str_replace("-", "", trim($orderdate)); -if ($searchDriver) $d_driveruid = $searchDriver; +if ($searchDriver) $d_druid = $searchDriver; + -if ($_SESSION['ss_LEVEL'] == 9 && $_SESSION['ss_UID'] != $d_driveruid) { +if ($_SESSION['ss_LEVEL'] == 9 && $_SESSION['ss_DRUID'] != $d_druid) { $msg = "Invalid data. Please try again. [Err - order driver data]"; $func -> modalMsg ($msg, "/index_intranet.php?view=order_list"); exit(); @@ -84,7 +85,7 @@ $getSWHStr = $switched; //total record $query = "SELECT COUNT(d_uid) FROM tbl_daily - WHERE d_orderdate = '$d_orderdate' AND d_driveruid = '$d_driveruid' " . $add_allquery . $add_srchquery . $add_query; + WHERE d_orderdate = '$d_orderdate' AND d_druid = '$d_druid' " . $add_allquery . $add_srchquery . $add_query; $total_count=$jdb->rQuery($query, "record query error"); //echo "




[$total_count][$query]
"; @@ -106,7 +107,7 @@ $list_number = $total_count; $d_quantitySUM = 0; $query = "SELECT * FROM tbl_daily - WHERE d_orderdate = '$d_orderdate' AND d_driveruid = '$d_driveruid' " . $add_allquery . $add_srchquery . $add_query; + WHERE d_orderdate = '$d_orderdate' AND d_druid = '$d_druid' " . $add_allquery . $add_srchquery . $add_query; //echo "



[$query]"; $result=$jdb->nQuery($query, "list error"); @@ -140,7 +141,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { $d_quantitySUM = $d_quantitySUM + floatval($d_quantity); - $qry_dvr = "SELECT m_initial FROM tbl_member WHERE m_uid = '".$d_driveruid."' "; + $qry_dvr = "SELECT dr_initial FROM tbl_driver WHERE dr_uid = '".$d_druid."' "; $rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error"); @@ -279,6 +280,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { + @@ -379,7 +381,7 @@ $('#c_fullcycle_".$c_uid."').on('change', function () { // changed if( $total_count < 1 ) { $strList = " - + "; } @@ -396,7 +398,22 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { else $selectStr = ""; $c_driveruidSTR .= " - "; + "; + +} + + +// Get Driver Info +$qry_dr = "SELECT * FROM tbl_driver WHERE dr_status = 'A' ORDER by dr_initial ASC "; +$rt_dr = $jdb->nQuery($qry_dr, "list error"); + +while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) { + + if ($lt_dr['dr_uid'] == $d_druid) $selectStr = "selected"; + else $selectStr = ""; + + $d_druidSTR .= " + "; } @@ -608,7 +625,7 @@ function printDiv(divName) { @@ -629,7 +646,7 @@ function printDiv(divName) { - + @@ -647,23 +664,24 @@ function printDiv(divName) { - - - - - - - - - - - + + + + + + + + + + + + - + - + @@ -848,7 +866,7 @@ function printDiv(divName) { - +
diff --git a/public_html/doc/order_list.php b/public_html/doc/order_list.php index 78b471c..c6bcf9a 100644 --- a/public_html/doc/order_list.php +++ b/public_html/doc/order_list.php @@ -16,7 +16,7 @@ else { $time_start = microtime(true); -$APPLYDATE = "20231122000000"; +$APPLYDATE = "20260316000000"; $add_srchquery = ""; $add_query = ""; @@ -55,8 +55,8 @@ order by d_orderdate DESC, m_initial ASC //GROUP BY d_orderdate,d_driveruid //ORDER BY d_orderdate DESC, m_initial ASC -if ($_SESSION['ss_LEVEL'] == 9) $add_subqry = " AND m_uid = '".$_SESSION['ss_UID']."' "; -else $add_subqry = ""; +if ($_SESSION['ss_LEVEL'] == 9) $add_subqry = " m_uid = '".$_SESSION['ss_UID']."' AND d_druid = '".$_SESSION['ss_DRUID']."' "; +else $add_subqry = "(d_druid = m_currentdriver) "; // For Test //$add_subqry = " AND m_uid = '17' "; @@ -64,7 +64,7 @@ else $add_subqry = ""; //total record $query = "SELECT COUNT(*) FROM ( SELECT d_orderdate, m_initial from tbl_daily - INNER JOIN tbl_member ON (d_driveruid = m_uid) ". $add_subqry . " + INNER JOIN tbl_member ON ". $add_subqry . " GROUP BY d_orderdate,d_driveruid ORDER BY d_orderdate DESC, m_initial ASC ) AS ORDERLIST "; @@ -82,12 +82,12 @@ $list_number = $total_count - (($page-1)*$list_count); $start_number = $list_count * ($page-1); $add_query .= " LIMIT $start_number, $INIT_PAGECNT"; -$query = "SELECT d_orderdate, d_driveruid, m_initial,COUNT(*) AS siteno, +$query = "SELECT d_orderdate, d_druid, d_drinitial, COUNT(*) AS siteno, COUNT(CASE WHEN d_status = 'F' then 1 ELSE NULL END) AS nowsiteno, SUM(d_estquantity) AS todayestqty, SUM(d_quantity) AS todayqty FROM tbl_daily - INNER JOIN tbl_member ON (d_driveruid = m_uid) ". $add_subqry . " - GROUP BY d_orderdate,d_driveruid " . $add_allquery . $add_srchquery . $add_query; + INNER JOIN tbl_member ON ". $add_subqry . " + GROUP BY d_orderdate,d_drinitial " . $add_allquery . $add_srchquery . $add_query; //echo "[$query]"; $result=$jdb->nQuery($query, "list error"); @@ -115,7 +115,8 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { //$rt_driver = $jdb->fQuery($qry_driver, "fetch query error"); // tbl_memberhis 에 해당일,해당드라이버가 있는지 확인해서 있으면 update, 없으면 create - $qry_day = "SELECT COUNT(h_uid) FROM tbl_memberhis WHERE h_date = '".$d_orderdate."' AND h_driveruid = '".$d_driveruid."' "; + $qry_day = "SELECT COUNT(h_uid) FROM tbl_memberhis + WHERE h_date = '".$d_orderdate."' AND h_druid = '".$d_druid."' "; $rt_cnt_day = $jdb->rQuery($qry_day, "fetch query error"); @@ -132,7 +133,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Information $qry = "SELECT * FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' AND h_date = '".$d_orderdate."' + WHERE h_druid = '".$d_druid."' AND h_date = '".$d_orderdate."' ORDER BY h_uid DESC LIMIT 1 "; $rt=$jdb->fQuery($qry, "fetch query error"); //echo"$query"; @@ -150,7 +151,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash Out Today $qry_cashouttoday = "SELECT SUM(d_payamount) FROM tbl_daily - WHERE d_driveruid = '".$d_driveruid."' + WHERE d_druid = '".$d_druid."' AND (d_visitdate LIKE '".$d_orderdate."%') AND d_paystatus = 'P' AND d_status = 'F' "; @@ -159,21 +160,21 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash In Today $qry_cashintoday = "SELECT h_balance_in FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; + WHERE h_druid = '".$d_druid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; $cashinTODAY = $jdb->rQuery($qry_cashintoday, "fetch query error"); //echo"[$qry_cashintoday]
"; // Get Cash Retrun Today $qry_cashrttoday = "SELECT h_balance_r FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; + WHERE h_druid = '".$d_druid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; $cashrtTODAY = $jdb->rQuery($qry_cashrttoday, "fetch query error"); //echo"[$qry_cashintoday]
"; // Get Cash Out Total SUM (해당월) $qry_cashout = "SELECT SUM(d_payamount) FROM tbl_daily - WHERE d_driveruid = '".$d_driveruid."' + WHERE d_druid = '".$d_druid."' AND (d_visitdate >= '".$APPLYDATE."' AND d_visitdate < ".$d_orderdate."000000) AND d_paystatus = 'P' AND d_status = 'F' "; @@ -182,7 +183,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash Return Total SUM (해당월) $qry_cashrt = "SELECT SUM(h_balance_r) FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' + WHERE h_druid = '".$d_druid."' AND (h_date >= '".substr($APPLYDATE,0,8)."' AND h_date < $d_orderdate) "; $cashrtSUM = $jdb->rQuery($qry_cashrt, "fetch query error"); @@ -190,7 +191,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash In Total SUM (해당월 ,해당일 포함) $qry_cashin = "SELECT SUM(h_balance_in) FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' + WHERE h_druid = '".$d_druid."' AND (h_date >= '".substr($APPLYDATE,0,8)."' AND h_date < $d_orderdate) "; $cashinSUM = $jdb->rQuery($qry_cashin, "fetch query error"); @@ -212,8 +213,8 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
- - + + @@ -226,7 +227,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { @@ -267,12 +268,13 @@ $(document).ready(function(){ var dateid = $(this).data('dateid'); var modeid = $(this).data('modeid'); var uid = $(this).data('uid'); + var druid = $(this).data('druid'); // AJAX request $.ajax({ url: 'lib/dailyrecord_lib.php', type: 'post', - data: {driverid: driverid, dateid: dateid, modeid: modeid, uid: uid}, + data: {driverid: driverid, dateid: dateid, modeid: modeid, uid: uid, druid: druid}, success: function(response){ // Add response in Modal body $('.modal-content-dailyRecord').html(response); diff --git a/public_html/doc/receipt_list.php b/public_html/doc/receipt_list.php index 437996e..9278c60 100644 --- a/public_html/doc/receipt_list.php +++ b/public_html/doc/receipt_list.php @@ -72,14 +72,30 @@ $getSWHStr = $switched; // ORDER BY tbl_members.m_uid DESC "; if ($searchtype == "D" && $searchDriver) { - $qrySTR = " AND (d.d_driveruid = '".$searchDriver."') "; + $qrySTR = " AND (d.d_druid = '".$searchDriver."') "; } if ($_SESSION['ss_LEVEL'] == 9) { - $qrySTR = " AND (d.d_driveruid = '".$_SESSION['ss_UID']."') "; + $qrySTR = " AND (d.d_druid = '".$_SESSION['ss_DRUID']."') "; } +// Get Driver Info +$qry_dr = "SELECT * FROM tbl_driver WHERE dr_status = 'A' ORDER by dr_initial ASC "; +$rt_dr = $jdb->nQuery($qry_dr, "list error"); + +while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) { + + if ($lt_dr['dr_uid'] == $searchDriver) $selectStr = "selected"; + else $selectStr = ""; + + $c_driveruidSTR .= " + "; + +} + + + // Account Status $cstatus = 'T'; @@ -184,7 +200,8 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { - + + + diff --git a/public_html/doc/report_daily.php b/public_html/doc/report_daily.php index 275d57a..707d302 100644 --- a/public_html/doc/report_daily.php +++ b/public_html/doc/report_daily.php @@ -17,18 +17,21 @@ else { //echo "





[$startYearMonth]"; $startYearMonth = str_replace("-", "", trim($startYearMonth)); +$startYear = substr($startYearMonth,0,4); if ($startYearMonth =="") $startYearMonth = date("Ym"); + //total record -$query = "SELECT COUNT(m_uid) FROM tbl_member WHERE m_level = 9 AND m_status = 'A' "; +$query = "SELECT COUNT(dr_uid) FROM tbl_driver WHERE dr_status != 'H' "; $driver_cnt=$jdb->rQuery($query, "record query error"); // Get Driver Info -$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; +$qry_driver = "SELECT * FROM tbl_driver WHERE dr_status != 'H' ORDER by dr_initial ASC "; $rt_driver = $jdb->nQuery($qry_driver, "list error"); $driverArray = array(); +$driverArrayMon = array(); $driverCnt = 0; $weekly_data = array(); @@ -43,19 +46,42 @@ $titleSTR = " $title2STR = ""; - +echo "



"; while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { - $driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']); - $driverArray += $driverArrayTmp; - - $titleSTR .= ""; - - $title2STR .= " - - "; - $driverCnt++; + $qry_sumqty = "SELECT sum(rdd_quantity) + FROM tbl_report_daily_driver WHERE rdd_druid = '".$lt_driver['dr_uid']."' AND rdd_orderdate LIKE '".$startYearMonth."%' "; + $rt_sumqty = $jdb->rQuery($qry_sumqty, "list error"); + +//echo "[OUT][".$lt_driver['dr_initial']."][$rt_sumqty][".$lt_driver['dr_status']."]
"; + + if ((int)$rt_sumqty > 0 ) { //|| $lt_driver['dr_status'] == 'A' + $driverArrayTmp = array($lt_driver['dr_uid'] => $lt_driver['dr_initial']); + $driverArray += $driverArrayTmp; + + $titleSTR .= ""; + + $title2STR .= " + + "; + + $driverCnt++; +//echo "[###IN][".$lt_driver['dr_initial']."][$rt_sumqty][".$lt_driver['dr_status']."]
"; + } + + $qry_summon = "SELECT sum(rdd_quantity) + FROM tbl_report_daily_driver WHERE rdd_druid = '".$lt_driver['dr_uid']."' AND rdd_orderdate LIKE '".$startYear."%' "; + $rt_summon = $jdb->rQuery($qry_summon, "list error"); + +//echo "[OUT][".$lt_driver['dr_initial']."][".$lt_driver['dr_uid']."][$rt_summon][".$lt_driver['dr_status']."]
"; + + if ((int)$rt_summon > 0 ) { //|| $lt_driver['dr_status'] == 'A' + $driverArrayMonTmp = array($lt_driver['dr_uid'] => $lt_driver['dr_initial']); + $driverArrayMon += $driverArrayMonTmp; +//echo "[###IN][".$lt_driver['dr_initial']."][".$lt_driver['dr_uid']."][$rt_summon][".$lt_driver['dr_status']."]
"; + } +//echo "[$qry_summon]

"; } $titleSTR .= "\n"; @@ -76,17 +102,17 @@ for ($dday = 1; $dday <= $getLastday; $dday ++) { foreach ($driverArray as $kkey => $vvalue) { - $qry = "SELECT rd_quantity, rd_visit, rd_call - FROM tbl_report_daily - WHERE rd_driveruid = '$kkey' AND rd_orderdate = '".$startYearMonth.$ddaytmp."' " ; + $qry = "SELECT rdd_quantity, rdd_visit, rdd_call + FROM tbl_report_daily_driver + WHERE rdd_druid = '$kkey' AND rdd_orderdate = '".$startYearMonth.$ddaytmp."' " ; $rt = $jdb->fQuery($qry, "list error"); //echo "[$qry]
"; if ($rt[0] != "") { - $day_quantity = $rt['rd_quantity']; - $day_visit = $rt['rd_visit']; - $day_call = $rt['rd_call']; + $day_quantity = $rt['rdd_quantity']; + $day_visit = $rt['rdd_visit']; + $day_call = $rt['rdd_call']; } else { $day_quantity = ""; $day_visit = ""; @@ -157,8 +183,8 @@ for ($dday = 1; $dday <= $getLastday; $dday ++) { $rowMSTR = ""; foreach ($driverArray as $kkey => $vvalue) { - $qry_sum = "select sum(rd_quantity) AS quantity, sum(rd_visit) AS visitno, sum(rd_call) AS callno - FROM tbl_report_daily WHERE rd_driveruid = '".$kkey."' AND rd_orderdate LIKE '".$startYearMonth."%' "; + $qry_sum = "select sum(rdd_quantity) AS quantity, sum(rdd_visit) AS visitno, sum(rdd_call) AS callno + FROM tbl_report_daily_driver WHERE rdd_druid = '".$kkey."' AND rdd_orderdate LIKE '".$startYearMonth."%' "; $rt_sum = $jdb->fQuery($qry_sum, "list error"); //echo "[$qry_sum]
"; $rowMSTR .= ""; @@ -171,7 +197,7 @@ $rowMSTR .= "\n"; // Get Last year Title $rowLastTSTR = ""; -foreach ($driverArray as $kkey => $vvalue) { +foreach ($driverArrayMon as $kkey => $vvalue) { $rowLastTSTR .= "\n"; @@ -195,11 +221,11 @@ for ($mmonth = 1; $mmonth <= 12; $mmonth ++) { $rowLastSTR .= ""; - foreach ($driverArray as $kkey => $vvalue) { + foreach ($driverArrayMon as $kkey => $vvalue) { - $qry_m = "SELECT SUM(rd_quantity) AS quantity, SUM(rd_call) AS callno, SUM(rd_visit) AS visitno - FROM tbl_report_daily - WHERE rd_orderdate LIKE '".$lastYear.$mmonthtmp."%' AND rd_driveruid = '$kkey'"; + $qry_m = "SELECT SUM(rdd_quantity) AS quantity, SUM(rdd_call) AS callno, SUM(rdd_visit) AS visitno + FROM tbl_report_daily_driver + WHERE rdd_orderdate LIKE '".$lastYear.$mmonthtmp."%' AND rdd_druid = '$kkey'"; $rt_m = $jdb->fQuery($qry_m, "list error"); diff --git a/public_html/doc/report_daily_2024.php b/public_html/doc/report_daily_2024.php new file mode 100644 index 0000000..fdd7e5f --- /dev/null +++ b/public_html/doc/report_daily_2024.php @@ -0,0 +1,918 @@ +checkLevelModal(9); + +// (Admin : 1, Staff : 5, Accounting : 6, Driver : 9 ) +$permit = array("1", "3", "5", "6", "7", "9"); +if (in_array($_SESSION['ss_LEVEL'], $permit)) { + $setTag = "ENABLED"; +} +else { + $setTag = "DISABLED"; + $msg = "Sorry, You don't have permission. Please contact Administrator."; + $func -> modalMsg ($msg, "/index_intranet.php"); + exit(); +} + +//echo "





[$startYearMonth]"; + +$startYearMonth = str_replace("-", "", trim($startYearMonth)); + +if ($startYearMonth =="") { + //$startYearMonth = date("Ym"); + $date = new DateTime('2023-12-31'); + $startYearMonth = $date->format('Ym'); +} + +//total record +$query = "SELECT COUNT(m_uid) FROM tbl_member WHERE m_level = 9 AND m_status = 'A' "; +$driver_cnt=$jdb->rQuery($query, "record query error"); + +// Get Driver Info +$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; +$rt_driver = $jdb->nQuery($qry_driver, "list error"); + +$driverArray = array(); +$driverCnt = 0; + +$weekly_data = array(); + +$getLastday = date('t', strtotime($startYearMonth."10")); + +//echo "[$startYearMonth][$getLastday]
"; + +$titleSTR = " + "; + +$title2STR = " + + "; + +while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { + $driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']); + $driverArray += $driverArrayTmp; + + $titleSTR .= ""; + + $title2STR .= " + + "; + + $driverCnt++; + +} + +$titleSTR .= "\n"; +$title2STR .= "\n"; + +//var_dump($driverArray); + +// Daily Count +for ($dday = 1; $dday <= $getLastday; $dday ++) { + + $ddaytmp = sprintf("%02d", $dday); + + $getWeekday = date('D', strtotime($startYearMonth.$ddaytmp)); + $getWeekNoday = date('w', strtotime($startYearMonth.$ddaytmp)); + + $rowSTR .= " + "; + + foreach ($driverArray as $kkey => $vvalue) { + + $qry = "SELECT rd_quantity, rd_visit, rd_call + FROM tbl_report_daily + WHERE rd_driveruid = '$kkey' AND rd_orderdate = '".$startYearMonth.$ddaytmp."' " ; + $rt = $jdb->fQuery($qry, "list error"); + + //echo "[$qry]
"; + + if ($rt[0] != "") { + $day_quantity = $rt['rd_quantity']; + $day_visit = $rt['rd_visit']; + $day_call = $rt['rd_call']; + } else { + $day_quantity = ""; + $day_visit = ""; + $day_call = ""; + } + + $weekly_data[] = [$kkey,$day_quantity,$day_visit, $day_call]; + + + $rowSTR .= ""; + + $day_total += (int)$day_quantity; + + } + +//print_r ($weekly_data); + + + + $rowSTR .= "\n"; + + $day_total = 0; + + $weekly_quantity = array(); + $weekly_visit = array(); + $weekly_call = array(); + + // if $getWeekNoday == 0 ̸ stop ϰ weekly sum + if ($getWeekNoday == 0 || $dday == $getLastday) { + + $cntcnt = 1; + foreach($weekly_data as $key => $value) { + if(is_array($value)) { + + foreach ($driverArray as $kkey => $vvalue) { + if ($value[0] == $kkey) { + $weekly_quantity[$kkey] = $weekly_quantity[$kkey] + (int)$value[1]; + $weekly_visit[$kkey] = $weekly_visit[$kkey] + (int)$value[2]; + $weekly_call[$kkey] = $weekly_call[$kkey] + (int)$value[3]; + } + } + + } + } + + $rowSTR .= " + "; + foreach ($driverArray as $kkey => $vvalue) { + $rowSTR .= ""; + } + + $rowSTR .= "\n"; + + + //print_r ($weekly_visit); + unset($weekly_data); + unset($weekly_quantity); + unset($weekly_visit); + unset($weekly_call); + + //break; + } +} + + + +// Get This Month Total Data +$rowMSTR = " + "; +foreach ($driverArray as $kkey => $vvalue) { + $qry_sum = "select sum(rd_quantity) AS quantity, sum(rd_visit) AS visitno, sum(rd_call) AS callno + FROM tbl_report_daily WHERE rd_driveruid = '".$kkey."' AND rd_orderdate LIKE '".$startYearMonth."%' "; + $rt_sum = $jdb->fQuery($qry_sum, "list error"); + //echo "[$qry_sum]
"; + $rowMSTR .= ""; + +} +$rowMSTR .= "\n"; + + + +// Get Last year Title +$rowLastTSTR = ""; + +foreach ($driverArray as $kkey => $vvalue) { + $rowLastTSTR .= " + + \n"; +} +$rowLastTSTR .= "\n"; + + + +// Get Last year Data +//$lastYear = date('Y', strtotime('last year')); // Last Year +$lastYear = substr($startYearMonth,0,4); +//$lastYear = "2023"; + +for ($mmonth = 1; $mmonth <= 12; $mmonth ++) { + + $month_quantity_total = 0; + $month_visit_total = 0; + $month_call_total = 0; + + $mmonthtmp = sprintf("%02d", $mmonth); + + $rowLastSTR .= ""; + + foreach ($driverArray as $kkey => $vvalue) { + + $qry_m = "SELECT SUM(rd_quantity) AS quantity, SUM(rd_call) AS callno, SUM(rd_visit) AS visitno + FROM tbl_report_daily + WHERE rd_orderdate LIKE '".$lastYear.$mmonthtmp."%' AND rd_driveruid = '$kkey'"; + + $rt_m = $jdb->fQuery($qry_m, "list error"); + + //echo "[$qry]
"; + + if ($rt_m[0] != "") { + $month_quantity = $rt_m['quantity']; + $month_visit = $rt_m['visitno']; + $month_call = $rt_m['callno']; + } else { + $month_quantity = ""; + $month_visit = ""; + $month_call = ""; + } + + $month_quantity_total += (int)$month_quantity; + $month_visit_total += (int)$month_visit; + $month_call_total += (int)$month_call; + + $rowLastSTR .= ""; + + } + + $rowLastSTR .= "\n"; + +} + +$startYearMonthTmp = substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2); + +?> + + + + + + + + + + + + +
+ + +
+
+ +
+

DAILY QUANTITY REPORT (~ 2023)

+
    +
  1. HOME
    2. +
  2. REPORT
    3. +
  3. DAILY QUANTITY REPORT
    4. +
+
+ +
+
+ +
+ + +
+ +
+
+ + + +
PeriodSludge P. Cycle AddressDriverRegionDriver 1M 2M 3M$d_paymenttype $d_rate $d_addressSTR$d_region $d_citySTR $d_lastpickupquantity $d_estquantitySTR
No Data
No Data
No OptionRestaurant NameAccountContainerPaymentRateAddressCityLast Qty.Forecast(L)Actual(L)Last PaidRestaurant NameAccountContainerPaymentRateAddressRegionCityLast Qty.Forecast(L)Actual(L)Last Paid CycleLast PULast PU Next PUDetailDetail
$list_number$d_orderdateSTR$m_initial$d_orderdateSTR$d_drinitial $siteno $h_departuretime $h_arrivaltime$balance $h_balance_g - $max_nameSTR $max_accountnoSTR $max_addressSTR".$rt_dvr['m_initial']."".$d_region."".$d_drinitial." $d_quantity $d_payamount @@ -212,7 +229,7 @@ if( $total_count < 1 ) { "; } - +/* // Get Driver Info $qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; $rt_driver = $jdb->nQuery($qry_driver, "list error"); @@ -223,9 +240,11 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { else $selectStr = ""; $c_driveruidSTR .= " - "; + "; } +*/ + @@ -420,6 +439,7 @@ function goSearch(f){ Restaurant Name Account AddressRegion Driver Oil Qty. Paid
".$lt_driver['m_initial']."VolumeVisitCall".$lt_driver['dr_initial']."VolumeVisitCallTotal
TOTAL".number_format(floatval($rt_sum['quantity']))."".$rt_sum['visitno']."".$rt_sum['callno']."
Month".$vvalue." Calls Visit
".$lastYear."-".$mmonthtmp."
".$lt_driver['m_initial']."VolumeVisitCallTotal
(L)
".substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2)."-".$ddaytmp."".$getWeekday."".number_format(floatval($day_quantity))."$day_visit$day_call".number_format($day_total)."
".number_format(floatval($weekly_quantity[$kkey]))."".$weekly_visit[$kkey]."".$weekly_call[$kkey]."
TOTAL".number_format(floatval($rt_sum['quantity']))."".$rt_sum['visitno']."".$rt_sum['callno']."
Month".$vvalue."CallsVisitTotal(L)
".$lastYear."-".$mmonthtmp."".number_format(floatval($month_quantity))."$month_call$month_visit".number_format($month_quantity_total)."
+ + + + + + + +
+ + + + + +
+ + + + + + + + +
+ +
+ + +
+
+ + +
+

Driver's Daily Pickup Amount

+ +
+ + + + + + + + + + + + + + +
+
+
+ + +
+

Monthly Pickup Total for

+ +
+ + + + + + + + + + +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/public_html/doc/report_expense.php b/public_html/doc/report_expense.php index 95dc6e5..0e7cac3 100644 --- a/public_html/doc/report_expense.php +++ b/public_html/doc/report_expense.php @@ -16,7 +16,7 @@ else { -$APPLYDATE = "20231122000000"; +$APPLYDATE = "20260316000000"; $add_srchquery = ""; $add_query = ""; @@ -62,21 +62,7 @@ if ($startYear == "" || $startMonth == "") { $startYear = date('Y'); $startMonth = date('m'); } -// ---- cutoff_date 계산 (Balance 기준일) ---- -$selectedYM = $startYear . '-' . $startMonth; -$nowYM = date('Y-m'); -if ($selectedYM == $nowYM) { - $cutoff_ymd = date('Ymd'); // 이번달 조회면 "오늘" -} else { - // 그 달 말일 - $cutoff_ymd = date('Ymd', strtotime($startYear . '-' . $startMonth . '-01 last day of this month')); -} - -$apply_ymd = substr($APPLYDATE, 0, 8); // '20231122' -$cutoff_visit_to = $cutoff_ymd . "235959"; // tbl_daily용 (방문일 datetime) - -// if ($searchDriver == "") $searchDriver = "ALL"; if ($startYear != "" && $startMonth != "") $add_subqry = " AND (d_orderdate LIKE '$startYear$startMonth%') "; @@ -89,9 +75,9 @@ if ($searchDriver != "") { $add_dsubqry .= ""; } else { - $add_subqry .= " AND m_uid = '".$searchDriver."' "; - $add_hsubqry .= " AND h_driveruid = '".$searchDriver."' "; - $add_dsubqry .= " AND d_driveruid = '".$searchDriver."' "; + $add_subqry .= " AND m_currentdriver = '".$searchDriver."' "; + $add_hsubqry .= " AND h_druid = '".$searchDriver."' "; + $add_dsubqry .= " AND d_druid = '".$searchDriver."' "; } } else { @@ -105,9 +91,9 @@ else { //total record $query = "SELECT COUNT(*) FROM ( SELECT d_orderdate, m_initial from tbl_daily - INNER JOIN tbl_member ON (d_driveruid = m_uid) + INNER JOIN tbl_member ON (d_druid = m_currentdriver) WHERE d_orderdate >= '".substr($APPLYDATE,0,8)."' AND d_orderdate <= '".date('Ymd')."' ". $add_subqry . " - GROUP BY d_orderdate,d_driveruid + GROUP BY d_orderdate,d_druid ORDER BY d_orderdate DESC, m_initial ASC ) AS ORDERLIST "; @@ -124,11 +110,11 @@ $list_number = $total_count - (($page-1)*$list_count); $start_number = $list_count * ($page-1); $add_query .= " LIMIT $start_number, $INIT_PAGECNT"; -$query = "SELECT d_orderdate, d_driveruid, m_initial +$query = "SELECT d_orderdate, d_druid, m_initial FROM tbl_daily - INNER JOIN tbl_member ON (d_driveruid = m_uid) + INNER JOIN tbl_member ON (d_druid = m_currentdriver) WHERE d_orderdate >= '".substr($APPLYDATE,0,8)."' AND d_orderdate <= '".date('Ymd')."' ". $add_subqry . " - GROUP BY d_orderdate,d_driveruid " . $add_allquery . $add_srchquery . $add_query; + GROUP BY d_orderdate,d_druid " . $add_allquery . $add_srchquery . $add_query; //echo "[$query]"; $result=$jdb->nQuery($query, "list error"); @@ -156,7 +142,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { //$rt_driver = $jdb->fQuery($qry_driver, "fetch query error"); // tbl_memberhis 에 해당일,해당드라이버가 있는지 확인해서 있으면 update, 없으면 create - $qry_day = "SELECT COUNT(h_uid) FROM tbl_memberhis WHERE h_date = '".$d_orderdate."' AND h_driveruid = '".$d_driveruid."' "; + $qry_day = "SELECT COUNT(h_uid) FROM tbl_memberhis WHERE h_date = '".$d_orderdate."' AND h_druid = '".$d_druid."' "; $rt_cnt_day = $jdb->rQuery($qry_day, "fetch query error"); @@ -173,7 +159,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Information $qry = "SELECT * FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' AND h_date = '".$d_orderdate."' + WHERE h_druid = '".$d_druid."' AND h_date = '".$d_orderdate."' ORDER BY h_uid DESC LIMIT 1 "; $rt=$jdb->fQuery($qry, "fetch query error"); //echo"$query"; @@ -191,7 +177,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash Out Today $qry_cashouttoday = "SELECT SUM(d_payamount) FROM tbl_daily - WHERE d_driveruid = '".$d_driveruid."' + WHERE d_druid = '".$d_druid."' AND (d_visitdate LIKE '".$d_orderdate."%') AND d_paystatus = 'P' AND d_status = 'F' "; @@ -200,21 +186,21 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash In Today $qry_cashintoday = "SELECT h_balance_in FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; + WHERE h_druid = '".$d_druid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; $cashinTODAY = $jdb->rQuery($qry_cashintoday, "fetch query error"); //echo"[$qry_cashintoday]
"; // Get Cash Retrun Today $qry_cashrttoday = "SELECT h_balance_r FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; + WHERE h_druid = '".$d_druid."' AND (h_date = $d_orderdate) ORDER BY h_uid DESC LIMIT 1 "; $cashrtTODAY = $jdb->rQuery($qry_cashrttoday, "fetch query error"); //echo"[$qry_cashintoday]
"; // Get Cash Out Total SUM (해당월) $qry_cashout = "SELECT SUM(d_payamount) FROM tbl_daily - WHERE d_driveruid = '".$d_driveruid."' + WHERE d_druid = '".$d_druid."' AND (d_visitdate >= '".$APPLYDATE."' AND d_visitdate < ".$d_orderdate."000000) AND d_paystatus = 'P' AND d_status = 'F' "; @@ -223,7 +209,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash Return Total SUM (해당월) $qry_cashrt = "SELECT SUM(h_balance_r) FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' + WHERE h_druid = '".$d_druid."' AND (h_date >= '".substr($APPLYDATE,0,8)."' AND h_date < $d_orderdate) "; $cashrtSUM = $jdb->rQuery($qry_cashrt, "fetch query error"); @@ -231,7 +217,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { // Get Cash In Total SUM (해당월 ,해당일 포함) $qry_cashin = "SELECT SUM(h_balance_in) FROM tbl_memberhis - WHERE h_driveruid = '".$d_driveruid."' + WHERE h_druid = '".$d_druid."' AND (h_date >= '".substr($APPLYDATE,0,8)."' AND h_date < $d_orderdate) "; $cashinSUM = $jdb->rQuery($qry_cashin, "fetch query error"); @@ -287,7 +273,7 @@ $qry_sum = "SELECT SUM(h_balance_r) AS CASHRETURNSUM, SUM(h_balance_g) AS GASSUM FROM tbl_memberhis - WHERE h_date LIKE '".$startYear.$startMonth."%' ". $add_hsubqry + WHERE h_date >= '".substr($APPLYDATE,0,8)."' AND h_date LIKE '".$startYear.$startMonth."%' ". $add_hsubqry ; //echo "LIST_TOT[$qry_sum]
"; $rt_sum = $jdb->fQuery($qry_sum, "fetch query error"); @@ -298,71 +284,30 @@ $getGASSUM = number_format(floatval($rt_sum['GASSUM']), 2, '.', ','); // Get Cash Out SUM $qry_cashouttoday = "SELECT SUM(d_payamount) FROM tbl_daily - WHERE (d_visitdate LIKE '".$startYear.$startMonth."%' ) + WHERE d_orderdate >= '".substr($APPLYDATE,0,8)."' AND (d_visitdate LIKE '".$startYear.$startMonth."%' ) " . $add_dsubqry . " AND d_paystatus = 'P' AND d_status = 'F' "; $getCASHOUTSUM = $jdb->rQuery($qry_cashouttoday, "fetch query error"); $getCASHOUTSUM = number_format(floatval($getCASHOUTSUM), 2, '.', ','); - -// ---- Total Balance (as of cutoff) 계산 ---- -// Cash In (누적) -$qry_total_in = "SELECT SUM(h.h_balance_in) - FROM tbl_memberhis h - INNER JOIN tbl_member m ON (h.h_driveruid = m.m_uid) - WHERE m.m_level = 9 - AND m.m_status = 'A' - AND h.h_date >= '".$apply_ymd."' - AND h.h_date <= '".$cutoff_ymd."' - ".$add_hsubqry; -$total_in = $jdb->rQuery($qry_total_in, "fetch query error"); - -// Cash Return (누적) -$qry_total_rt = "SELECT SUM(h_balance_r) - FROM tbl_memberhis h - INNER JOIN tbl_member m ON (h.h_driveruid = m.m_uid) - WHERE m.m_level = 9 - AND m.m_status = 'A' - AND h.h_date >= '".$apply_ymd."' - AND h.h_date <= '".$cutoff_ymd."' - ".$add_hsubqry; -$total_rt = $jdb->rQuery($qry_total_rt, "fetch query error"); - -// Cash Out (누적) ※ d_visitdate 는 ymdHis 이라 cutoff는 235959까지 -$qry_total_out = "SELECT SUM(d.d_payamount) - FROM tbl_daily d - INNER JOIN tbl_member m ON (d.d_driveruid = m.m_uid) - WHERE m.m_level = 9 - AND m.m_status = 'A' - AND d.d_visitdate >= '".$APPLYDATE."' - AND d.d_visitdate <= '".$cutoff_visit_to."' - ".$add_dsubqry." - AND d.d_paystatus = 'P' - AND d.d_status = 'F'"; - -$total_out = $jdb->rQuery($qry_total_out, "fetch query error"); - -// Total Balance = In - Return - Out -$getTOTALBALANCE = floatval($total_in) - floatval($total_rt) - floatval($total_out); -$getTOTALBALANCE = number_format($getTOTALBALANCE, 2, '.', ','); -// Get Driver Info -$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; -$rt_driver = $jdb->nQuery($qry_driver, "list error"); + + +// Get Driver Info +$qry_dr = "SELECT * FROM tbl_driver WHERE dr_status = 'A' ORDER by dr_initial ASC "; +$rt_dr = $jdb->nQuery($qry_dr, "list error"); + $c_driveruidSTR = " "; - -while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { - if ($lt_driver['m_uid'] == $searchDriver) { - $selectStr = "selected"; - $getDriverInitial = $lt_driver['m_initial']; - } +while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) { + + if ($lt_dr['dr_uid'] == $searchDriver) $selectStr = "selected"; else $selectStr = ""; $c_driveruidSTR .= " - "; + "; } @@ -372,7 +317,7 @@ if ($searchDriver == "ALL") $getDriverInitial = "ALL"; // 년, 월 표시 로직 -for($i='2023'; $i<=date('Y'); $i++) { +for($i='2026'; $i<=date('Y'); $i++) { if ($i == $startYear) $setTmp = "selected"; else if ($startYear == "" && $i == date('Y')) { $setTmp = "selected"; @@ -472,7 +417,6 @@ addLog ("add", "EXPENSE LIST", "VIEW", $lguserid, $query, $lgno); 		CASH IN CASH OUT CASH RETURNBALANCE GAS
diff --git a/public_html/doc/report_iscccorsia.php b/public_html/doc/report_iscccorsia.php index 675150e..d149bb1 100644 --- a/public_html/doc/report_iscccorsia.php +++ b/public_html/doc/report_iscccorsia.php @@ -37,11 +37,12 @@ for($ii=2021; $ii<= date("Y"); $ii++) { //total record -$query = "SELECT COUNT(m_uid) FROM tbl_member WHERE m_level = 9 AND m_status = 'A' "; +$query = "SELECT COUNT(m_uid) FROM tbl_member WHERE m_level = 9 AND m_status = 'A' AND m_regionuid != '' "; $driver_cnt=$jdb->rQuery($query, "record query error"); // Get Driver Info -$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; +$qry_driver = "SELECT * FROM tbl_member + WHERE m_level = 9 AND m_status = 'A' AND m_regionuid != '' ORDER by m_region ASC "; $rt_driver = $jdb->nQuery($qry_driver, "list error"); $driverArray = array(); @@ -59,10 +60,10 @@ $titleSTR = " "; while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { - $driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']); + $driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_region']); $driverArray += $driverArrayTmp; - $titleSTR .= "".$lt_driver['m_initial'].""; + $titleSTR .= "".$lt_driver['m_region'].""; } $titleSTR .= "TOTAL%"; @@ -90,15 +91,16 @@ for ($mmonth = 1; $mmonth <= 12; $mmonth ++) { ///////////////// // ISCC Data ///////////////// - $qry_eu = "SELECT - SUM(CASE WHEN d_visitdate like '".$startYearMonth."%' THEN d_quantity ELSE 0 END) AS EUDATA - FROM tbl_daily - WHERE d_customeruid != '' AND d_status = 'F' - AND (d_customeruid IN (SELECT c.c_uid FROM tbl_customer c WHERE c.c_driveruid = '".$kkey."' ". $status_query. ")) - AND d_form_eu != '' AND d_form_eu <= d_orderdate "; - //echo "




EU[$qry_eu]
"; + + //$qry_eu = "SELECT + // SUM(CASE WHEN d_visitdate like '".$startYearMonth."%' THEN d_quantity ELSE 0 END) AS EUDATA + // FROM tbl_daily + // WHERE d_customeruid != '' AND d_status = 'F' + // AND (d_customeruid IN (SELECT c.c_uid FROM tbl_customer c WHERE c.c_driveruid = '".$kkey."' ". $status_query. ")) + // AND d_form_eu != '' AND d_form_eu <= d_orderdate "; + //echo "




EU[$qry_eu]
"; //$rt_eu = $jdb->fQuery($qry_eu, "fetch query error"); - $EUDataSTR .= "".number_format(floatval($rt_eu['EUDATA'])).""; + //$EUDataSTR .= "".number_format(floatval($rt_eu['EUDATA'])).""; $qry_sum = "select sum(rd_quantity) AS quantity_uco, sum(rd_quantity_iscc) AS quantity_iscc, sum(rd_quantity_corsia) AS quantity_corsia diff --git a/public_html/doc/report_monthly.php b/public_html/doc/report_monthly.php index a8467ab..dbcd376 100644 --- a/public_html/doc/report_monthly.php +++ b/public_html/doc/report_monthly.php @@ -25,11 +25,12 @@ if ($startYearMonth =="") { } //total record -$query = "SELECT COUNT(m_uid) FROM tbl_member WHERE m_level = 9 AND m_status = 'A' "; +$query = "SELECT COUNT(m_uid) FROM tbl_member WHERE m_level = 9 AND m_status = 'A' AND m_regionuid != '' "; $driver_cnt=$jdb->rQuery($query, "record query error"); // Get Driver Info -$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; +$qry_driver = "SELECT * FROM tbl_member + WHERE m_level = 9 AND m_status = 'A' AND m_regionuid != '' ORDER by m_region ASC "; $rt_driver = $jdb->nQuery($qry_driver, "list error"); $driverArray = array(); @@ -47,10 +48,10 @@ $titleSTR = " "; while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { - $driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']); + $driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_region']); $driverArray += $driverArrayTmp; - $titleSTR .= "".$lt_driver['m_initial'].""; + $titleSTR .= "".$lt_driver['m_region'].""; } $titleSTR .= "\n"; @@ -208,11 +209,11 @@ function goSearch(f){
-

MONTHLY DRIVERS REPORT

+

MONTHLY AREA REPORT

  1. HOME
  2. REPORT
    3. -
  3. MONTHLY DRIVERS REPORT
    4. +
  4. MONTHLY AREA REPORT
@@ -252,7 +253,7 @@ function goSearch(f){
-

Monthly Drivers Report ()

+

Monthly Area Report ()

@@ -425,7 +426,7 @@ function goSearch(f){ //height: 400, bar: {groupWidth: "60%"}, legend: { position: "none" }, - hAxis: {title: 'Driver', titleTextStyle: {color: 'black'}}, + hAxis: {title: 'Area', titleTextStyle: {color: 'black'}}, vAxis: {title: 'Volume (Mton)', titleTextStyle: {color: 'black'}} }; var chart = new google.visualization.ColumnChart(document.getElementById("columnchart_values")); @@ -472,7 +473,7 @@ function goSearch(f){ //height: 400, bar: {groupWidth: "60%"}, legend: { position: "none" }, - hAxis: {title: 'Driver', titleTextStyle: {color: 'black'}}, + hAxis: {title: 'Area', titleTextStyle: {color: 'black'}}, vAxis: {title: 'Total Visits', titleTextStyle: {color: 'black'}} }; var chart = new google.visualization.ColumnChart(document.getElementById("columnchart_visit_values")); diff --git a/public_html/doc/report_monthly_2024.php b/public_html/doc/report_monthly_2024.php new file mode 100644 index 0000000..7d18abd --- /dev/null +++ b/public_html/doc/report_monthly_2024.php @@ -0,0 +1,526 @@ +checkLevelModal(9); + +// 기능 제한 (Admin : 1, Staff : 5, Accounting : 6, Driver : 9 만 가능) +$permit = array("1", "3", "5", "6", "7", "9"); +if (in_array($_SESSION['ss_LEVEL'], $permit)) { + $setTag = "ENABLED"; +} +else { + $setTag = "DISABLED"; + $msg = "Sorry, You don't have permission. Please contact Administrator."; + $func -> modalMsg ($msg, "/index_intranet.php"); + exit(); +} + +//echo "





[$startYearMonth][$tmp]"; + +$startYearMonth = str_replace("-", "", trim($startYearMonth)); + +if ($startYearMonth =="") { + //$startYearMonth = date("Ym"); + $date = new DateTime('2023-12-31'); + $startYearMonth = $date->format('Ym'); +} + +//total record +$query = "SELECT COUNT(m_uid) FROM tbl_member WHERE m_level = 9 AND m_status = 'A' "; +$driver_cnt=$jdb->rQuery($query, "record query error"); + +// Get Driver Info +$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 AND m_status = 'A' ORDER by m_initial ASC "; +$rt_driver = $jdb->nQuery($qry_driver, "list error"); + +$driverArray = array(); +$driverCnt = 0; + +$weekly_data = array(); + +$getLastday = date('t', strtotime($startYearMonth."10")); + +//echo "[$startYearMonth][$getLastday]
"; + +// Get Driver with Title +$titleSTR = " + + "; + +while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { + $driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']); + $driverArray += $driverArrayTmp; + + $titleSTR .= "".$lt_driver['m_initial'].""; +} + +$titleSTR .= "\n"; + + +// Get Oil Quantity +$rowOilSTR = " + Oil Pickup Volumes(L)"; +$rowOilTonSTR = " + (Mton)"; +$rowVisitSTR = " + # of Account Visits"; +$rowAccountSTR = " + Total Accounts"; +$EUDataSTR = " + ISCC Oil Volumes"; +$rowNewSTR = " + Total Contracts"; + + +$colorArray = array("#3366CC","#DC3912"); + +// Account Status +// cstatus => A : Active, I : Inactive, T : Total +$cstatus = 'T'; +if ($cstatus == 'T') $status_query = " AND (c.c_status = 'A' OR c.c_status = 'I') "; +else if ($cstatus == 'I') $status_query = " AND (c.c_status = 'I') "; +else { + $cstatus = 'A'; + $status_query = " AND (c.c_status = 'A') "; +} + +foreach ($driverArray as $kkey => $vvalue) { + +// ISCC Oil Volumes => 새로운 메뉴로 이동 (2025.06.12) +/* + $qry_eu = "SELECT + SUM(CASE WHEN d_visitdate like '".$startYearMonth."%' THEN d_quantity ELSE 0 END) AS EUDATA + FROM tbl_daily + WHERE d_customeruid != '' AND d_status = 'F' + AND (d_customeruid IN (SELECT c.c_uid FROM tbl_customer c WHERE c.c_driveruid = '".$kkey."' ". $status_query. ")) + AND d_form_eu != '' AND d_form_eu <= d_orderdate "; +//echo "




EU[$qry_eu]
"; + $rt_eu = $jdb->fQuery($qry_eu, "fetch query error"); + $EUDataSTR .= "".number_format(floatval($rt_eu['EUDATA'])).""; +*/ + + $qry_sum = "select sum(rd_quantity) AS quantity, sum(rd_visit) AS visitno + FROM tbl_report_daily WHERE rd_driveruid = '".$kkey."' AND rd_orderdate LIKE '".$startYearMonth."%' "; + $rt_sum = $jdb->fQuery($qry_sum, "list error"); + //echo "[$qry_sum]
"; + $rowOilSTR .= "".number_format(floatval($rt_sum['quantity'])).""; + $rowOilTonSTR .= "".number_format(floatval($rt_sum['quantity'])*0.00091068,1).""; + $rowVisitSTR .= "".(int)$rt_sum['visitno'].""; + + $colorSTR = $colorArray[$driverCnt%2]; + + $graphOilTonSTR .= "['".$vvalue."' ,".number_format(floatval($rt_sum['quantity'])*0.00091068,1).", '".$colorSTR."'],"; + $graphVisitSTR .= "['".$vvalue."' ,".(int)$rt_sum['visitno'].", '".$colorSTR."'],"; + + $qry_acc = "select sum(ra_account) AS accountno, sum(ra_accountnew) AS newaccount + FROM tbl_report_account WHERE ra_driveruid = '".$kkey."' AND ra_month ='".$startYearMonth."' "; + $rt_acc = $jdb->fQuery($qry_acc, "list error"); + //echo "[$qry_acc]
"; + $rowAccountSTR .= "".(int)$rt_acc['accountno'].""; + $rowNewSTR .= "".(int)$rt_acc['newaccount'].""; + + $driverCnt++; + +} + +$rowOilSTR .= "\n"; +$rowOilTonSTR .= "\n"; +$EUDataSTR .= "\n"; +$rowVisitSTR .= "\n"; +$rowAccountSTR .= "\n"; +$rowNewSTR .= "\n"; + + +$startYearMonthTmp = substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2); + +?> + + + + + + + + + + + + +
+ + +
+
+ +
+

MONTHLY DRIVERS REPORT (~ 2023)

+
    +
  1. HOME
    2. +
  2. REPORT
    3. +
  3. MONTHLY DRIVERS REPORT
    4. +
+
+ +
+
+ +
+ + +
+ +
+
+ + + + + + + + + + + +
+ + + + + +
+
+
+ +
+
+
+

Monthly Drivers Report ()

+
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + +
+
+
+ + + + + + + + +
+
+
+
+
+

Oil Pickup Volume (Mton)

+
+ +
+ +
+
+
+
+

Total Visits

+
+ +
+ +
+
+ +
+
+ + + +
+ +
diff --git a/public_html/doc/report_monthly_driver.php b/public_html/doc/report_monthly_driver.php new file mode 100644 index 0000000..37572b6 --- /dev/null +++ b/public_html/doc/report_monthly_driver.php @@ -0,0 +1,545 @@ +checkLevelModal(9); + +// 기능 제한 (Admin : 1, Staff : 5, Accounting : 6, Driver : 9 만 가능) +$permit = array("1", "3", "5", "6", "7", "9"); +if (in_array($_SESSION['ss_LEVEL'], $permit)) { + $setTag = "ENABLED"; +} +else { + $setTag = "DISABLED"; + $msg = "Sorry, You don't have permission. Please contact Administrator."; + $func -> modalMsg ($msg, "/index_intranet.php"); + exit(); +} + +//echo "





[$startYearMonth][$tmp]"; + +$startYearMonth = str_replace("-", "", trim($startYearMonth)); + +if ($startYearMonth =="") { + //$startYearMonth = date("Ym"); + $date = new DateTime('PREVIOUS MONTH'); + $startYearMonth = $date->format('Ym'); +} + +//total record +$query = "SELECT COUNT(dr_uid) FROM tbl_driver WHERE dr_status != 'H' "; +$driver_cnt=$jdb->rQuery($query, "record query error"); + +// Get Driver Info +$qry_driver = "SELECT * FROM tbl_driver WHERE dr_status != 'H' ORDER by dr_initial ASC "; +$rt_driver = $jdb->nQuery($qry_driver, "list error"); + + +$driverArray = array(); +$driverCnt = 0; + +$weekly_data = array(); + +$getLastday = date('t', strtotime($startYearMonth."10")); + +//echo "[$startYearMonth][$getLastday]
"; + +// Get Driver with Title +$titleSTR = " + + "; + +while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { + + $qry_sumqty = "SELECT sum(rdd_quantity) + FROM tbl_report_daily_driver WHERE rdd_druid = '".$lt_driver['dr_uid']."' AND rdd_orderdate LIKE '".$startYearMonth."%' "; + $rt_sumqty = $jdb->rQuery($qry_sumqty, "list error"); + + if ((int)$rt_sumqty > 0 ) { //|| $lt_driver['dr_status'] == 'A' + $driverArrayTmp = array($lt_driver['dr_uid'] => $lt_driver['dr_initial']); + $driverArray += $driverArrayTmp; + + $titleSTR .= "".$lt_driver['dr_initial'].""; + } + +} +$titleSTR .= "TOTAL"; +$titleSTR .= "\n"; + + +// Get Oil Quantity +$rowOilSTR = " + Oil Pickup Volumes(L)"; +$rowOilTonSTR = " + (Mton)"; +$rowVisitSTR = " + # of Account Visits"; +$rowAccountSTR = " + Total Accounts"; +$EUDataSTR = " + ISCC Oil Volumes"; +$rowNewSTR = " + Total Contracts"; + + +$colorArray = array("#3366CC","#DC3912"); + +// Account Status +// cstatus => A : Active, I : Inactive, T : Total +$cstatus = 'T'; +if ($cstatus == 'T') $status_query = " AND (c.c_status = 'A' OR c.c_status = 'I') "; +else if ($cstatus == 'I') $status_query = " AND (c.c_status = 'I') "; +else { + $cstatus = 'A'; + $status_query = " AND (c.c_status = 'A') "; +} + +foreach ($driverArray as $kkey => $vvalue) { + +// ISCC Oil Volumes => 새로운 메뉴로 이동 (2025.06.12) +/* + $qry_eu = "SELECT + SUM(CASE WHEN d_visitdate like '".$startYearMonth."%' THEN d_quantity ELSE 0 END) AS EUDATA + FROM tbl_daily + WHERE d_customeruid != '' AND d_status = 'F' + AND (d_customeruid IN (SELECT c.c_uid FROM tbl_customer c WHERE c.c_driveruid = '".$kkey."' ". $status_query. ")) + AND d_form_eu != '' AND d_form_eu <= d_orderdate "; +//echo "




EU[$qry_eu]
"; + $rt_eu = $jdb->fQuery($qry_eu, "fetch query error"); + $EUDataSTR .= "".number_format(floatval($rt_eu['EUDATA'])).""; +*/ + + $qry_sum = "select sum(rdd_quantity) AS quantity, sum(rdd_visit) AS visitno + FROM tbl_report_daily_driver WHERE rdd_druid = '".$kkey."' AND rdd_orderdate LIKE '".$startYearMonth."%' "; + $rt_sum = $jdb->fQuery($qry_sum, "list error"); + //echo "[$qry_sum]
"; + $rowOilSTR .= "".number_format(floatval($rt_sum['quantity'])).""; + $rowOilTonSTR .= "".number_format(floatval($rt_sum['quantity'])*0.00091068,1).""; + $rowVisitSTR .= "".(int)$rt_sum['visitno'].""; + + $colorSTR = $colorArray[$driverCnt%2]; + + $graphOilTonSTR .= "['".trim($vvalue)."' ,".number_format(floatval($rt_sum['quantity'])*0.00091068,1).", '".$colorSTR."'],\n"; + $graphVisitSTR .= "['".trim($vvalue)."' ,".(int)$rt_sum['visitno'].", '".$colorSTR."'],\n"; + + /* + $qry_acc = "select sum(ra_account) AS accountno, sum(ra_accountnew) AS newaccount + FROM tbl_report_account WHERE ra_driveruid = '".$kkey."' AND ra_month ='".$startYearMonth."' "; + $rt_acc = $jdb->fQuery($qry_acc, "list error"); + //echo "[$qry_acc]
"; + $rowAccountSTR .= "".(int)$rt_acc['accountno'].""; + $rowNewSTR .= "".(int)$rt_acc['newaccount'].""; + */ + + $driverCnt++; + +} + +$qry_totsum = "select sum(rdd_quantity) AS totquantity, sum(rdd_visit) AS totvisitno + FROM tbl_report_daily_driver WHERE rdd_druid != '' AND rdd_orderdate LIKE '".$startYearMonth."%' "; +$rt_totsum = $jdb->fQuery($qry_totsum, "list error"); + + +$rowOilSTR .= "".number_format(floatval($rt_totsum['totquantity'])).""; +$rowOilTonSTR .= "".number_format(floatval($rt_totsum['totquantity'])*0.00091068,1).""; +$rowVisitSTR .= "".(int)$rt_totsum['totvisitno'].""; + + +$rowOilSTR .= "\n"; +$rowOilTonSTR .= "\n"; +$EUDataSTR .= "\n"; +$rowVisitSTR .= "\n"; +$rowAccountSTR .= "\n"; +$rowNewSTR .= "\n"; + + +$startYearMonthTmp = substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2); + +?> + + + + + + + + + + + + +
+ + +
+
+ +
+

MONTHLY DRIVERS REPORT

+
    +
  1. HOME
    2. +
  2. REPORT
    3. +
  3. MONTHLY DRIVERS REPORT
    4. +
+
+ +
+
+ +
+ + +
+ +
+
+ + + + + + + + + + + +
+ + + + + +
+
+
+ +
+
+
+

Monthly Drivers Report ()

+
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + +
+
+
+ + + + + + + + +
+
+
+
+
+

Oil Pickup Volume (Mton)

+
+ +
+ +
+
+
+
+

Total Visits

+
+ +
+ +
+
+ +
+
+ + + +
+ +
diff --git a/public_html/include/arrayinfo.php b/public_html/include/arrayinfo.php index 916f4cf..54b9eb8 100644 --- a/public_html/include/arrayinfo.php +++ b/public_html/include/arrayinfo.php @@ -28,7 +28,8 @@ $arrMemberLevel = array ('1' => 'Administrator', '5' => 'Staff', '6' => 'Account $customerArray = array( - "c_accountno"=>"Account No", "c_status"=>"Account Status", "c_name"=>"Restaurant Name", "c_driveruid"=>"Driver", "c_address"=>"Address", + "c_accountno"=>"Account No", "c_status"=>"Account Status", "c_name"=>"Restaurant Name", + "c_driveruid"=>"Region", "m_currentdriverinitial"=>"Current Driver", "c_address"=>"Address", "c_city"=>"City", "c_postal"=>"Postal Code", "c_area"=>"Area", "c_phone"=>"Phone", "c_phoneext"=>"Ext", "c_cell"=>"Cell", "c_rate"=>"Rate", "c_paymenttype"=>"Payment", "c_maincontainer"=>"Main Container", "c_container"=>"Container Detail", "c_location"=>"Container Location", "c_schedule"=>"Pickup Schedule", "c_scheduleday"=>"Pickup Weekday", @@ -43,7 +44,8 @@ $customerArray = array( ); $oilhistoryArray = array( - "c_accountno"=>"Account No", "c_status"=>"Account Status", "c_name"=>"Restaurant Name", "c_driveruid"=>"Driver", "c_address"=>"Address", + "c_accountno"=>"Account No", "c_status"=>"Account Status", "c_name"=>"Restaurant Name", + "c_driveruid"=>"Region", "m_currentdriverinitial"=>"Current Driver", "c_address"=>"Address", "c_city"=>"City", "c_postal"=>"Postal Code", "c_area"=>"Area", "c_phone"=>"Phone", "c_phoneext"=>"Ext", "c_cell"=>"Cell", "c_rate"=>"Rate", "c_paymenttype"=>"Payment", "c_maincontainer"=>"Main Container", "c_container"=>"Container Detail", "c_location"=>"Container Location", "c_schedule"=>"Pickup Schedule", "c_scheduleday"=>"Pickup Weekday", @@ -69,7 +71,7 @@ $orderArray = array( $oilHistorySUMArray = array( - "max_nameSTR"=>"Restaurant Name", "max_accountnoSTR"=>"Account No", "max_driverSTR"=>"Driver", + "max_nameSTR"=>"Restaurant Name", "max_accountnoSTR"=>"Account No", "m_regionSTR"=>"Region", "max_driverSTR"=>"Driver", "max_paymenttype"=>"Payment", "max_rateSTR"=>"Rate", "max_sludgeSTR"=>"Sludge", "max_cycle"=>"Payment Cycle", "max_addressSTR"=>"Address", "get1MonQ"=>"1M", "get2MonQ"=>"2M", "get3MonQ"=>"3M", "get4MonQ"=>"4M", "get2_4MonQ"=>"2-4M", "get1_12MonQ"=>"Yearly" @@ -77,7 +79,7 @@ $oilHistorySUMArray = array( $receiptArray = array( "d_visitdateSTR"=>"Date", "d_nameSTR"=>"Restaurant Name", "d_accountnoSTR"=>"Account No", "d_addressSTR"=>"Address", - "d_driverSTR"=>"Driver", "d_quantity"=>"Oil Quantity", "d_payamount"=>"Paid" + "d_regionSTR"=>"Region", "d_driverSTR"=>"Driver", "d_quantity"=>"Oil Quantity", "d_payamount"=>"Paid" ); $forecastArray = array( diff --git a/public_html/include/top.php b/public_html/include/top.php index c9a2d34..4be8127 100644 --- a/public_html/include/top.php +++ b/public_html/include/top.php @@ -57,11 +57,15 @@ $isCustomerOnly = ($level == 10);
  • REPORT
    • @@ -70,6 +74,7 @@ $isCustomerOnly = ($level == 10); CONFIGURATION diff --git a/public_html/index_intranet.php b/public_html/index_intranet.php index 057dd43..b83fca2 100644 --- a/public_html/index_intranet.php +++ b/public_html/index_intranet.php @@ -35,7 +35,11 @@ else include getenv("DOCUMENT_ROOT")."/doc/customer_list.php"; // Start of footer -include getenv("DOCUMENT_ROOT")."/include/footer.php"; +$no_footer_pages = array("map"); + +if (!in_array($view, $no_footer_pages)) { + include getenv("DOCUMENT_ROOT")."/include/footer.php"; +} ?> @@ -73,7 +77,7 @@ if ($_COOKIE["LOGCHECK"] != "1") { $jdb->nQuery($query, "query error"); } - // IP + // ����� IP ���� $user_ip = $_SERVER["REMOTE_ADDR"]; $referer = $_SERVER["HTTP_REFERER"]; $user_agent = $_SERVER["HTTP_USER_AGENT"]; @@ -137,7 +141,7 @@ if ($_COOKIE["LOGCHECK"] != "1") { $jdb->iQuery("tbl_count_details", $columns, $values); setcookie("LOGCHECK", "1", time()+3600); // 1h - //$_SESSION['ss_LOGCHECK'] = "1"; // ǿ Ѵ. + //$_SESSION['ss_LOGCHECK'] = "1"; // ���ǿ� ������ �����Ѵ�. } diff --git a/public_html/lib/checkinitiallib.php b/public_html/lib/checkinitiallib.php new file mode 100644 index 0000000..d6c9a0e --- /dev/null +++ b/public_html/lib/checkinitiallib.php @@ -0,0 +1,20 @@ +prepare($sql); + $result->execute(); + $number_of_rows = $result->fetchColumn(); + + //$number_of_rows=@$jdb->rQuery($sql, "fetch query error"); + + echo "$number_of_rows"; +} + +//echo "[$query]"; +?> \ No newline at end of file diff --git a/public_html/lib/dailyrecord_lib.php b/public_html/lib/dailyrecord_lib.php index f039f9c..8b8a501 100644 --- a/public_html/lib/dailyrecord_lib.php +++ b/public_html/lib/dailyrecord_lib.php @@ -36,8 +36,9 @@ $h_driveruid = trim($_POST["driverid"]); $h_date = trim($_POST["dateid"]); $h_uid = trim($_POST["uid"]); $mode = trim($_POST["modeid"]); +$h_druid = trim($_POST["druid"]); -if($h_driveruid == "" || $h_date == "" || $mode == "" ) { +if($h_druid == "" || $h_date == "" || $mode == "" ) { $msg = "Invaild data. Please try again. [Err - h_driveruid,h_date,mode / DAILYRECORD]"; $urlSTR = "/index_intranet.php?view=order_list&".$goStr; $func -> modalMsg ($msg, 1); @@ -47,7 +48,7 @@ if($h_driveruid == "" || $h_date == "" || $mode == "" ) { if ($mode == "update") { // Get Information $query = "SELECT * FROM tbl_memberhis - WHERE h_driveruid = '".$h_driveruid."' AND h_date = '".$h_date."' + WHERE h_druid = '".$h_druid."' AND h_date = '".$h_date."' ORDER BY h_uid DESC LIMIT 1 "; $result=$jdb->fQuery($query, "fetch query error"); //echo"$query"; @@ -81,7 +82,7 @@ if($h_driveruid == "" || $h_date == "" || $mode == "" ) { // Get Cash Out SUM $query = "SELECT SUM(d_payamount) FROM tbl_daily - WHERE d_driveruid = '".$h_driveruid."' AND d_visitdate LIKE '".$h_date."%' AND d_paystatus = 'P' AND d_status = 'F' "; + WHERE d_druid = '".$h_druid."' AND d_visitdate LIKE '".$h_date."%' AND d_paystatus = 'P' AND d_status = 'F' "; $dailySUM=$jdb->rQuery($query, "fetch query error"); //echo"$query"; @@ -167,6 +168,7 @@ $(document).ready(function(){ + diff --git a/public_html/lib/driver_lib.php b/public_html/lib/driver_lib.php new file mode 100644 index 0000000..14bb367 --- /dev/null +++ b/public_html/lib/driver_lib.php @@ -0,0 +1,419 @@ +checkAdmin("index.php"); + +$dr_uid = trim($_POST["dr_uid"]); + +//echo "[$dr_uid]";exit; + +if ($dr_uid == "") $mode = "create"; +else $mode = "update"; + +if ($mode == "") $mode = "update"; + +if ($mode == "create") { + $btnName = "CREATE"; +} +else if ($mode == "update") { + $btnName = "UPDATE"; + $admTag = "DISABLED"; +} + +if ($dr_uid != "") { + // Get Information + $query = "SELECT * FROM tbl_driver WHERE dr_uid = '".$dr_uid."' "; + $result=$jdb->fQuery($query, "fetch query error"); + // echo"$query"; + + for($i=0; $i $value ) + $$key = $value; + } + + $dr_firstnameSTR = str_replace("\\", "", $dr_firstname); + $dr_lastnameSTR = str_replace("\\", "", $dr_lastname); + $dr_initialSTR = str_replace("\\", "", $dr_initial); + + $dr_cellSTR = preg_replace('/[^A-Za-z0-9\-]/', '', $dr_cell); + $dr_cellSTR = str_replace("\\", "", $dr_cellSTR); + $dr_cellSTR = str_replace("-", "", $dr_cellSTR); + $dr_cellSTR = substr ($dr_cellSTR, 0, 3)."-".substr ($dr_cellSTR, 3, 3)."-".substr ($dr_cellSTR, 6, 4); + + $dr_createdateSTR = $func -> convertFormat ($dr_createdate, 1); + +} +else $dr_status = 'A'; + + +// Get Status Info +foreach ($arrStatus AS $key=>$value) +{ + //echo "[$key][$value]"; => [0][Waiting][1][Confirmed][E][Declined]... + + if ($key == $dr_status) $selectStr = "selected"; + else $selectStr = ""; + + if ($key != 'F') { + $dr_statusSTR .= " + "; + } + +} + + +?> + + + + + + + + + + +
    + + + +
    +

    DRIVER INFORMATION

    + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    First Name + +
    Last Name + +
    Initial + maxlength=10> +
    Cell + +
    Signup Date
    Status + +
    + +
    + + +
    + +
    +
    + + + + + + + + + \ No newline at end of file diff --git a/public_html/lib/driver_lib_process.php b/public_html/lib/driver_lib_process.php new file mode 100644 index 0000000..7b57ba9 --- /dev/null +++ b/public_html/lib/driver_lib_process.php @@ -0,0 +1,97 @@ +checkAdmin("index.php"); + +/* +for($i=0; $i"; + } + } + else echo "[$key][$value]
    "; + //print_r($_POST); +} + +//exit; +*/ + +$mode = $_POST['mmode']; + +if($mode == "update" && $dr_uid == "") { + echo 0; + exit(); +} + + +$columns = array(); +$values = array(); + +if($mode == "create") { + $columns[] = "dr_createdate"; + $columns[] = "dr_initial"; +} + +$columns[] = "dr_firstname"; +$columns[] = "dr_lastname"; + +$columns[] = "dr_cell"; +$columns[] = "dr_status"; + + + + + +//////////// +// data +//////////// +if($mode == "create") { + $values[] = date("YmdHis"); + $values[] = str_replace("\\", "", trim($dr_initial)); +} + + +$values[] = str_replace("\\", "", trim($dr_firstname)); +$values[] = str_replace("\\", "", trim($dr_lastname)); +$values[] = str_replace("-", "", trim($dr_cell)); + +$values[] = $dr_status; + + +//for ($i=0; $i < count($columns); $i++) +//echo "[$columns[$i]][$values[$i]]
    "; +//echo "[UID=$uid][ID=$userid][MAXUID=$maxuid]"; +//exit; + +if($mode == "create") { + + $query = "SELECT dr_uid FROM tbl_driver WHERE dr_initial = '".strtoupper(str_replace("\\", "", trim($dr_initial)))."' "; + $result=$jdb->fQuery($query, "fetch query error"); + + if ($result['dr_uid'] != ""){ + echo 2; + exit(); + } + + $jdb->iQuery("tbl_driver", $columns, $values); + echo 1; + exit(); +} + +else if($mode == "update") { + $jdb->uQuery("tbl_driver", $columns, $values, " where dr_uid = '$dr_uid' "); + echo 1; + exit(); + +} + +exit(); + +?> \ No newline at end of file diff --git a/public_html/lib/lib_getdriverinfo.php b/public_html/lib/lib_getdriverinfo.php new file mode 100644 index 0000000..ad96b74 --- /dev/null +++ b/public_html/lib/lib_getdriverinfo.php @@ -0,0 +1,49 @@ +checkAdmin("index.php"); + +//echo "[$driveruid]";exit(); + + +/* +for($i=0; $i"; + } + } + else echo "[$key][$value]
    "; + //print_r($_POST); +} + +exit; +*/ + +$driveruid = trim($_POST["driveruid"]); + +if($driveruid == "") { + echo 0; + exit(); +} + +$query = "SELECT * FROM tbl_driver WHERE dr_uid = '$driveruid'"; +$result = $jdb->fQuery($query, "query error"); + +if ($result[0] == ""){ + echo 0; + exit(); +} +else { + echo "1|".$result['dr_firstname']."|".$result['dr_lastname']."|".$result['dr_initial']."|".$result['dr_cell']; + exit; +} + + +?> \ No newline at end of file diff --git a/public_html/lib/login_process.php b/public_html/lib/login_process.php index 32564c9..b83d852 100644 --- a/public_html/lib/login_process.php +++ b/public_html/lib/login_process.php @@ -4,7 +4,6 @@ include getenv("DOCUMENT_ROOT")."/include/session_include.php"; $confirmID = trim($_POST['confirmID']); $confirmPW = $_POST['confirmPW']; -$action = $_POST['action'] ?? $_GET['action'] ?? ''; if($action == "login") { @@ -35,7 +34,7 @@ if($action == "login") { } - if ($_SERVER["REMOTE_ADDR"] == "127.0.0.1" || $_SERVER["REMOTE_ADDR"] == "::1") { + if ($_SERVER["REMOTE_ADDR"] == "127.0.0.1") { $res['success'] = 1; } else { @@ -103,6 +102,8 @@ if($action == "login") { $_SESSION['ss_UID'] = $result['m_uid']; // 1000000001,1000000002... $_SESSION['ss_ID'] = $result['m_userid']; // dustin@ebizple.com $_SESSION['ss_NAME'] = $result['m_firstname']; // Dustin + $_SESSION['ss_DRUID'] = $result['m_currentdriver']; + $_SESSION['ss_DRINITIAL'] = $result['m_currentdriverinitial']; // Level : m_level : Admin : 1, Manager : 3, Staff : 5, Accounting : 6, Operator : 7, Driver : 9 $_SESSION['ss_LEVEL'] = $result['m_level']; diff --git a/public_html/lib/member_lib.php b/public_html/lib/member_lib.php index 3364359..0e30f27 100644 --- a/public_html/lib/member_lib.php +++ b/public_html/lib/member_lib.php @@ -45,10 +45,11 @@ if ($m_uid != "") { $m_signupdateSTR = $func -> convertFormat ($m_signupdate, 1); $m_logindateSTR = $func -> convertFormat ($m_logindate, 1); - } - +if ($m_level == 9) $hiddenTag = ""; +else $hiddenTag = "hidden"; + // Get Status Info foreach ($arrStatus AS $key=>$value) @@ -78,6 +79,48 @@ foreach ($arrMemberLevel AS $key=>$value) "; } + + + + +// Get Region Info +$qry_region = "SELECT * FROM tbl_region WHERE rg_status = 'A' ORDER by rg_region ASC "; +$rt_region = $jdb->nQuery($qry_region, "list error"); + +while($lt_region=mysqli_fetch_array($rt_region, MYSQLI_ASSOC)) { + + if ($lt_region['rg_uid'] == $m_regionuid) $selectStr = "selected"; + else $selectStr = ""; + + $m_regionSTR .= " + "; + +} + + +// Get Driver Info +$qry_driver = "SELECT * FROM tbl_driver WHERE dr_status = 'A' ORDER by dr_initial ASC "; +$rt_driver = $jdb->nQuery($qry_driver, "list error"); + +while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { + + if ($lt_driver['dr_uid'] == $m_defaultdriver) $selectdefStr = "selected"; + else $selectdefStr = ""; + + $m_defaultdriverSTR .= " + "; + + + if ($lt_driver['dr_uid'] == $m_currentdriver) $selectcurStr = "selected"; + else $selectcurStr = ""; + + $m_currentdriverSTR .= " + "; + +} + + + ?> @@ -194,12 +237,90 @@ function checkEmail() { xmlhttp.send(); } +