eBizPle Updates on 2026-03-16

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)) {
@@ -1128,6 +1160,16 @@ class API extends CONF {
                 ($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);               
+
+				        $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'],
@@ -1471,7 +1538,8 @@ class API extends CONF {
                         $sqCus = qry("
                             SELECT 
                                 c_paymenttype, c_paymentcycle, c_rate, 
-                                c_fullquantity, c_fullquantitydaily
+                                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);
 						

public_html/doc/customer_detail.php

@@ -163,18 +163,38 @@ foreach ($arrSchedule AS $key=>$value)
 								<option value='$key' $selectStr>$value</option>";
 }
 
+$curDR = "";
 
-// Get Driver Info
+// Get Driver Info => Region
-$qry_driver = "SELECT * FROM tbl_member WHERE m_level = 9 ORDER by m_initial ASC ";
+$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 .= "
-								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
+								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_region']." (".$lt_driver['m_defaultdriverinitial'].")</option>";
+								
+}
+
+
+
+// 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_driveruidSTRRQ .= "
+								<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_initial']."</option>";
 								
 }
 
@@ -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 .= "
+									<option value='".$lt_driver['dr_uid']."' $selectStr>".$lt_driver['dr_initial']."</option>";
+									
+	}
+}
+
+/*
 // 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)) {
 								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
 								
 }
-
+*/
 
 
 
@@ -1090,7 +1136,7 @@ $(document).ready(function()
                 <input class="address" type="text" id="c_address" name="c_address" required='required' value="<?=htmlspecialchars($c_addressSTR, ENT_QUOTES)?>" placeholder="4490 Chesswood Dr Unit #9">
               </td>
               
-              <td class="td-title-info">Driver</td>
+              <td class="td-title-info">Region (Default Driver)</td>
               <td class="td-text-info">
                 <select name="c_driveruid" id="c_driveruid" class="custom-select">
                     <option value=''>Select</option>
@@ -2248,6 +2294,9 @@ $(document).ready(function(){
     	<input type=hidden name=actionPage value="">
     	<input type=hidden name=d_uid id=d_uid value="<?=$d_uid?>">
     	<input type=hidden name=c_uid id=c_uid value="<?=$c_uid?>">
+    	
+    	<input type=hidden name=d_driveruid id=d_driveruid value="<?=$c_driveruid?>">
+    	
     	<input type=hidden name=d_paymenttype id=d_paymenttype value="<?=$d_paymenttype?>">
     	<input type=hidden name=d_customeruid id=d_customeruid value="<?=$c_uid?>">
 			<input type=hidden name=d_mode id=d_mode value="<?=$d_mode?>">
@@ -2277,6 +2326,16 @@ $(document).ready(function(){
               </td>
             </tr>
             
+            <tr>
+              <td class="td-title-info">Driver</td>
+              <td class="td-text-info">           	
+                <select id="d_druid" name="d_druid" class="custom-select">
+                  <?=$c_driveruidSTRM?>
+                </select>
+              </td>
+            </tr>
+
+<!--            
             <tr>
               <td class="td-title-info">Driver</td>
               <td class="td-text-info">           	
@@ -2285,6 +2344,7 @@ $(document).ready(function(){
                 </select>
               </td>
             </tr>
+-->
 
             <tr>
               <td class="td-title-info">Oil Quantity</td>
@@ -2405,6 +2465,7 @@ $(document).ready(function(){
     	<input type=hidden name=actionStr value="ADDREQUEST">
     	<input type=hidden name=actionPage value="">
     	<input type=hidden name=r_customeruid id=r_customeruid value="<?=$c_uid?>">
+    	<input type=hidden name=r_driveruid id=r_driveruid value="<?=$c_driveruid?>">
     	<input type=hidden name=r_memberuid id=r_memberuid value="<?=$_SESSION['ss_UID']?>">
     	<input type=hidden name=goStr id=goStr value="<?=$goStr?>">
 			<input type=hidden name=mode value="create">
@@ -2419,9 +2480,9 @@ $(document).ready(function(){
               <tr>
                 <td class="td-title-info">Driver</td>
                 <td class="td-text-info">
-                  <select id="r_driveruid" name="r_driveruid" class="custom-select">
+                  <select id="r_druid" name="r_druid" class="custom-select">
                     <option value=''>Select</option>
-                    <?=$c_driveruidSTR?>
+                    <?=$c_driveruidSTRRQ?>
                   </select>
                 </td>
               </tr>

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)) {
               <td>$c_rate </td>
               <td>$c_maincontainer </td>
               <td>$c_container </td>
+              <td>".trim($m_region)." </td>
               <td>$m_initial </td>
               <td>$c_phoneSTR </td>
               <td>$c_statusSTR </td>
@@ -177,7 +178,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 
 if( $total_count < 1 ) {
 	$strList = "
-		<tr><td colspan='15' align=center height='30'><B>No Data</B></td></tr>
+		<tr><td colspan='16' align=center height='30'><B>No Data</B></td></tr>
 		";
 }
 
@@ -409,6 +410,7 @@ $(document).ready(function(){
                 <th class="col-rate"><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_rate">Rate</a></th>
                 <th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_maincontainer">Container</a></th>
                 <th class="col-detail"><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_container">Detail</a></th>
+                <th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=m_region">Region</a></th>
                 <th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=m_initial">Driver</a></th>
                 <th class="th-width-phone"><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_phone">Phone</a></th>
                 <th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_status">Status</a></th>

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";
 

public_html/doc/driver_list.php

@@ -0,0 +1,735 @@
+<?
+
+// Level 5 이하만 사용 가능
+$func->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 "<br><br><br><br><br>[$total_count][$query]<br>";
+
+//페이징변수설정
+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<sizeof($list); $i++) {
+		//list($key, $value) = each($list);
+		foreach ( (Array) $list as $key => $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 = "<a class=\"deleteClass btn-member\" data-toggle=\"modal\" data-target=\"#myModalDelete\" data-id=\"$dr_uid\"><i class=\"bi bi-x-circle icon-delete\"></i></a>";
+		//$OPTIONTITLEstr = "OPTION";
+	}
+	else {
+		$OPTIONstr = "";
+		//$OPTIONTITLEstr = "";
+	}
+
+	$strList .= "
+
+            <tr>
+              <td>$list_number</td>
+              <td><a onclick=\"#\" class=\"modifyMember\" data-toggle=\"modal\" data-target=\"#myModalMemberInfo\" data-id=\"$dr_uid\" style=\"cursor:pointer;cursor:hand;\"><b style=\"customer-info-detail\">$dr_initialSTR</b></a></td>
+              <td>$dr_firstnameSTR</td>
+              <td>$dr_lastnameSTR</td>
+              <td>$dr_cellSTR</td>
+              <td>$dr_statusSTR </td>
+              <td>$OPTIONstr</td>
+            </tr>
+
+	";
+
+	$list_number--;
+}
+
+
+if( $total_count < 1 ) {
+	$strList = "
+		<tr><td colspan='8' align=center height='30'><B>No Data</B></td></tr>
+		";
+}
+
+
+addLog ("add", "DRIVER LIST", "VIEW", $lguserid, $query, $lgno);
+
+?>
+
+
+<SCRIPT LANGUAGE=JAVASCRIPT>
+<!--
+function goSearch(f){
+    var f = document.form1;
+    if(trim(f.key_word.value).length < 1){
+        alert('Enter keyword.');
+        f.key_word.focus();
+        return false;
+    }
+}
+//-->
+</SCRIPT>
+
+
+<SCRIPT TYPE="TEXT/JAVASCRIPT">
+    $(function () {
+        $(".deleteClass").click(function () {
+            var my_id_value = $(this).data('id');
+            $(".modal-footer #dr_uid").val(my_id_value);
+        })
+    });
+</SCRIPT>
+
+
+<script>
+$(document).ready(function(){
+
+		 $('.modifyMember').click(function(){
+		   
+			   var dr_uid = $(this).data('id');
+
+			   // AJAX request
+			   $.ajax({
+					    url: 'lib/driver_lib.php',
+					    type: 'post',
+					    data: {dr_uid: dr_uid},
+					    success: function(response){ 
+					      // Add response in Modal body
+					      $('.modal-content-modifyMember').html(response);
+
+					      // Display Modal
+					      //$('#myModalModify').modal('show'); 
+					    }
+		  	});
+		 });
+});
+</script>
+
+
+
+
+<!-- Start of Modal -->
+<div class="container">
+
+  <!-- Modal -->
+  <div class="modal fade customer-info" id="myModalMemberInfo"  aria-labelledby="myModalMemberInfoLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document" >
+    
+      <!-- Modal content-->
+      <div class="modal-content modal-content-modifyMember" >
+
+      </div>
+      
+    </div>
+  </div>
+  
+</div>
+<!-- End of Modal -->
+
+
+<div class="container">
+            
+  <!-- Modal -->
+  <div class="modal fade" id="myModalDelete" data-backdrop="static" role="dialog">
+    <div class="modal-dialog">
+    
+      <!-- Modal content-->
+      <div class="modal-content">
+        <div class="modal-header">
+                    <h4 class="modal-title">MESSAGE</h4>
+                    <button type="button" class="btn" data-dismiss="modal" aria-label="Close" style="color:#fff;"><i class="bi bi-x"></i></button>
+        </div>
+        <div class="modal-body">
+          <p>Are you sure to delete?</p>
+        </div>
+        <div class="modal-footer">
+
+		        <FORM NAME=newModalDeleteForm METHOD=POST ACTION="/lib/user_process.php" id="newModalDeleteForm">
+							<input type=hidden name=dr_uid id=dr_uid value="">
+							<input type=hidden name=mode value="delete">
+		        	<input type=hidden name=actionStr value="DRIVERINFO">
+
+							<input type=hidden name=switched value="<?=$getSWHStr?>">
+							<input type=hidden name=page value="<?=$page?>">
+							<input type=hidden name=key_word value="<?=$key_word?>">
+							<input type=hidden name=column value="<?=$column?>">
+							<input type=hidden name=sorting_type value="<?=$sorting_type?>">
+							<input type=hidden name=switch value="<?=$switch?>">
+
+            <div class="text-center grid-layout-col-2">
+              <button type="button" class="btn-gray" data-dismiss="modal">NO</button>
+              <button type="submit" class="btn-sub">YES</button>
+            </div>
+
+						</FORM>    
+				                              
+        </div>
+      </div>
+      
+    </div>
+  </div>
+  
+</div>
+
+
+  <main id="main" class="main">
+
+    <!-- ======= Breadcrumbs ======= -->
+    <div class="breadcrumbs">
+      <div class="container">
+
+        <div class="d-flex justify-content-between align-items-center">
+          <h2>DRIVER</h2>
+          <ol>
+            <li><a href="index.html">HOME</a></li>
+            <li>DRIVER</li>
+          </ol>
+        </div>
+
+      </div>
+    </div><!-- End Breadcrumbs -->
+
+    <section class="page">
+
+
+      <div class="container" data-aos="fade-up">
+
+        <div class="wrap-border">
+            <table class="table-search-customer">
+              <tr>
+                <!--td class="td-title">
+                  <select name="name" id="name" class="custom-select">
+                    <option value="jk">J.K.</option>
+                    <option value="hs">H.S.</option>
+                    <option value="Hold">Hold</option>
+                  </select>
+                </td-->
+                <td class="td-title">
+
+                    <div class="search-container">
+<FORM METHOD=POST NAME=form1 ONSUBMIT='return goSearch(this)' action='<?=$_SERVER["PHP_SELF"]?>'>                    	
+                    	<INPUT TYPE=HIDDEN NAME=view VALUE='driver_list'>				
+                        <input class="" type="text" placeholder="Search.." name="key_word" value='<?=$key_word?>'>
+                        <button type="submit"><i class="bi-search"></i></button>
+</FORM>
+                    </div>
+
+                </td>
+                <td align="right">
+
+<? if ($setTag == "ENABLED") { ?>                	
+                    <a onclick=# class="btn-add modifyMember" data-toggle="modal" data-target="#myModalMemberInfo" data-id="" style="cursor:pointer;cursor:hand;">ADD</a>
+<? } ?>
+                    	
+                </td>
+
+              </tr>
+
+            </table>
+        </div><!--wrap-border-->
+
+
+<? if ($aaaa == 1) { ?>
+        <div class="wrap-border">
+
+          <form action=""  class="form-customer">
+            <table class="table-search-customer">
+              <tr>
+                <td class="td-title">
+                  <select name="name" id="name" class="custom-select">
+                    <option value="jk">J.K.</option>
+                    <option value="hs">H.S.</option>
+                    <option value="Hold">Hold</option>
+                  </select>
+                </td>
+                <td class="td-title">
+
+
+                    <div class="search-container">
+                        <input class="" type="text" placeholder="Search.." name="search">
+                        <button type="submit"><i class="bi-search"></i></button>
+                    </div>
+
+
+                </td>
+                <td align="right">
+                    <button type="button" class="btn btn-add" data-bs-toggle="modal" data-bs-target="#add-acct-staff-modal" data-add-acct-staff-type="standard-access">ADD</button>
+                                <!-- Modal add-acct-staff Form -->
+                                <div id="add-acct-staff-modal" class="modal fade customer-info">
+                                  <div class="modal-dialog" role="document">
+                                    <div class="modal-content">
+                                      <div class="modal-header">
+                                        <h4 class="modal-title">USER INFORMATION</h4>
+                                        <button type="button" class="btn" data-bs-dismiss="modal" aria-label="Close" style="color:#fff;"><i class="bi bi-x"></i></button>
+                                      </div>
+                                      <div class="modal-body">
+                                        <form method="POST" action="#">
+                                          <table class="tb-info-box">
+                
+                                            <tr>
+                                              <td class="td-title-info">User ID</td>
+                                              <td class="td-text-info">
+                                                <input type="text" id="userid" name="userid" placeholder="name@company.com">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Password</td>
+                                              <td class="td-text-info">
+                                                <input type="text" id="password" name="password" placeholder="********">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Re-Password</td>
+                                              <td class="td-text-info">
+                                                <input type="text" id="repassword" name="repassword" placeholder="********">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Frist Name</td>
+                                              <td class="td-text-info">
+                                                <input type="text" id="firstname" name="firstname" placeholder="Dustin">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Last Name</td>
+                                              <td class="td-text-info">
+                                                <input type="text" id="lastname" name="lastname" placeholder="Choi">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Phone</td>
+                                              <td class="td-text-info">
+                                                <input type="number" id="phone" name="phone" placeholder="1-123-456-7890">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Ext.</td>
+                                              <td class="td-text-info">
+                                                <input type="text" id="ext" name="ext" placeholder="123">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Cell</td>
+                                              <td class="td-text-info">
+                                                <input type="number" id="cell" name="cell" placeholder="1-123-456-7890">
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Last Login Date</td>
+                                              <td class="td-text-info">
+                                                <input type="date" id="lastlogindate" name="lastlogindate">
+                                              </td>
+                                            </tr>     
+                                            
+                                            <tr>
+                                              <td class="td-title-info">Signup Date</td>
+                                              <td class="td-text-info">
+                                                <input type="date" id="signupdate" name="signupdate">
+                                              </td>
+                                            </tr>     
+                                                                        
+                                            <tr>
+                                              <td class="td-title-info">Login No</td>
+                                              <td class="td-text-info">
+                                                <input type="number" id="loginnum" name="loginnum" placeholder="1234545">
+                                              </td>
+                                            </tr>
+                                                                        
+                                            <tr>
+                                              <td class="td-title-info">Status</td>
+                                              <td class="td-text-info">
+                                                <select id="status" name="status" class="custom-select">
+                                                  <option value="allow">Allow</option>
+                                                  <option value="deny">Deny</option>
+                                                </select>
+                                              </td>
+                                            </tr>
+                                            
+                                            <tr>
+                                              <td class="td-title-info">Level</td>
+                                              <td class="td-text-info">
+                                                <select id="level" name="level" class="custom-select">
+                                                  <option value="admin">Admin</option>
+                                                  <option value="staff">Staff</option>
+                                                  <option value="manager">Manager</option>
+                                                  <option value="driver">Driver</option>
+                                                </select>
+                                              </td>
+                                            </tr>
+                                            
+                                                                        
+                                            <tr>
+                                              <td class="td-title-info">Access</td>
+                                              <td class="td-text-info">
+                                                <select id="access" name="access" class="custom-select">
+                                                  <option value="local">Local</option>
+                                                  <option value="internet">Internet</option>
+                                                </select>
+                                              </td>
+                                            </tr>
+                
+                                            <tr>
+                                              <td class="td-title-info">Memo</td>
+                                              <td class="td-text-info">
+                                                <textarea id="memo" class="textarea" name="memo" rows="4" cols="20">
+                
+                                                </textarea>
+                                              </td>
+                                            </tr>
+                                          </table>
+                                          <br>
+                                          <div class="text-center grid-layout-col-2">
+                                            <button type="submit" class="btn-sub">ADD</button>
+                                            <button type="submit" class="btn-gray">CLOSE</button>
+                                          </div>
+                                        </form>
+                                      </div>
+                                    </div><!-- modal-content ends -->
+                                  </div><!-- modal-dialog ends -->
+                                </div>
+                                <!-- Modal add-acct-staff Form Ends -->
+                
+                  </td>
+
+              </tr>
+
+            </table>
+  
+          </form>
+        </div><!--wrap-border-->
+<? } ?>
+
+
+  
+        
+
+        <div class="wrap-overflow customer-info">
+          <table class="tb-list">
+            <tr>
+                <th>No</th>
+                <th class="td-restaurant">Initial</th>
+                <th class="td-restaurant">First Name</th>
+                <th class="td-restaurant">Last Name</th>
+                <th class="th-width-phone">Cell</th>
+                <th>Status</th>
+                <th>Option</th>
+            </tr>
+
+<?=$strList?>
+
+<!--
+            <tr>
+              <td>1</td>
+
+              <td>
+                <button type="button" class="btn acct-staff" data-bs-toggle="modal" data-bs-target="#acct-staff-modal" data-acct-staff-type="standard-access">dustin@gmail.com</button>
+               
+                <div id="acct-staff-modal" class="modal fade customer-info">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <h4 class="modal-title">USER INFORMATION</h4>
+                        <button type="button" class="btn" data-bs-dismiss="modal" aria-label="Close" style="color:#fff;"><i class="bi bi-x"></i></button>
+                      </div>
+                      <div class="modal-body">
+                        <form method="POST" action="#">
+                          <table class="tb-info-box">
+
+                            <tr>
+                              <td class="td-title-info">User ID</td>
+                              <td class="td-text-info">
+                                <input type="text" id="userid" name="userid" placeholder="name@company.com">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Password</td>
+                              <td class="td-text-info">
+                                <input type="text" id="password" name="password" placeholder="********">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Re-Password</td>
+                              <td class="td-text-info">
+                                <input type="text" id="repassword" name="repassword" placeholder="********">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Frist Name</td>
+                              <td class="td-text-info">
+                                <input type="text" id="firstname" name="firstname" placeholder="Dustin">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Last Name</td>
+                              <td class="td-text-info">
+                                <input type="text" id="lastname" name="lastname" placeholder="Choi">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Phone</td>
+                              <td class="td-text-info">
+                                <input type="number" id="phone" name="phone" placeholder="1-123-456-7890">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Ext.</td>
+                              <td class="td-text-info">
+                                <input type="text" id="ext" name="ext" placeholder="123">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Cell</td>
+                              <td class="td-text-info">
+                                <input type="number" id="cell" name="cell" placeholder="1-123-456-7890">
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Last Login Date</td>
+                              <td class="td-text-info">
+                                <input type="date" id="lastlogindate" name="lastlogindate">
+                              </td>
+                            </tr>     
+                            
+                            <tr>
+                              <td class="td-title-info">Signup Date</td>
+                              <td class="td-text-info">
+                                <input type="date" id="signupdate" name="signupdate">
+                              </td>
+                            </tr>     
+                                                        
+                            <tr>
+                              <td class="td-title-info">Login No</td>
+                              <td class="td-text-info">
+                                <input type="number" id="loginnum" name="loginnum" placeholder="1234545">
+                              </td>
+                            </tr>
+                                                        
+                            <tr>
+                              <td class="td-title-info">Status</td>
+                              <td class="td-text-info">
+                                <select id="status" name="status" class="custom-select">
+                                  <option value="allow">Allow</option>
+                                  <option value="deny">Deny</option>
+                                </select>
+                              </td>
+                            </tr>
+                            
+                            <tr>
+                              <td class="td-title-info">Level</td>
+                              <td class="td-text-info">
+                                <select id="level" name="level" class="custom-select">
+                                  <option value="admin">Admin</option>
+                                  <option value="staff">Staff</option>
+                                  <option value="manager">Manager</option>
+                                  <option value="driver">Driver</option>
+                                </select>
+                              </td>
+                            </tr>
+                            
+                                                        
+                            <tr>
+                              <td class="td-title-info">Access</td>
+                              <td class="td-text-info">
+                                <select id="access" name="access" class="custom-select">
+                                  <option value="local">Local</option>
+                                  <option value="internet">Internet</option>
+                                </select>
+                              </td>
+                            </tr>
+
+                            <tr>
+                              <td class="td-title-info">Memo</td>
+                              <td class="td-text-info">
+                                <textarea id="memo" class="textarea" name="memo" rows="4" cols="20">
+
+                                </textarea>
+                              </td>
+                            </tr>
+                          </table>
+                          <br>
+                          <div class="text-center grid-layout-col-2">
+                            <button type="submit" class="btn-sub">ADD/UPDATE</button>
+                            <button type="submit" class="btn-gray">CLOSE</button>
+                          </div>
+                        </form>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              
+              </td>
+              <td>Dustin</td>
+              <td>Choi</td>
+              <td>1-123-456-7890 </td>
+              <td>Staff </td>
+              <td>Allow </td>
+              <td><i class="bi bi-x-circle icon-delete"></i></td>
+            </tr>
+            
+            <tr>
+              <td>3</td>
+              <td>dustin@gmail.com</td>
+              <td>Dustin</td>
+              <td>Choi</td>
+              <td>1-123-456-7890 </td>
+              <td>Staff </td>
+              <td>Allow </td>
+              <td><i class="bi bi-x-circle icon-delete"></i></td>
+            </tr>
+
+            <tr>
+              <td>4</td>
+              <td>dustin@gmail.com</td>
+              <td>Dustin</td>
+              <td>Choi</td>
+              <td>1-123-456-7890 </td>
+              <td>Staff </td>
+              <td>Allow </td>
+              <td><i class="bi bi-x-circle icon-delete"></i></td>
+            </tr>
+-->
+
+        </table>
+        </div>
+
+
+        <div class="container-inner">
+          <div class="pagination">
+            <!--a href="#" ><i class="bi bi-arrow-left"></i></a>
+            <a href="#"class="active">1</a>
+            <a href="#">2</a>
+            <a href="#">3</a>
+            <a href="#">4</a>
+            <a href="#">5</a>
+            <a href="#">6</a>
+            <a href="#"><i class="bi bi-arrow-right"></i></a-->
+					<?
+
+					$page_string = "view=$view&key_word=$key_word&key_CTGSEQ=$key_CTGSEQ&column=$column&mode=$mode&switched=$getSWHStr";
+					$paging = new PAGE('page',$total_count,$list_count,$page_count,$page,$page_string,'#c71930','','','#c71930','');
+
+					?>
+            
+          </div>
+        </div>
+
+        <!--div class="row text-center">
+          <div class="col-sm-4 item-inner">
+          <a class="btn-sub" href="#">LIST</a>
+         </div>
+        </div-->
+
+      </div>
+
+    </section>
+
+
+
+</div><!--container Ends-->
+    </section>
+
+  </main><!-- End #main -->
+
+
+
+
+  <script>
+    /**
+    * Request type on click
+    */
+    on('show.bs.modal', '#acct-staff-modal', function(event) {
+      select('#acct-staff-modal #acct-staff-type').value = event.relatedTarget.getAttribute('data-acct-staff-type')
+    })
+
+    on('show.bs.modal', '#add-acct-staff-modal', function(event) {
+      select('#add-acct-staff-modal #acct-staff-type').value = event.relatedTarget.getAttribute('data-add-acct-staff-type')
+    })
+
+</script>

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 "<Cell><Data ss:Type=\"String\">" . $rt_driver['m_initial'] . "</Data></Cell>\n";
+                echo "<Cell><Data ss:Type=\"String\">" . $rt_driver['m_region'] . "</Data></Cell>\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 "<Cell><Data ss:Type=\"String\">" . $currentdriverinitialSTR . "</Data></Cell>\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,9 +196,15 @@ 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 "<Cell><Data ss:Type=\"String\">" . $rt_driver['m_initial'] . "</Data></Cell>\n";
+					echo "<Cell><Data ss:Type=\"String\">" . $rt_driver['m_region'] . "</Data></Cell>\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 "<Cell><Data ss:Type=\"String\">" . $rt_driver['m_currentdriverinitial'] . "</Data></Cell>\n";
 				}
 				
 				else if ($col == 'c_area') {
@@ -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,15 +498,13 @@ if ($actionStr == "CUSTOMER") {
     }
     echo "</Row>\n";
 
-    if ($searchtype == "D" && $searchDriver) {
+		if ($searchtype == "D" && $searchDriver) {
-        $qrySTR = " AND (d.d_driveruid = '" . $searchDriver . "') ";
+			$qrySTR = " AND (d.d_druid = '".$searchDriver."') ";
-    } else {
+		}
-        $qrySTR = "";
-    }
 
-    if ($_SESSION['ss_LEVEL'] == 9) {
+		if ($_SESSION['ss_LEVEL'] == 9) {
-        $qrySTR = " AND (d.d_driveruid = '" . $_SESSION['ss_UID'] . "') ";
+			$qrySTR = " AND (d.d_druid = '".$_SESSION['ss_DRUID']."') ";
-    }
+		}
 		
     if ($cstatus == 'T') {
         $status_query = " AND (c.c_status = 'A' OR c.c_status = '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 . "'";
+				$d_regionSTR = str_replace("\\", "", $d_region);
-        $rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error");
+				$d_driverSTR = str_replace("\\", "", $d_drinitial);
-        $d_driverSTR = $rt_dvr['m_initial'];
+				
+				
 
         echo "<Row>";
         foreach ($receiptArray as $colKey => $colValue) {

public_html/doc/forecast.php

@@ -37,7 +37,7 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
 	else $selectStr = "";
 	
 	$c_driveruidSTR .= "
-								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
+								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_region']." (".$lt_driver['m_initial'].")</option>";
 								
 }
 
@@ -240,7 +240,7 @@ $(document).ready(function(){
 
             <table class="td-search">
               <tr>
-                <td class="td-title"> <label for="Driver">Driver</label></td>
+                <td class="td-title"> <label for="Driver">Region (Driver)</label></td>
                 <td>
                   <select name="c_driveruid" id="c_driveruid" class="custom-select">
                     <?=$c_driveruidSTR?>

public_html/doc/forecast_list.php

@@ -296,7 +296,7 @@ else	$typeQRY = " AND (c_schedule = 'None') ";
 if ($c_type_o == "O") $orderflagQRY = " AND c_orderflag = 0 ";
 else $orderflagQRY = " ";;
 
-$qry_driver = "SELECT m_initial, m_firstname, m_lastname FROM tbl_member WHERE m_uid = '$c_driveruid' ";
+$qry_driver = "SELECT * FROM tbl_member WHERE m_uid = '$c_driveruid' ";
 $rt_driver = $jdb->fQuery($qry_driver, "fetch query error");
 	
 // $query = "SELECT * FROM tbl_sampletypes 
@@ -547,9 +547,9 @@ if( $total_count < 1 ) {
 if ($c_type_r == 'R') {
 			$orderdate = str_replace("-", "", $orderdate);
 			$qry_r = "SELECT * FROM tbl_request
-								WHERE r_driveruid ='$c_driveruid' AND r_status = 'A' AND r_requestdate = '$orderdate'
+								WHERE r_druid ='".$rt_driver['m_currentdriver']."' AND r_status = 'A' AND r_requestdate = '$orderdate'
 								ORDER BY r_uid DESC";
-			echo "Request[$qry_r]<br>";
+			//echo "Request[$qry_r]<br>";
 
 			$rt_r=$jdb->nQuery($qry_r, "list error");
 

public_html/doc/map.php

@@ -33,7 +33,11 @@
     while($rstDriver = fetch_array($sqDriver)){
         $drivers[] = array(
             "id" => $rstDriver['m_uid'],
-            "name" => $rstDriver['m_initial']
+            "name" => $rstDriver['m_initial'],
+            "regionuid" => $rstDriver['m_regionuid'],
+            "region" => $rstDriver['m_region'],
+            "currentdriverid" => $rstDriver['m_currentdriver'],
+            "currentdriver" => $rstDriver['m_currentdriverinitial']
         );
     }
 
@@ -62,7 +66,7 @@
     }
 
 
-		if (($_SESSION['ss_UID'] != "")) {
+		if (($_SESSION['ss_DRUID'] != "")) {
 			
 				if ($_POST['orderdate'] != "") $orderdateSTR = $_POST['orderdate'];
 				else $orderdateSTR = date('Y-m-d');
@@ -74,7 +78,7 @@
                             tbl_daily
                         WHERE 
                         		d_status = 'F' AND d_orderdate = '".$orderdateSTR."' 
-                        		AND d_driveruid = '".$_SESSION['ss_UID']."' ");
+                        		AND d_druid = '".$_SESSION['ss_DRUID']."' ");
 
 				$rstQuantity = fetch_array($sqQuantity);
 				
@@ -168,7 +172,7 @@
               <select name="name" id="driver" class="custom-select-map-orderby">
                 <?php
                     foreach($drivers as $driver) {
-                        echo '<option value="'.$driver['id'].'">'.$driver['name'].'</option>';
+                        echo '<option value="'.$driver['currentdriverid'].'">'.$driver['name'].'</option>';
                     }
                 ?>
               </select>
@@ -373,6 +377,7 @@ function popup(){
             <input type="hidden" class="d_customerno">
             <input type="hidden" class="d_orderdate">
             <input type="hidden" class="d_paymenttype">
+            <input type="hidden" class="d_driveruid">
             
             <table class="tb-info-box">
               <tbody>
@@ -392,10 +397,10 @@ function popup(){
                 <tr>
                   <td class="td-title-info">Driver</td>
                   <td class="td-text-info">           	
-                    <select class="custom-select d_driveruid">        
+                    <select class="custom-select d_druid">        
                       <?php
                         foreach($drivers as $driver) {
-                            echo '<option value="'.$driver['id'].'">'.$driver['name'].'</option>';
+                            echo '<option value="'.$driver['currentdriverid'].'">'.$driver['name'].'</option>';
                         }
                       ?>
                     </select>
@@ -524,7 +529,7 @@ function popup(){
                         <select class="custom-select d_driveruid">
                         <?php
                             foreach($drivers as $driver) {
-                                echo '<option value="'.$driver['id'].'">'.$driver['name'].'</option>';
+                                echo '<option value="'.$driver['currentdriverid'].'">'.$driver['name'].'</option>';
                             }
                           ?>
                         </select>
@@ -868,7 +873,7 @@ function popup(){
   $(window).ready(function(){
 
 <? if ($_SESSION['ss_LEVEL'] == 9) { ?>
-		$("#driver").val("<?=$_SESSION['ss_UID']?>").change();
+		$("#driver").val("<?=$_SESSION['ss_DRUID']?>").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(){
               <div class="address-row">
                 <div class="address-title">Address</div>
                 <div class="address-content">
-                  <a href="https://maps.google.com/?q=${encodeURIComponent(property.address)}"
+                  <a href="https://www.google.com/maps/search/?api=1&query=${property.lat},${property.lon}"
                     class="address-link"
                     target="_blank" 
                     rel="noopener noreferrer">

public_html/doc/member_list.php

@@ -1,9 +1,9 @@
 <?
 
-// Level 5 이하만 사용 가능
+// Level 5 ÀÌÇϸ¸ »ç¿ë °¡´É
 $func->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 "<br><br><br><br><br>[$total_count][$query]<br>";
 
-//페이징변수설정
+//ÆäÀÌ¡º¯¼ö¼³Á¤
 if(!$page) $page = 1;
 
-if(!$list_count) $list_count = $INIT_PAGECNT; //출력리스트 갯수
+if(!$list_count) $list_count = $INIT_PAGECNT; //Ãâ·Â¸®½ºÆ® °¹¼ö
-if(!$page_count) $page_count = $INIT_PAGEVIEWCNT; //출력페이지 갯수
+if(!$page_count) $page_count = $INIT_PAGEVIEWCNT; //Ãâ·ÂÆäÀÌÁö °¹¼ö
 
 $list_number = $total_count - (($page-1)*$list_count);
 $start_number = $list_count * ($page-1);
@@ -77,18 +77,41 @@ 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);
+	
+	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];
 			
-	//$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 ($setTag == "ENABLED") {
 		$OPTIONstr = "<a class=\"deleteClass btn-member\" data-toggle=\"modal\" data-target=\"#myModalDelete\" data-id=\"$m_uid\"><i class=\"bi bi-x-circle icon-delete\"></i></a>";
@@ -103,10 +126,11 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 
             <tr>
               <td>$list_number</td>
-              <td><a onclick=\"#\" class=\"modifyMember\" data-toggle=\"modal\" data-target=\"#myModalMemberInfo\" data-id=\"$m_uid\" style=\"cursor:pointer;cursor:hand;\"><b style=\"ustomer-info-detail\">$m_userid</b></a></td>
+              <td><a onclick=\"#\" class=\"modifyMember\" data-toggle=\"modal\" data-target=\"#myModalMemberInfo\" data-id=\"$m_uid\" style=\"cursor:pointer;cursor:hand;\"><b style=\"customer-info-detail\">$m_userid</b></a></td>
               <td>$m_firstnameSTR</td>
               <td>$m_lastnameSTR</td>
               <td>$m_initialSTR</td>
+              <td>$m_regionSTR</td>
               <td>$m_cellSTR</td>
               <td>$m_statusSTR </td>
               <td>$m_levelSTR </td>
@@ -121,7 +145,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 
 if( $total_count < 1 ) {
 	$strList = "
-		<tr><td colspan='9' align=center height='30'><B>No Data</B></td></tr>
+		<tr><td colspan='10' align=center height='30'><B>No Data</B></td></tr>
 		";
 }
 
@@ -493,6 +517,7 @@ $(document).ready(function(){
                 <th class="td-restaurant">First Name</th>
                 <th class="td-restaurant">Last Name</th>
                 <th>Initial</th>
+                <th>Region</th>
                 <th class="th-width-phone">Cell</th>
                 <th>Type</th>
                 <th>Status</th>

public_html/doc/oilhistory_detail.php

@@ -114,8 +114,6 @@ while($list=mysqli_fetch_array($rt_oilh, MYSQLI_ASSOC)) {
 	
 	$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 .= "
             <tr>
@@ -123,7 +121,7 @@ while($list=mysqli_fetch_array($rt_oilh, MYSQLI_ASSOC)) {
               <td>$d_visitdateSTR</td>
               <td>$d_quantitySTR</td>
               <td>$d_sludge</td>
-              <td>".$rt_dvr['m_initial']."</td>
+              <td>".$d_drinitial."</td>
               <td>$d_paystatusSTR</td>
             </tr>
 

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)) {
               <td>$max_sludgeSTR </td>
               <td>$max_cycle </td>
               <td>$max_addressSTR </td>
-              <td>".$rt_dvr['m_initial']."</td>
+              <td>".$rt_dvr['m_region']." </td>
+              <td>".$rt_dvr['m_initial']." </td>
               <td style=\"text-align: right;margin-right: 20px;\">$get1MonQ </td>
               <td style=\"text-align: right;margin-right: 20px;\">$get2MonQ </td>
               <td style=\"text-align: right;margin-right: 20px;\">$get3MonQ </td>
@@ -255,7 +256,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 
 if( $total_count < 1 ) {
 	$strList = "
-		<tr><td colspan='15' align=center height='30'><B>No Data</B></td></tr>
+		<tr><td colspan='16' align=center height='30'><B>No Data</B></td></tr>
 		";
 }
 
@@ -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 .= "
-								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
+								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_region']." (".$lt_driver['m_initial'].")</option>";
 								
 }
 
 
 
-
 // 검색시 조건 유지를 위해
 if ($searchtype == 'D') $setDisplayRStr = " style='DISPLAY:none'";
 else if ($searchtype == 'R' || $searchtype == '') $setDisplayDStr = " style='DISPLAY:none'";
@@ -412,7 +413,7 @@ $(document).ready(function(){
                     <option value="R" <?=($searchtype=="R" || $searchtype=="")?"selected":"";?>>Restaurant</option>
 
 <? if ($_SESSION['ss_LEVEL'] != 9) { ?>
-                    <option value="D" <?=($searchtype=="D")?"selected":"";?>>Driver</option>
+                    <option value="D" <?=($searchtype=="D")?"selected":"";?>>Region (Driver)</option>
 <? } ?>
 
                   </select>
@@ -507,7 +508,7 @@ $(document).ready(function(){
   
 <? if (($searchtype == "D" && $setTag == "ENABLED") || ($_SESSION['ss_LEVEL'] == 9 && $key_word =="")) { ?>
         <div class="container section-oil-history-details" data-aos="fade-up">
-          <h5 class="h5-title">Driver : <span><?=$rt_dvr['m_initial']?></span></h5>
+          <h5 class="h5-title">Region (Driver) : <span><?=$rt_dvr['m_region']?> (<?=$rt_dvr['m_initial']?>)</span></h5>
           <table class="tb-info-box oil-qty-tb">
             <tr>
               <td class="td-title-info">Period</td>
@@ -541,7 +542,8 @@ $(document).ready(function(){
                 <th class="oil-sludge">Sludge</th>
                 <th class="oil-pcycle">P. Cycle</th>
                 <th class="td-address">Address</th>
-                <th class="oil-driver">Driver</th>
+                <th class="oil-driver">Region</th>
+                <th >Driver</th>
                 <th class="oil-1m">1M</th>
                 <th class="oil-2m">2M</th>
                 <th class="oil-3m">3M</th>

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 "<br><br><br><br><br>[$total_count][$query]<br>";
@@ -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 "<br><br><br><br>[$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)) {
               <td>$d_paymenttype</td>
               <td>$d_rate</td>
               <td>$d_addressSTR</td>
+              <td>$d_region</td>
               <td>$d_citySTR</td>
               <td style=\"text-align:right; padding-right:20px;\">$d_lastpickupquantity</td>
               <td style=\"text-align:right; padding-right:20px; color:#2A9B56\">$d_estquantitySTR</td>
@@ -379,7 +381,7 @@ $('#c_fullcycle_".$c_uid."').on('change', function () { // changed
 
 if( $total_count < 1 ) {
 	$strList = "
-		<tr><td colspan='20' align=center height='30'><B>No Data</B></td></tr>
+		<tr><td colspan='21' align=center height='30'><B>No Data</B></td></tr>
 		";
 }
 
@@ -396,7 +398,22 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
 	else $selectStr = "";
 	
 	$c_driveruidSTR .= "
-								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
+								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_region']." (".$lt_driver['m_initial'].")</option>";
+								
+}
+
+
+// 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 .= "
+								<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_initial']."</option>";
 								
 }
 
@@ -608,7 +625,7 @@ function printDiv(divName) {
 											<INPUT TYPE=HIDDEN NAME=searchtype VALUE='D'>
 														<select name="searchDriver" id="searchDriver" class="custom-select" onChange="this.form.submit()">
 														<!--option value=''>Select</option-->
-														<?=$c_driveruidSTR?>
+														<?=$d_druidSTR?>
 														</select>		
               	
                 </td>
@@ -629,7 +646,7 @@ function printDiv(divName) {
 <input type=hidden name=mode value="export">
 <input type=hidden name=actionStr value="ORDER">
 <input type=hidden name="d_orderdate" value="<?=$orderdate?>">
-<input type=hidden name="d_driveruid" value="<?=$d_driveruid?>">
+<input type=hidden name="d_druid" value="<?=$d_druid?>">
 
                 <td align="right" class="td-print"><button type='submit' href="#" class="btn-orange text-center">DOWNLOAD</button></td>
 </FORM>
@@ -647,23 +664,24 @@ function printDiv(divName) {
             <tr>
                 <th>No</th>
                 <th>Option</th>
-                <th class="td-order-restaurant"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_name">Restaurant Name</a></th>
+                <th class="td-order-restaurant"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_name">Restaurant Name</a></th>
-                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_accountno">Account</a></th>
+                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_accountno">Account</a></th>
-                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_maincontainer">Container</a></th>
+                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_maincontainer">Container</a></th>
-                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_paymenttype">Payment</a></th>
+                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_paymenttype">Payment</a></th>
-                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_rate">Rate</a></th>
+                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_rate">Rate</a></th>
-                <th class="td-order-address"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_address">Address</a></th>
+                <th class="td-order-address"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_address">Address</a></th>
-                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_city">City</a></th>
+                <th>Region</th>
-                <th class="td-order-date"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_lastpickupquantity">Last Qty.</a></th>
+                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_city">City</a></th>
-                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_estquantity">Forecast(L)</a></th>
+                <th class="td-order-date"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_lastpickupquantity">Last Qty.</a></th>
-               	<th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_quantity">Actual(L)</a></th>
+                <th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_estquantity">Forecast(L)</a></th>
-                <th class="td-order-lastpu"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_lastpaiddate">Last Paid</a></th>               	
+               	<th><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_quantity">Actual(L)</a></th>
+                <th class="td-order-lastpu"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_lastpaiddate">Last Paid</a></th>               	
                 <th><?=$getLastYear?></th>
                 <th><?=$getThisYear?></th>
                 <th class="td-order-cycle">Cycle</th>
-                <th class="td-order-lastpu"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_lastpickupdate">Last PU</a></th>
+                <th class="td-order-lastpu"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_lastpickupdate">Last PU</a></th>
                 <th class="td-order-nextpu">Next PU</th>
-                <th class="td-order-detail"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_driveruid=<?=$d_driveruid?>&switch=d_container">Detail</a></th>
+                <th class="td-order-detail"><a href="/index_intranet.php?view=order_driver&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_word?>&sorting_type=<?=$sorting_type?>&d_orderdate=<?=$d_orderdate?>&d_duid=<?=$d_duid?>&switch=d_container">Detail</a></th>
             </tr>
 
 <?=$strList?>
@@ -848,7 +866,7 @@ function printDiv(divName) {
 						<input type=hidden name=column value="<?=$column?>">
 						<input type=hidden name=sorting_type value="<?=$sorting_type?>">
 						<input type=hidden name=switch value="<?=$switch?>">
-						<input type=hidden name=goSTRSTR value="d_driveruid=<?=$d_driveruid?>&d_orderdate=<?=$d_orderdate?>">
+						<input type=hidden name=goSTRSTR value="d_duid=<?=$d_duid?>&d_orderdate=<?=$d_orderdate?>">
 
           <div class="text-center grid-layout-col-2">
             <button type="button" class="btn-gray" data-dismiss="modal">NO</button>

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']."' ";
+if ($_SESSION['ss_LEVEL'] == 9) $add_subqry = " m_uid = '".$_SESSION['ss_UID']."' AND d_druid = '".$_SESSION['ss_DRUID']."' ";
-else $add_subqry = "";
+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 . "
+					INNER JOIN tbl_member ON ". $add_subqry . "
-					GROUP BY d_orderdate,d_driveruid " . $add_allquery . $add_srchquery . $add_query;
+					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]<br>";
 
 	// 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]<br>";
 		
 	// 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)) {
 
             <tr>
               <td>$list_number</td>
-              <td onclick=\"location.href='/index_intranet.php?view=order_driver&d_driveruid=$d_driveruid&d_orderdate=$d_orderdate&page=$page&key_word=$key_word&column=$column&switched=$getSWHStr&sorting_type=$sorting_type&switch=$switch'\" style='cursor:pointer;cursor:hand;'><b class='customer-info-detail'>$d_orderdateSTR</b></td>
+              <td onclick=\"location.href='/index_intranet.php?view=order_driver&d_druid=$d_druid&d_orderdate=$d_orderdate&page=$page&key_word=$key_word&column=$column&switched=$getSWHStr&sorting_type=$sorting_type&switch=$switch'\" style='cursor:pointer;cursor:hand;'><b class='customer-info-detail'>$d_orderdateSTR</b></td>
-              <td>$m_initial</td>
+              <td>$d_drinitial</td>
               <td><!--font color=red>$nowsiteno</font>/-->$siteno</td>
               <td>$h_departuretime</td>
               <td>$h_arrivaltime</td>
@@ -226,7 +227,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
               <td style=\"text-align:right; padding-right:20px;\">$balance</td>
               <td style=\"text-align:right; padding-right:20px;\">$h_balance_g</td>
               <td>
-                  <button type=\"button\" class=\"dailyRecordClass btn icon-modify\" data-bs-toggle=\"modal\" data-bs-target=\"#myModalDailyRecord\" data-modeid=\"$dailymode\" data-uid=\"$h_uid\" data-driverid=\"$d_driveruid\" data-dateid=\"$d_orderdate\" data-modify-type=\"standard-access\">
+                  <button type=\"button\" class=\"dailyRecordClass btn icon-modify\" data-bs-toggle=\"modal\" data-bs-target=\"#myModalDailyRecord\" data-modeid=\"$dailymode\" data-uid=\"$h_uid\" data-driverid=\"$d_driveruid\" data-druid=\"$d_druid\" data-dateid=\"$d_orderdate\" data-modify-type=\"standard-access\">
                     <i class=\"bi bi-pencil-square icon-edit\"></i>
                   </button>
               </td>
@@ -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);

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 .= "
+								<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_initial']."</option>";
+								
+}
+
+
+
 // Account Status
 $cstatus = 'T';
 
@@ -184,7 +200,8 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
             <td><b>$max_nameSTR</b></td>
             <td>$max_accountnoSTR</td>
             <td>$max_addressSTR</td>
-            <td>".$rt_dvr['m_initial']."</td>
+            <td>".$d_region."</td>
+            <td>".$d_drinitial."</td>
             <td style=\"text-align:right; padding-right:20px;\">$d_quantity</td>
             <td style=\"text-align:right; padding-right:50px;\">$d_payamount</td>
             <td class=\"opt-icon\">
@@ -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 .= "
-								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
+								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_region']." (".$lt_driver['m_initial'].")</option>";
 								
 }
+*/
+
 
 
 
@@ -420,6 +439,7 @@ function goSearch(f){
             <th>Restaurant Name</th>
             <th>Account</th>
             <th>Address</th>
+            <th>Region</th>
             <th>Driver</th>
             <th style="text-align:right; padding-right:20px;">Oil Qty.</th>
             <th style="text-align:right; padding-right:50px;">Paid</th>

public_html/doc/report_daily.php

@@ -17,18 +17,21 @@ else {
 //echo "<br><br><br><br><br><br>[$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 = "<tr><th class='col-daily-date'></th>
 $title2STR = "<tr>
           		<th></th>
           		<th class='th-daily-date'></th>";
-                 
+echo "<br><br><br><br>";               
 while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
-	$driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']);	
-	$driverArray += $driverArrayTmp;
 
-	$titleSTR .= "<th colspan='3' class='th-daily-date'>".$lt_driver['m_initial']."</th>";
+	$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");
 
-	$title2STR .= "<th>Volume</th>
+//echo "[OUT][".$lt_driver['dr_initial']."][$rt_sumqty][".$lt_driver['dr_status']."]<br>";
-          			<th>Visit</th>
-          			<th>Call</th>";
 
-	$driverCnt++;
+	if ((int)$rt_sumqty > 0 ) { //|| $lt_driver['dr_status'] == 'A'
+			$driverArrayTmp = array($lt_driver['dr_uid'] => $lt_driver['dr_initial']);	
+			$driverArray += $driverArrayTmp;
 					
+			$titleSTR .= "<th colspan='3' class='th-daily-date'>".$lt_driver['dr_initial']."</th>";
+			
+			$title2STR .= "<th>Volume</th>
+		          			<th>Visit</th>
+		          			<th>Call</th>";
+
+			$driverCnt++;
+//echo "[###IN][".$lt_driver['dr_initial']."][$rt_sumqty][".$lt_driver['dr_status']."]<br>";
+	}
+	
+
+	$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']."]<br>";
+
+	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']."]<br>";			
+	}	
+//echo "[$qry_summon]<br><br>";		
 }
 
 $titleSTR .= "<th>Total</th></tr>\n";
@@ -76,17 +102,17 @@ for ($dday = 1; $dday <= $getLastday; $dday ++) {
           
 			foreach ($driverArray as $kkey => $vvalue) {
 				
-					$qry = "SELECT rd_quantity, rd_visit, rd_call
+					$qry = "SELECT rdd_quantity, rdd_visit, rdd_call
-									FROM tbl_report_daily
+									FROM tbl_report_daily_driver
-									WHERE rd_driveruid = '$kkey' AND rd_orderdate = '".$startYearMonth.$ddaytmp."' " ;
+									WHERE rdd_druid = '$kkey' AND rdd_orderdate = '".$startYearMonth.$ddaytmp."' " ;
 					$rt = $jdb->fQuery($qry, "list error");
 					
 					//echo "[$qry]<br>";
 
 					if ($rt[0] != "") {
-						$day_quantity = $rt['rd_quantity'];
+						$day_quantity = $rt['rdd_quantity'];
-						$day_visit = $rt['rd_visit'];
+						$day_visit = $rt['rdd_visit'];
-						$day_call = $rt['rd_call'];  
+						$day_call = $rt['rdd_call'];  
 					} else {
 						$day_quantity = "";
 						$day_visit = "";
@@ -157,8 +183,8 @@ for ($dday = 1; $dday <= $getLastday; $dday ++) {
 $rowMSTR = "<tr class='bg-total'>
 				          <td>TOTAL</td><td class='th-daily-qty'></td>";
 foreach ($driverArray as $kkey => $vvalue) {						
-		$qry_sum = "select sum(rd_quantity) AS quantity, sum(rd_visit) AS visitno, sum(rd_call) AS callno
+		$qry_sum = "select sum(rdd_quantity) AS quantity, sum(rdd_visit) AS visitno, sum(rdd_call) AS callno
-								FROM tbl_report_daily WHERE rd_driveruid = '".$kkey."' AND rd_orderdate LIKE '".$startYearMonth."%' ";
+								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]<br>";
 		$rowMSTR .= "<td align=right>".number_format(floatval($rt_sum['quantity']))."</td><td align=right>".$rt_sum['visitno']."</td><td align=right class='th-daily-qty'>".$rt_sum['callno']."</td>";
@@ -171,7 +197,7 @@ $rowMSTR .= "<td class='th-daily-qty'></td></tr>\n";
 // Get Last year Title
 $rowLastTSTR = "<tr class='tr-title-pickup'><th class='br-th-pickup'>Month</th>";
 
-foreach ($driverArray as $kkey => $vvalue) {
+foreach ($driverArrayMon as $kkey => $vvalue) {
 		$rowLastTSTR .= "<th>".$vvalue."</th>
             <th>Calls</th>
             <th class='br-th-pickup'>Visit</th>\n";
@@ -195,11 +221,11 @@ for ($mmonth = 1; $mmonth <= 12; $mmonth ++) {
 			
       $rowLastSTR .= "<tr><td class='br-visit'>".$lastYear."-".$mmonthtmp."</td>";
           
-			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 
+					$qry_m = "SELECT SUM(rdd_quantity) AS quantity, SUM(rdd_call) AS callno, SUM(rdd_visit) AS visitno 
-									FROM tbl_report_daily 
+									FROM tbl_report_daily_driver 
-									WHERE rd_orderdate LIKE '".$lastYear.$mmonthtmp."%' AND rd_driveruid = '$kkey'";
+									WHERE rdd_orderdate LIKE '".$lastYear.$mmonthtmp."%' AND rdd_druid = '$kkey'";
 
 					$rt_m = $jdb->fQuery($qry_m, "list error");
 					

public_html/doc/report_daily_2024.php

@@ -0,0 +1,918 @@
+<?
+// Level 9 이하만 사용 가능
+$func->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 "<br><br><br><br><br><br>[$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]<br>";
+
+$titleSTR = "<tr><th class='col-daily-date'></th>
+          	<th class='th-daily-date'></th>";
+
+$title2STR = "<tr>
+          		<th></th>
+          		<th class='th-daily-date'></th>";
+                 
+while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
+	$driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']);	
+	$driverArray += $driverArrayTmp;
+	
+	$titleSTR .= "<th colspan='3' class='th-daily-date'>".$lt_driver['m_initial']."</th>";
+	
+	$title2STR .= "<th>Volume</th>
+          			<th>Visit</th>
+          			<th>Call</th>";
+
+	$driverCnt++;
+	
+}
+
+$titleSTR .= "<th>Total</th></tr>\n";
+$title2STR .= "<th>(L)</th></tr>\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 .= "<tr><td>".substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2)."-".$ddaytmp."</td>
+          			<td class='th-daily-qty'>".$getWeekday."</td>";
+          
+			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]<br>";
+
+					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 .= "<td align=right>".number_format(floatval($day_quantity))."</td><td align=right>$day_visit</td><td  class='th-daily-qty' align=right>$day_call</td>";
+					
+					$day_total += (int)$day_quantity;
+				
+			}
+
+//print_r ($weekly_data);
+
+
+	
+			$rowSTR .= "<td class='th-daily-qty' align=right>".number_format($day_total)."</td></tr>\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 .= "<tr class='bg-yellow'>
+										          <td></td><td class='th-daily-qty'></td>";
+						foreach ($driverArray as $kkey => $vvalue) {								          
+								$rowSTR .= "<td align=right>".number_format(floatval($weekly_quantity[$kkey]))."</td><td align=right>".$weekly_visit[$kkey]."</td><td align=right class='th-daily-qty'>".$weekly_call[$kkey]."</td>";
+						}
+					
+						$rowSTR .= "<td class='th-daily-qty'></td></tr>\n";
+		        
+		        
+						//print_r ($weekly_visit);
+						unset($weekly_data);
+						unset($weekly_quantity);
+						unset($weekly_visit);
+						unset($weekly_call);
+						
+						//break;
+			}
+}
+
+
+
+// Get This Month Total Data
+$rowMSTR = "<tr class='bg-total'>
+				          <td>TOTAL</td><td class='th-daily-qty'></td>";
+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]<br>";
+		$rowMSTR .= "<td align=right>".number_format(floatval($rt_sum['quantity']))."</td><td align=right>".$rt_sum['visitno']."</td><td align=right class='th-daily-qty'>".$rt_sum['callno']."</td>";
+		
+}
+$rowMSTR .= "<td class='th-daily-qty'></td></tr>\n";		
+
+
+
+// Get Last year Title
+$rowLastTSTR = "<tr class='tr-title-pickup'><th class='br-th-pickup'>Month</th>";
+
+foreach ($driverArray as $kkey => $vvalue) {
+		$rowLastTSTR .= "<th>".$vvalue."</th>
+            <th>Calls</th>
+            <th class='br-th-pickup'>Visit</th>\n";
+}
+$rowLastTSTR .= "<th>Total(L)</th></tr>\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 .= "<tr><td class='br-visit'>".$lastYear."-".$mmonthtmp."</td>";
+          
+			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]<br>";
+
+					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 .= "<td align=right>".number_format(floatval($month_quantity))."</td><td align=right>$month_call</td><td class='br-visit' align=right>$month_visit</td>";
+				
+			}
+			
+			$rowLastSTR .= "<td align=right>".number_format($month_quantity_total)."</td></tr>\n";
+			
+}
+
+$startYearMonthTmp = substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2);
+
+?>
+
+
+<script type="text/javascript">
+$(document).ready(function(){
+	
+		$(function() {
+		     $('.date-picker').datepicker(
+		                    {
+		                        dateFormat: "yy-mm",
+		                        changeMonth: true,
+		                        changeYear: true,
+		                        showButtonPanel: true,
+		                        onClose: function(dateText, inst) {
+
+
+		                            function isDonePressed(){
+		                                return ($('#ui-datepicker-div').html().indexOf('ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all ui-state-hover') > -1);
+		                            }
+
+		                            if (isDonePressed()){
+		                                var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val();
+		                                var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val();
+		                                $(this).datepicker('setDate', new Date(year, month, 1)).trigger('change');
+		                                
+		                                 $('.date-picker').focusout()//Added to remove focus from datepicker input box on selecting date
+		                            }
+		                        },
+		                        beforeShow : function(input, inst) {
+
+		                            inst.dpDiv.addClass('month_year_datepicker')
+
+		                            if ((datestr = $(this).val()).length > 0) {
+		                                year = datestr.substring(datestr.length-4, datestr.length);
+		                                month = datestr.substring(0, 2);
+																		$(this).datepicker('option', 'defaultDate', new Date(2023, 11, 31));
+		                                $(this).datepicker('option', 'maxDate', new Date(2023, 11, 31));
+		                                //$(this).datepicker('option', 'defaultDate', new Date(year, month-1, 1));
+		                                $(this).datepicker('setDate', new Date(2023, 11, 31));
+		                                $(".ui-datepicker-calendar").hide();
+		                            }
+		                        }
+		                    })
+		});
+	
+});
+</script>
+
+<style>
+.ui-datepicker-calendar {
+    display: none;
+    }
+</style>
+
+
+<SCRIPT LANGUAGE=JAVASCRIPT>
+<!--
+function goSearch(f){
+    var f = document.form3;
+
+			//f.searchtype.value = document.getElementById('searchtype').value;
+			//f.searchDriver.value = document.getElementById('searchDriver').value;
+			//f.key_word.value = document.getElementById('key_word').value;
+			f.submit();
+}
+//-->
+</SCRIPT>
+
+
+
+
+  <main id="main" class="main">
+
+    <!-- ======= Breadcrumbs ======= -->
+    <div class="breadcrumbs">
+      <div class="container">
+
+        <div class="d-flex justify-content-between align-items-center">
+          <h2>DAILY QUANTITY REPORT (~ 2023)</h2>
+          <ol>
+            <li><a href="index.html">HOME</a></li>
+            <li>REPORT</li>
+            <li>DAILY QUANTITY REPORT</li>
+          </ol>
+        </div>
+
+      </div>
+    </div><!-- End Breadcrumbs -->
+
+    <section class="page">
+
+
+      <div class="container" data-aos="fade-up">
+
+          <div class="wrap-border">
+						<FORM CLASS="form-report" METHOD=POST NAME=form3 ACTION='<?=$_SERVER["PHP_SELF"]?>'>
+							<INPUT TYPE=HIDDEN NAME=view VALUE='report_daily'>
+							<INPUT TYPE=HIDDEN NAME=key_word VALUE=''>
+													            	
+              <table class="table-search-report col-float-right">
+                <tr>
+                  <td>
+                  	 <input name="startYearMonth" id="startYearMonth" class="custom-select date-picker" value="<?=$startYearMonthTmp?>" onChange="goSearch();"/>
+                    <!--input type="date" placeholder="2022-12-31" class="custom-select"-->     
+
+                  </td>
+                  <!--td> 
+                      <input class="custom-select" type="text" placeholder="Search.." name="search">
+                  </td-->
+                  <td>
+                      <button class="btn btn-search" type="submit"><i class="bi-search"></i></button>
+                  </td>
+  
+                </tr>
+  
+              </table>
+            </FORM>
+          </div><!--wrap-border-->
+  
+      </div><!--container Ends-->
+
+      
+
+
+      <div class="container" data-aos="fade-up"  style="clear: both;">
+        
+        <div class="wrap-overflow forecast-info report-wrap margin-top-25">
+
+
+        </div>
+    </div><!--container Ends-->
+
+
+    <div class="container" data-aos="fade-up">
+      <h4 class="text-center">Driver's Daily Pickup Amount </h4>
+
+      <div class="wrap-overflow">
+        <table class="tb-list-daily tb-report">
+
+<!--
+      <tr>
+          <th class="col-daily-date"></th>
+          <th class="th-daily-date"></th>
+          <th colspan="3" class="th-daily-date">H.Y</th>
+          <th colspan="3" class="th-daily-date">J.S</th>
+          <th colspan="3" class="th-daily-date">J.P</th>
+          <th colspan="3" class="th-daily-date">T.K</th>
+          <th colspan="3" class="th-daily-date">J.L</th>
+          <th colspan="3" class="th-daily-date">J.O</th>
+          <th colspan="3" class="th-daily-date">H.J</th>
+          <th colspan="3" class="th-daily-date">H.S</th>
+          <th colspan="3" class="th-daily-date">Y.S</th>
+          <th colspan="2" class="th-daily-date">Installation</th>
+          <th colspan="2" class="th-daily-date">Extra</th>
+          <th>Total</th>
+        </tr>
+
+
+        <tr>
+          <th></th>
+          <th class="th-daily-date"></th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th>Visit</th>
+          <th class="th-daily-date">Call</th>
+          <th>Volume</th>
+          <th class="th-daily-date">Visit</th>
+          <th>Volume</th>
+          <th class="th-daily-date">Visit</th>
+          <th>(L)</th>
+        </tr>
+-->
+
+<?=$titleSTR?>
+<?=$title2STR?>
+<?=$rowSTR?>
+<?=$rowMSTR?>
+
+<!--
+        <tr>
+          <td>2022-11-02</td>
+          <td class="th-daily-qty">TUE</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+
+        <tr>
+          <td>2022-11-03</td>
+          <td class="th-daily-qty">WED</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+
+        <tr>
+          <td>2022-11-04</td>
+          <td class="th-daily-qty">THU</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+
+        <tr>
+          <td>2022-11-05</td>
+          <td class="th-daily-qty">FRI</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+
+        <tr>
+          <td class="txt-date-green">2022-11-06</td>
+          <td class="th-daily-qty">SAT</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+
+
+        <tr class="bg-yellow">
+          <td></td>
+          <td class="th-daily-qty"></td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+
+        
+        <tr>
+          <td>2022-11-02</td>
+          <td class="th-daily-qty">TUE</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+
+        <tr class="bg-total">
+          <td>Total</td>
+          <td class="th-daily-qty"></td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>3010</td>
+          <td>25</td>
+          <td class="th-daily-qty">1</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>310</td>
+          <td class="th-daily-qty">25</td>
+          <td>2418411</td>
+        </tr>
+-->
+
+        
+
+
+      </table>
+      </div>
+    </div>
+
+
+    <div class="container  margin-top-25" data-aos="fade-up">
+      <h4 class="text-center">Monthly Pickup Total for <?=$lastYear?></h4>
+
+      <div class="wrap-overflow">
+        <table class="tb-list-daily tb-report">
+
+<?=$rowLastTSTR?>
+<?=$rowLastSTR?>
+
+
+<!--
+          <tr class="tr-title-pickup">
+            <th class="br-th-pickup">Month</th>
+            <th>H.Y</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>J.S</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>J.P</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>T.K</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>J.L</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>J.O</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>H.J</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>H.S</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>Y.S</th>
+            <th>Calls</th>
+            <th class="br-th-pickup">Visit</th>
+
+            <th>Install</th>
+            <th>Extra</th>
+            <th>Total(L)</th>
+          </tr>
+-->
+
+<!--
+          <tr>
+            <td class="br-visit">January</td>
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit">385</td>
+
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit">385</td>
+
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit"> 385</td>
+            
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit">385</td>
+            
+            
+            <td>38511</td>
+            <td>34011</td>
+            <td>4183333</td>
+            
+            
+            
+            
+            
+          </tr>
+
+          <tr>
+            <td class="br-visit">February</td>
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit">385</td>
+
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit">385</td>
+
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit">385</td>
+            
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            
+            <td>38511</td>
+            <td>34</td>
+            <td class="br-visit">418</td>
+
+            <td>29013</td>
+            <td>47</td>
+            <td class="br-visit">385</td>
+            
+            
+            <td>38511</td>
+            <td>34011</td>
+            <td>4183333</td>
+            
+            
+            
+            
+            
+          </tr>
+-->
+
+        </table>
+      </div>
+    </div>
+
+    
+<!--
+    <div class="container margin-top-25" style="clear: both;">
+        <a class="btn-sub text-center width-200 col-float-right" href="#">LIST</a>
+    </div>
+-->
+        
+
+    </section>
+
+  </main><!-- End #main -->

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_subqry .= " AND m_currentdriver = '".$searchDriver."' ";
-		$add_hsubqry .= " AND h_driveruid = '".$searchDriver."' ";
+		$add_hsubqry .= " AND h_druid = '".$searchDriver."' ";
-		$add_dsubqry .= " AND d_driveruid = '".$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]<br>";
 
 	// 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]<br>";
 		
 	// 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]<br>";							
 $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 ";
+$qry_dr = "SELECT * FROM tbl_driver WHERE dr_status = 'A' ORDER by dr_initial ASC ";
-$rt_driver = $jdb->nQuery($qry_driver, "list error"); 
+$rt_dr = $jdb->nQuery($qry_dr, "list error"); 
+
 
 $c_driveruidSTR = "
 								<option value='ALL' $selectStr>ALL</option>";
 
-while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
+while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) {
 
-	if ($lt_driver['m_uid'] == $searchDriver) { 
+	if ($lt_dr['dr_uid'] == $searchDriver) $selectStr = "selected";
-			$selectStr = "selected";
-			$getDriverInitial = $lt_driver['m_initial'];
-	}
 	else $selectStr = "";
 	
 	$c_driveruidSTR .= "
-								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
+								<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_initial']."</option>";
 								
 }
 
@@ -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);
               <td class="td-title-info">CASH IN</td>
               <td class="td-title-info">CASH OUT</td>
               <td class="td-title-info">CASH RETURN</td>
-			  <td class="td-title-info">BALANCE</td>
               <td class="td-title-info">GAS</td>
             </tr>
             <tr>
@@ -481,7 +425,6 @@ addLog ("add", "EXPENSE LIST", "VIEW", $lguserid, $query, $lgno);
               <td class="td-text-info"><span class="sp-oil"><?=$getCASHINSUM?></span></td>
               <td class="td-text-info"><span class="sp-oil"><?=$getCASHOUTSUM?></span></td>
               <td class="td-text-info"><span class="sp-oil"><?=$getCASHRETURNSUM?></span></td>
-			  <td class="td-text-info"><span class="sp-oil"><?=$getTOTALBALANCE?></span></td>
               <td class="td-text-info"><span class="sp-oil"><?=$getGASSUM?></span></td>
             </tr>
           </table>

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 = "<tr>
                 <th class='td-50'></th>";
 
 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 .= "<th class='td-80' style='text-align:center;'>".$lt_driver['m_initial']."</th>";
+	$titleSTR .= "<th class='td-80' style='text-align:center;'>".$lt_driver['m_region']."</th>";
 }	
 
 $titleSTR .= "<th class='td-80' style='text-align:center;'>TOTAL</th><th class='td-80' style='text-align:center;'>%</th>";
@@ -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
+					//$qry_eu = "SELECT 
-											FROM  tbl_daily 
+					//							SUM(CASE WHEN d_visitdate like '".$startYearMonth."%' THEN d_quantity ELSE 0 END) AS EUDATA
-											WHERE d_customeruid != '' AND d_status = 'F' 
+					//						FROM  tbl_daily 
-												AND (d_customeruid IN (SELECT c.c_uid FROM tbl_customer c WHERE c.c_driveruid = '".$kkey."' ". $status_query. "))
+					//						WHERE d_customeruid != '' AND d_status = 'F' 
-												AND d_form_eu != '' AND d_form_eu <= d_orderdate ";
+					//							AND (d_customeruid IN (SELECT c.c_uid FROM tbl_customer c WHERE c.c_driveruid = '".$kkey."' ". $status_query. "))
-			//echo "<br><br><br><br><br>EU[$qry_eu]<br>";			
+					//							AND d_form_eu != '' AND d_form_eu <= d_orderdate ";
+					//echo "<br><br><br><br><br>EU[$qry_eu]<br>";			
 					//$rt_eu = $jdb->fQuery($qry_eu, "fetch query error");
-					$EUDataSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_eu['EUDATA']))."</td>";
+					//$EUDataSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_eu['EUDATA']))."</td>";
 
 
 					$qry_sum = "select sum(rd_quantity) AS quantity_uco, sum(rd_quantity_iscc) AS quantity_iscc, sum(rd_quantity_corsia) AS quantity_corsia

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 = "<tr>
                 <th class='td-50'></th>";
 
 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 .= "<th class='td-80' style='text-align:center;'>".$lt_driver['m_initial']."</th>";
+	$titleSTR .= "<th class='td-80' style='text-align:center;'>".$lt_driver['m_region']."</th>";
 }	
 
 $titleSTR .= "</tr>\n";
@@ -208,11 +209,11 @@ function goSearch(f){
       <div class="container">
 
         <div class="d-flex justify-content-between align-items-center">
-          <h2>MONTHLY DRIVERS REPORT</h2>
+          <h2>MONTHLY AREA REPORT</h2>
           <ol>
             <li><a href="index.html">HOME</a></li>
             <li>REPORT</li>
-            <li>MONTHLY DRIVERS REPORT</li>
+            <li>MONTHLY AREA REPORT</li>
           </ol>
         </div>
 
@@ -252,7 +253,7 @@ function goSearch(f){
       </div><!--container Ends-->
       <div class="container" data-aos="fade-up" style="clear: both;">
         <hr>
-        <h4 class="text-center">Monthly Drivers Report (<?=$startYearMonthTmp?>)</h2>
+        <h4 class="text-center">Monthly Area Report (<?=$startYearMonthTmp?>)</h2>
         <hr>
 
       </div>
@@ -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"));

public_html/doc/report_monthly_2024.php

@@ -0,0 +1,526 @@
+<?
+// Level 9 이하만 사용 가능
+$func->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 "<br><br><br><br><br><br>[$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]<br>";
+
+// Get Driver with Title
+$titleSTR = "<tr>
+                <th class='td-140'></th>
+                <th class='td-50'></th>";
+
+while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
+	$driverArrayTmp = array($lt_driver['m_uid'] => $lt_driver['m_initial']);	
+	$driverArray += $driverArrayTmp;
+	
+	$titleSTR .= "<th class='td-80' style='text-align:center;'>".$lt_driver['m_initial']."</th>";
+}	
+
+$titleSTR .= "</tr>\n";
+
+
+// Get Oil Quantity
+$rowOilSTR = "<tr>
+				          <td rowspan='2'>Oil Pickup Volumes</td><td>(L)</td>";
+$rowOilTonSTR = "<tr>
+				          <td>(Mton)</td>";				          
+$rowVisitSTR = "<tr>
+				          <td># of Account Visits</td><td></td>";
+$rowAccountSTR = "<tr>
+				          <td>Total Accounts</td><td></td>";
+$EUDataSTR = "<tr>
+				          <td>ISCC Oil Volumes</td><td></td>";				          
+$rowNewSTR = "<tr>
+				          <td>Total Contracts</td><td></td>";
+
+
+$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 "<br><br><br><br><br>EU[$qry_eu]<br>";			
+		$rt_eu = $jdb->fQuery($qry_eu, "fetch query error");
+		$EUDataSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_eu['EUDATA']))."</td>";
+*/
+			
+		$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]<br>";
+		$rowOilSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_sum['quantity']))."</td>";
+		$rowOilTonSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_sum['quantity'])*0.00091068,1)."</td>";
+		$rowVisitSTR .= "<td style='text-align:right;'>".(int)$rt_sum['visitno']."</td>";
+		
+		$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]<br>";
+		$rowAccountSTR .= "<td style='text-align:right;'>".(int)$rt_acc['accountno']."</td>";
+		$rowNewSTR .= "<td style='text-align:right;'>".(int)$rt_acc['newaccount']."</td>";
+		
+		$driverCnt++;	
+		
+}
+
+$rowOilSTR .= "</tr>\n";
+$rowOilTonSTR .= "</tr>\n";
+$EUDataSTR .= "</tr>\n";
+$rowVisitSTR .= "</tr>\n";
+$rowAccountSTR .= "</tr>\n";	
+$rowNewSTR .= "</tr>\n";	
+
+
+$startYearMonthTmp = substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2);
+
+?>
+	
+	
+<script type="text/javascript">
+$(document).ready(function(){
+	
+		$(function() {
+		     $('.date-picker').datepicker(
+		                    {
+		                        dateFormat: "yy-mm",
+		                        changeMonth: true,
+		                        changeYear: true,
+		                        showButtonPanel: true,
+		                        onClose: function(dateText, inst) {
+
+
+		                            function isDonePressed(){
+		                                return ($('#ui-datepicker-div').html().indexOf('ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all ui-state-hover') > -1);
+		                            }
+
+		                            if (isDonePressed()){
+		                                var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val();
+		                                var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val();
+		                                $(this).datepicker('setDate', new Date(year, month, 1)).trigger('change');
+		                                
+		                                 $('.date-picker').focusout()//Added to remove focus from datepicker input box on selecting date
+		                            }
+		                        },
+		                        beforeShow : function(input, inst) {
+
+		                            inst.dpDiv.addClass('month_year_datepicker')
+
+		                            if ((datestr = $(this).val()).length > 0) {
+		                                year = datestr.substring(datestr.length-4, datestr.length);
+		                                month = datestr.substring(0, 2);
+		                                //$(this).datepicker('option', 'defaultDate', new Date(year, month-1, 1));
+																		$(this).datepicker('option', 'defaultDate', new Date(2023, 11, 31));
+		                                $(this).datepicker('option', 'maxDate', new Date(2023, 11, 31));
+		                                //$(this).datepicker('option', 'defaultDate', new Date(year, month-1, 1));
+		                                $(this).datepicker('setDate', new Date(2023, 11, 31));
+		                                $(".ui-datepicker-calendar").hide();
+		                            }
+		                        }
+		                    })
+		});
+	
+});
+</script>
+
+<style>
+.ui-datepicker-calendar {
+    display: none;
+    }
+</style>
+
+
+<SCRIPT LANGUAGE=JAVASCRIPT>
+<!--
+function goSearch(f){
+    var f = document.form3;
+
+			//f.searchtype.value = document.getElementById('searchtype').value;
+			//f.searchDriver.value = document.getElementById('searchDriver').value;
+			//f.key_word.value = document.getElementById('key_word').value;
+			f.submit();
+}
+//-->
+</SCRIPT>
+
+
+
+
+  <main id="main" class="main">
+
+    <!-- ======= Breadcrumbs ======= -->
+    <div class="breadcrumbs">
+      <div class="container">
+
+        <div class="d-flex justify-content-between align-items-center">
+          <h2>MONTHLY DRIVERS REPORT (~ 2023)</h2>
+          <ol>
+            <li><a href="index.html">HOME</a></li>
+            <li>REPORT</li>
+            <li>MONTHLY DRIVERS REPORT</li>
+          </ol>
+        </div>
+
+      </div>
+    </div><!-- End Breadcrumbs -->
+
+    <section class="page">
+
+
+      <div class="container" data-aos="fade-up">
+
+          <div class="wrap-border">
+						<FORM CLASS="form-report" METHOD=POST NAME=form3 ACTION='<?=$_SERVER["PHP_SELF"]?>'>
+							<INPUT TYPE=HIDDEN NAME=view VALUE='report_monthly_2024'>
+							<INPUT TYPE=HIDDEN NAME=key_word VALUE=''>
+													            	
+              <table class="table-search-report col-float-right">
+                <tr>
+                  <td>
+                  	 <input name="startYearMonth" id="startYearMonth" class="custom-select date-picker" value="<?=$startYearMonthTmp?>" onChange="goSearch();"/>
+                    <!--input type="date" placeholder="2022-12-31" class="custom-select"-->     
+
+                  </td>
+                  <!--td> 
+                      <input class="custom-select" type="text" placeholder="Search.." name="search">
+                  </td-->
+                  <td>
+                      <button class="btn btn-search" type="submit"><i class="bi-search"></i></button>
+                  </td>
+  
+                </tr>
+  
+              </table>
+            </FORM>
+          </div><!--wrap-border-->
+  
+      </div><!--container Ends-->
+      <div class="container" data-aos="fade-up" style="clear: both;">
+        <hr>
+        <h4 class="text-center">Monthly Drivers Report (<?=$startYearMonthTmp?>)</h2>
+        <hr>
+
+      </div>
+
+
+      <div class="container" data-aos="fade-up">
+
+        <div class="wrap-overflow forecast-info report-wrap">
+            <table class="tb-list tb-report">
+
+<?=$titleSTR?>
+
+<?=$rowOilSTR?>
+<?=$rowOilTonSTR?>
+<!--<?=$EUDataSTR?>-->
+<?=$rowVisitSTR?>
+<?=$rowAccountSTR?>
+
+
+
+<!--
+              <tr>
+                <td rowspan="2">오일 픽업 양</td>
+                <td>(L)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>(Mton)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>계정 방문 횟수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>총 계정 수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+
+              <tr>
+                <td>상위 20% 계정 수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>총 계약건 수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+-->
+              
+              <!--tr>
+                <td rowspan="2">총 근무 시간</td>
+                <td>(hr)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>(days)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr-->
+            </table>
+        </div>
+    </div><!--container Ends-->
+
+
+
+<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+  <script type="text/javascript">
+    google.charts.load("current", {packages:['corechart']});
+    google.charts.setOnLoadCallback(drawChart);
+    function drawChart() {
+      var data = google.visualization.arrayToDataTable([
+        ["Element", "Volume", { role: "style" } ],
+
+<?=$graphOilTonSTR?>
+
+/*
+        ["Copper", 8.94, "orange"],
+        ["Silver", 10.49, "gold"],
+        ["Gold", 19.30, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Copper", 8.94, "red"],
+        ["Silver", 10.49, "orange"],
+        ["Gold", 19.30, "gold"],
+        ["Platinum", 21.45, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Silver", 10.49, "red"],
+        ["Gold", 19.30, "orange"],
+        ["Platinum", 21.45, "gold"]                  
+*/
+      ]);
+
+      var view = new google.visualization.DataView(data);
+      view.setColumns([0, 1,
+                       { calc: "stringify",
+                         sourceColumn: 1,
+                         type: "string",
+                         role: "annotation" },
+                       2]);
+
+      var options = {
+        //title: "Density of Precious Metals, in g/cm^3",
+        //width: 600,
+        //height: 400,
+        bar: {groupWidth: "60%"},
+        legend: { position: "none" },
+	      hAxis: {title: 'Driver', titleTextStyle: {color: 'black'}},
+	      vAxis: {title: 'Volume (Mton)', titleTextStyle: {color: 'black'}}        
+      };
+      var chart = new google.visualization.ColumnChart(document.getElementById("columnchart_values"));
+      chart.draw(view, options);
+  }
+
+
+
+
+    google.charts.setOnLoadCallback(drawChartVisit);
+    function drawChartVisit() {
+      var data = google.visualization.arrayToDataTable([
+        ["Element", "Visits", { role: "style" } ],
+
+<?=$graphVisitSTR?>
+
+/*
+        ["Copper", 8.94, "orange"],
+        ["Silver", 10.49, "gold"],
+        ["Gold", 19.30, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Copper", 8.94, "red"],
+        ["Silver", 10.49, "orange"],
+        ["Gold", 19.30, "gold"],
+        ["Platinum", 21.45, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Silver", 10.49, "red"],
+        ["Gold", 19.30, "orange"],
+        ["Platinum", 21.45, "gold"]                  
+*/
+      ]);
+
+      var view = new google.visualization.DataView(data);
+      view.setColumns([0, 1,
+                       { calc: "stringify",
+                         sourceColumn: 1,
+                         type: "string",
+                         role: "annotation" },
+                       2]);
+
+      var options = {
+        //title: "Density of Precious Metals, in g/cm^3",
+        //width: 600,
+        //height: 400,
+        bar: {groupWidth: "60%"},
+        legend: { position: "none" },
+	      hAxis: {title: 'Driver', titleTextStyle: {color: 'black'}},
+	      vAxis: {title: 'Total Visits', titleTextStyle: {color: 'black'}}        
+      };
+      var chart = new google.visualization.ColumnChart(document.getElementById("columnchart_visit_values"));
+      chart.draw(view, options);
+  }
+			$(window).resize(function(){
+			       // drawChart();
+			        //drawRegionsMap();
+			});
+			  
+  </script>
+
+
+
+    <div class="container margin-top-25" data-aos="fade-up">
+      <br>
+      <div class="grid-layout-graph-col-2">
+        <div class="graph-box">
+          <br>
+          <h4 class="text-center">Oil Pickup Volume (Mton)</h4>
+          <div class="border-graph">
+          	
+          	<div id="columnchart_values" style="width: 100%; height: 500px;"></div>
+          	
+          </div>
+        </div>
+        <div class="graph-box">
+          <br>
+          <h4 class="text-center">Total Visits</h4>
+          <div class="border-graph">
+          	
+          	<div id="columnchart_visit_values" style="width: 100%; height: 500px;"></div>
+          	
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+<!--
+    <div class="container margin-top-25">
+        <a class="btn-sub text-center width-200 col-float-right" href="#">LIST</a>
+    </div>
+-->        
+
+    </section>
+
+  </main><!-- End #main -->

public_html/doc/report_monthly_driver.php

@@ -0,0 +1,545 @@
+<?
+// Level 9 이하만 사용 가능
+$func->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 "<br><br><br><br><br><br>[$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]<br>";
+
+// Get Driver with Title
+$titleSTR = "<tr>
+                <th class='td-140'></th>
+                <th class='td-50'></th>";
+
+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 .= "<th class='td-80' style='text-align:center;'>".$lt_driver['dr_initial']."</th>";	
+	}
+
+}	
+$titleSTR .= "<th class='td-80' style='text-align:center;'>TOTAL</th>";	
+$titleSTR .= "</tr>\n";
+
+
+// Get Oil Quantity
+$rowOilSTR = "<tr>
+				          <td rowspan='2'>Oil Pickup Volumes</td><td>(L)</td>";
+$rowOilTonSTR = "<tr>
+				          <td>(Mton)</td>";				          
+$rowVisitSTR = "<tr>
+				          <td># of Account Visits</td><td></td>";
+$rowAccountSTR = "<tr>
+				          <td>Total Accounts</td><td></td>";
+$EUDataSTR = "<tr>
+				          <td>ISCC Oil Volumes</td><td></td>";				          
+$rowNewSTR = "<tr>
+				          <td>Total Contracts</td><td></td>";
+
+
+$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 "<br><br><br><br><br>EU[$qry_eu]<br>";			
+		$rt_eu = $jdb->fQuery($qry_eu, "fetch query error");
+		$EUDataSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_eu['EUDATA']))."</td>";
+*/
+			
+		$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]<br>";
+		$rowOilSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_sum['quantity']))."</td>";
+		$rowOilTonSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_sum['quantity'])*0.00091068,1)."</td>";
+		$rowVisitSTR .= "<td style='text-align:right;'>".(int)$rt_sum['visitno']."</td>";
+		
+		$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]<br>";
+		$rowAccountSTR .= "<td style='text-align:right;'>".(int)$rt_acc['accountno']."</td>";
+		$rowNewSTR .= "<td style='text-align:right;'>".(int)$rt_acc['newaccount']."</td>";
+		*/
+		
+		$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 .= "<td style='text-align:right;'>".number_format(floatval($rt_totsum['totquantity']))."</td>";
+$rowOilTonSTR .= "<td style='text-align:right;'>".number_format(floatval($rt_totsum['totquantity'])*0.00091068,1)."</td>";
+$rowVisitSTR .= "<td style='text-align:right;'>".(int)$rt_totsum['totvisitno']."</td>";
+
+		
+$rowOilSTR .= "</tr>\n";
+$rowOilTonSTR .= "</tr>\n";
+$EUDataSTR .= "</tr>\n";
+$rowVisitSTR .= "</tr>\n";
+$rowAccountSTR .= "</tr>\n";	
+$rowNewSTR .= "</tr>\n";	
+
+
+$startYearMonthTmp = substr($startYearMonth,0,4)."-".substr($startYearMonth,4,2);
+	
+?>
+	
+	
+<script type="text/javascript">
+$(document).ready(function(){
+	
+		$(function() {
+		     $('.date-picker').datepicker(
+		                    {
+		                        dateFormat: "yy-mm",
+		                        changeMonth: true,
+		                        changeYear: true,
+		                        showButtonPanel: true,
+		                        onClose: function(dateText, inst) {
+
+
+		                            function isDonePressed(){
+		                                return ($('#ui-datepicker-div').html().indexOf('ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all ui-state-hover') > -1);
+		                            }
+
+		                            if (isDonePressed()){
+		                                var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val();
+		                                var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val();
+		                                $(this).datepicker('setDate', new Date(year, month, 1)).trigger('change');
+		                                
+		                                 $('.date-picker').focusout()//Added to remove focus from datepicker input box on selecting date
+		                            }
+		                        },
+		                        beforeShow : function(input, inst) {
+
+		                            inst.dpDiv.addClass('month_year_datepicker')
+
+		                            if ((datestr = $(this).val()).length > 0) {
+		                                year = datestr.substring(datestr.length-4, datestr.length);
+		                                month = datestr.substring(0, 2);
+		                                $(this).datepicker('option', 'defaultDate', new Date(year, month-1, 1));
+		                                $(this).datepicker('setDate', new Date(year, month-1, 1));
+		                                $(".ui-datepicker-calendar").hide();
+		                            }
+		                        }
+		                    })
+		});
+	
+});
+</script>
+
+<style>
+.ui-datepicker-calendar {
+    display: none;
+    }
+</style>
+
+
+<SCRIPT LANGUAGE=JAVASCRIPT>
+<!--
+function goSearch(f){
+    var f = document.form3;
+
+			//f.searchtype.value = document.getElementById('searchtype').value;
+			//f.searchDriver.value = document.getElementById('searchDriver').value;
+			//f.key_word.value = document.getElementById('key_word').value;
+			f.submit();
+}
+//-->
+</SCRIPT>
+
+
+
+
+  <main id="main" class="main">
+
+    <!-- ======= Breadcrumbs ======= -->
+    <div class="breadcrumbs">
+      <div class="container">
+
+        <div class="d-flex justify-content-between align-items-center">
+          <h2>MONTHLY DRIVERS REPORT</h2>
+          <ol>
+            <li><a href="index.html">HOME</a></li>
+            <li>REPORT</li>
+            <li>MONTHLY DRIVERS REPORT</li>
+          </ol>
+        </div>
+
+      </div>
+    </div><!-- End Breadcrumbs -->
+
+    <section class="page">
+
+
+      <div class="container" data-aos="fade-up">
+
+          <div class="wrap-border">
+						<FORM CLASS="form-report" METHOD=POST NAME=form3 ACTION='<?=$_SERVER["PHP_SELF"]?>'>
+							<INPUT TYPE=HIDDEN NAME=view VALUE='report_monthly_driver'>
+							<INPUT TYPE=HIDDEN NAME=key_word VALUE=''>
+													            	
+              <table class="table-search-report col-float-right">
+                <tr>
+                  <td>
+                  	 <input name="startYearMonth" id="startYearMonth" class="custom-select date-picker" value="<?=$startYearMonthTmp?>" onChange="goSearch();"/>
+                    <!--input type="date" placeholder="2022-12-31" class="custom-select"-->     
+
+                  </td>
+                  <!--td> 
+                      <input class="custom-select" type="text" placeholder="Search.." name="search">
+                  </td-->
+                  <td>
+                      <button class="btn btn-search" type="submit"><i class="bi-search"></i></button>
+                  </td>
+  
+                </tr>
+  
+              </table>
+            </FORM>
+          </div><!--wrap-border-->
+  
+      </div><!--container Ends-->
+      <div class="container" data-aos="fade-up" style="clear: both;">
+        <hr>
+        <h4 class="text-center">Monthly Drivers Report (<?=$startYearMonthTmp?>)</h2>
+        <hr>
+
+      </div>
+
+
+      <div class="container" data-aos="fade-up">
+
+        <div class="wrap-overflow forecast-info report-wrap">
+            <table class="tb-list tb-report">
+
+<?=$titleSTR?>
+
+<?=$rowOilSTR?>
+<?=$rowOilTonSTR?>
+<!--<?=$EUDataSTR?>-->
+<?=$rowVisitSTR?>
+<!--<?=$rowAccountSTR?>-->
+
+
+
+<!--
+              <tr>
+                <td rowspan="2">오일 픽업 양</td>
+                <td>(L)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>(Mton)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>계정 방문 횟수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>총 계정 수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+
+              <tr>
+                <td>상위 20% 계정 수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>총 계약건 수</td>
+                <td></td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+-->
+              
+              <!--tr>
+                <td rowspan="2">총 근무 시간</td>
+                <td>(hr)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr>
+              <tr>
+                <td>(days)</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>81982</td>
+                <td>67097</td>
+                <td>67097</td>
+              </tr-->
+            </table>
+        </div>
+    </div><!--container Ends-->
+
+
+
+<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+  <script type="text/javascript">
+    google.charts.load("current", {packages:['corechart']});
+    google.charts.setOnLoadCallback(drawChart);
+    function drawChart() {
+      var data = google.visualization.arrayToDataTable([
+        ["Element", "Volume", { role: "style" } ],
+
+<?=$graphOilTonSTR?>
+
+/*
+        ["Copper", 8.94, "orange"],
+        ["Silver", 10.49, "gold"],
+        ["Gold", 19.30, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Copper", 8.94, "red"],
+        ["Silver", 10.49, "orange"],
+        ["Gold", 19.30, "gold"],
+        ["Platinum", 21.45, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Silver", 10.49, "red"],
+        ["Gold", 19.30, "orange"],
+        ["Platinum", 21.45, "gold"]                  
+*/
+      ]);
+
+      var view = new google.visualization.DataView(data);
+      view.setColumns([0, 1,
+                       { calc: "stringify",
+                         sourceColumn: 1,
+                         type: "string",
+                         role: "annotation" },
+                       2]);
+
+      var options = {
+        //title: "Density of Precious Metals, in g/cm^3",
+        //width: 600,
+        //height: 400,
+        bar: {groupWidth: "60%"},
+        legend: { position: "none" },
+	      hAxis: {title: 'Driver', titleTextStyle: {color: 'black'}},
+	      vAxis: {title: 'Volume (Mton)', titleTextStyle: {color: 'black'}}        
+      };
+      var chart = new google.visualization.ColumnChart(document.getElementById("columnchart_values"));
+      chart.draw(view, options);
+  }
+
+
+
+
+    google.charts.setOnLoadCallback(drawChartVisit);
+    function drawChartVisit() {
+      var data = google.visualization.arrayToDataTable([
+        ["Element", "Visits", { role: "style" } ],
+
+<?=$graphVisitSTR?>
+
+
+/*
+        ["Copper", 8.94, "orange"],
+        ["Silver", 10.49, "gold"],
+        ["Gold", 19.30, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Copper", 8.94, "red"],
+        ["Silver", 10.49, "orange"],
+        ["Gold", 19.30, "gold"],
+        ["Platinum", 21.45, "green"],
+        ["Platinum", 21.45, "blue"],
+        ["Silver", 10.49, "red"],
+        ["Gold", 19.30, "orange"],
+        ["Platinum", 21.45, "gold"]                  
+*/
+      ]);
+
+      var view = new google.visualization.DataView(data);
+      view.setColumns([0, 1,
+                       { calc: "stringify",
+                         sourceColumn: 1,
+                         type: "string",
+                         role: "annotation" },
+                       2]);
+
+      var options = {
+        //title: "Density of Precious Metals, in g/cm^3",
+        //width: 600,
+        //height: 400,
+        bar: {groupWidth: "60%"},
+        legend: { position: "none" },
+	      hAxis: {title: 'Driver', titleTextStyle: {color: 'black'}},
+	      vAxis: {title: 'Total Visits', titleTextStyle: {color: 'black'}}        
+      };
+      var chart = new google.visualization.ColumnChart(document.getElementById("columnchart_visit_values"));
+      chart.draw(view, options);
+  }
+			$(window).resize(function(){
+			       // drawChart();
+			        //drawRegionsMap();
+			});
+			  
+  </script>
+
+
+
+    <div class="container margin-top-25" data-aos="fade-up">
+      <br>
+      <div class="grid-layout-graph-col-2">
+        <div class="graph-box">
+          <br>
+          <h4 class="text-center">Oil Pickup Volume (Mton)</h4>
+          <div class="border-graph">
+          	
+          	<div id="columnchart_values" style="width: 100%; height: 500px;"></div>
+          	
+          </div>
+        </div>
+        <div class="graph-box">
+          <br>
+          <h4 class="text-center">Total Visits</h4>
+          <div class="border-graph">
+          	
+          	<div id="columnchart_visit_values" style="width: 100%; height: 500px;"></div>
+          	
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+<!--
+    <div class="container margin-top-25">
+        <a class="btn-sub text-center width-200 col-float-right" href="#">LIST</a>
+    </div>
+-->        
+
+    </section>
+
+  </main><!-- End #main -->

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(

public_html/include/top.php

@@ -57,11 +57,15 @@ $isCustomerOnly = ($level == 10);
         <li class="dropdown">
           <a href="#"><span>REPORT</span> <i class="bi bi-chevron-down dropdown-indicator"></i></a>
           <ul>
-            <li><a href="/index_intranet.php?view=report_expense">EXPENSE</a></li>
+            	<li><a href="/index_intranet.php?view=report_expense">EXPENSE</a></li>
-            <li><a href="/index_intranet.php?view=report_iscccorsia">ISCC/CORSIA</a></li>
+            	<li><a href="/index_intranet.php?view=report_iscccorsia">ISCC/CORSIA</a></li>
-            <li><a href="/index_intranet.php?view=report_yearly">YEARLY</a></li>
+              <li><a href="/index_intranet.php?view=report_yearly">YEARLY</a></li>
-            <li><a href="/index_intranet.php?view=report_monthly">MONTHLY</a></li>
+              <li><a href="/index_intranet.php?view=report_monthly">MONTHLY-AREA</a></li>
-            <li><a href="/index_intranet.php?view=report_daily">DAILY</a></li>
+              <li><a href="/index_intranet.php?view=report_monthly_driver">MONTHLY-DRIVER</a></li>
+              <li><a href="/index_intranet.php?view=report_daily">DAILY</a></li>
+              <li><a href="#">------------------</a></li>
+							<li><a href="/index_intranet.php?view=report_monthly_2024">MONTHLY-AREA(~2023)</a></li>
+              <li><a href="/index_intranet.php?view=report_daily_2024">DAILY(~2023)</a></li>
           </ul>
         </li>
 
@@ -70,6 +74,7 @@ $isCustomerOnly = ($level == 10);
             <a href="#"><span>CONFIGURATION</span> <i class="bi bi-chevron-down dropdown-indicator"></i></a>
             <ul>
               <li><a href="/index_intranet.php?view=member_list">MEMBER</a></li>
+              <li><a href="/index_intranet.php?view=driver_list">DRIVER</a></li>
               <li><a href="/index_intranet.php?view=configure">CONFIGURATION</a></li>
             </ul>
           </li>

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 얻어옴
+	// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IP <20><><EFBFBD><EFBFBD>
 	$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"; // <EFBFBD><EFBFBD><EFBFBD>ǿ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD>. 
 	
 } 
 

public_html/lib/checkinitiallib.php

@@ -0,0 +1,20 @@
+<?php
+include getenv("DOCUMENT_ROOT")."/include/session_include.php";
+
+$dr_initial = $_REQUEST["s"];
+
+
+if($dr_initial != "")
+{
+	$sql="SELECT COUNT(*) FROM tbl_driver WHERE dr_initial='$dr_initial' ";
+	$result = $pdo->prepare($sql); 
+	$result->execute(); 
+	$number_of_rows = $result->fetchColumn(); 
+
+	//$number_of_rows=@$jdb->rQuery($sql, "fetch query error"); 
+	
+	echo "$number_of_rows";
+}
+
+//echo "[$query]";
+?>

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(){
     	<input type=hidden name=h_uid id=h_uid value="<?=$h_uid?>">
     	<input type=hidden name=h_date id=h_date value="<?=$h_date?>">
     	<input type=hidden name=h_driveruid id=h_driveruid value="<?=$h_driveruid?>">
+    	<input type=hidden name=h_druid id=h_druid value="<?=$h_druid?>">
 			<input type=hidden name=mode value="<?=$mode?>">
 			    	
 			<input type=hidden name=switched value="<?=$getSWHStr?>">

public_html/lib/driver_lib.php

@@ -0,0 +1,419 @@
+<?
+include getenv("DOCUMENT_ROOT")."/include/session_include.php";
+
+//$func->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<sizeof($result); $i++)
+		{
+			//list($key, $value) = each($result);
+			foreach ( (Array) $result as $key => $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 .= "
+								<option value='$key' $selectStr>$value</option>";
+	}
+
+}
+
+
+?>
+
+
+<SCRIPT>
+
+// xmlhttp RUN script
+function xmlhttpPost(strURL, param, tagID) {
+
+    var xmlHttpReq = false;
+    var self = this;
+
+    // Mozilla/Safari
+    if (window.XMLHttpRequest) {
+        self.xmlHttpReq = new XMLHttpRequest();
+    }
+
+    // IE
+    else if (window.ActiveXObject) {
+        self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
+    }
+
+    self.xmlHttpReq.open('POST', strURL, true);
+    self.xmlHttpReq.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    self.xmlHttpReq.onreadystatechange = function() {
+        if (self.xmlHttpReq.readyState == 4) {
+            updatepage(self.xmlHttpReq.responseText, tagID);
+        }
+    }
+    self.xmlHttpReq.send(getquerystring(param));
+}
+
+
+function getquerystring(param) {
+
+    qstr = 's=' + escape(param);  // NOTE: no '?' before querystring
+    return qstr;
+}
+
+
+
+function updatepage(str, tagID){
+
+    document.getElementById(tagID).innerHTML = str;
+}
+
+	
+function checkInitial() {
+	var str = document.getElementById('dr_initial').value;
+	//alert(str);
+
+	str = str.toUpperCase();
+
+  if (str=="") {
+    //document.getElementById("PPMUNITPRICEid").value="";
+    //return;
+  } 
+
+  if (window.XMLHttpRequest) {
+    // code for IE7+, Firefox, Chrome, Opera, Safari
+    xmlhttp=new XMLHttpRequest();
+  } else { // code for IE6, IE5
+    xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+  }
+  xmlhttp.onreadystatechange=function() {
+    if (xmlhttp.readyState==4 && xmlhttp.status==200) {
+    	var rt = xmlhttp.responseText;
+    	//alert(rt);
+    	   	
+ 		if (rt.trim() >= 1) {
+
+    		//alert("Existing no. Please change the no.");
+    		//document.getElementById("emailcheckid").innerHTML= "<font color='#FF0000'>(Existing Email. Please input other Email.)</font>";
+    		//document.getElementById('PPPPONOid').value="";
+    		document.getElementById('initialValidateid').value = 0;
+				//alert('This email is already in use. Please enter a different email.');
+				$('#myModal').find('.modal-body').text('This Initial is already in use. Please enter a different Initial.');
+				$('#myModal').modal('show');		
+				$('#myModal').on('hidden.bs.modal', function () {
+						document.getElementById('dr_initial').value = "";
+						document.getElementById('dr_initial').focus();
+				});						
+
+    		return false;
+    	}
+    	else {
+    		//alert("Available no.");
+    		//document.getElementById("emailcheckid").innerHTML= "<font color='#0000FF'>(Available no.)</font>";
+    		
+    		var reg = /^((\w|[\-\.])+)@((\w|[\-\.])+)\.([A-Za-z]+)$/;
+    		
+    		//if (str.length > 2 && str.search(reg) == -1) {
+				if (str.length > 4) {
+					//alert("이메일 주소가 올바르지 않습니다. 다시 입력해 주세요.");
+					//alert("Please input correct email.");
+					$('#myModal').find('.modal-body').text('Please input correct Initial.');
+					$('#myModal').modal('show');
+					$('#myModal').on('hidden.bs.modal', function () {
+							document.getElementById('dr_initial').value = "";
+							document.getElementById('dr_initial').focus();
+					});
+
+
+					return false;
+				}
+    		
+    		document.getElementById('initialValidateid').value = 1;
+    		document.getElementById('dr_initial').value = str;
+    		return true;
+    	}
+    	
+      //document.getElementById('ORGCPTYPEid').value=sellunit.trim();
+    }
+  }
+  xmlhttp.open("GET","/lib/checkinitiallib.php?s="+str,true);
+  xmlhttp.send();
+}
+
+</SCRIPT>
+
+
+<script>
+$(document).ready(function(){
+
+		var selectedMode = $('#mode').val();
+		if (selectedMode != 'create') {	
+				$("#dr_initial").attr('readonly', true);
+		}
+
+		// 숫자만 입력가능 xxx-xxx-xxxx 형식으로 자동 - 삽입
+		$('#dr_cell').on('input', function() {
+		    var number = $(this).val().replace(/[^\d]/g, '')
+		    if (number.length == 7) {
+		      number = number.replace(/(\d{3})(\d{4})/, "$1-$2");
+		    } else if (number.length == 10) {
+		      number = number.replace(/(\d{3})(\d{3})(\d{4})/, "$1-$2-$3");
+		    }
+		    $(this).val(number);
+		});
+		
+		
+	  $("#memberinfo").validate({
+	    // Specify validation rules
+	    ignore: ".ignore",
+	    rules: {
+
+	      dr_firstname: {
+	        required: true,
+	      },
+	      dr_lastname: {
+	        required: true,
+	      },
+	      dr_initial: {
+	        required: true,
+	      }, 	      
+	    },
+	    messages: {
+  
+					dr_firstname: {
+							required: "Please input First name",
+					},				
+					dr_lastname: {
+							required: "Please input Last name",
+					},
+					dr_initial: {
+							required: "Please input Initial",
+					},						
+	    },
+	    
+	    errorElement : 'div',
+
+
+		  submitHandler: function(form) {
+		  	
+		 							//e.preventDefault();
+				         	var mmode = $('#mode').val();
+				         	//var aactionStrid = $('#actionStrid').val();
+				         	//var aactionPageid = $('#actionPageid').val();
+				         	
+									var dr_uid = $('#dr_uid').val();
+									var dr_firstname = $('#dr_firstname').val();
+									var dr_lastname = $('#dr_lastname').val();
+									var dr_initial = $('#dr_initial').val();
+									var dr_cell = $('#dr_cell').val();
+									var dr_status = $('#dr_status').val();
+				         	//alert(amodeid);
+
+					        $.ajax({  
+					             url:"/lib/driver_lib_process.php",  
+					             method:"POST",  
+					             data:{mmode:mmode, dr_uid:dr_uid, 
+					             			dr_firstname:dr_firstname, dr_lastname:dr_lastname, dr_initial:dr_initial, 
+					             			dr_cell:dr_cell, dr_status:dr_status	},
+					             //beforeSend:function(){  
+					             //     $('#submitid').val("Updating");  
+					             //},  
+					             success:function(response){  
+					                  //$('#addcartformid')[0].reset();  
+					                  //For debugging
+					                  //$('.rt_debugging').html(response);
+					                  //alert(response);exit;
+					                  
+					                  if (response == 1) {
+																$('.myModalPopup-body').html("Successfully Saved");
+																$('.myModalPopup-body').css('background-color', '#2A9B56');
+																
+							                  $('#myModalPopup').modal('show'); 
+														    setTimeout(function () {
+														        $('#myModalPopup').modal('hide'); 
+														        $('#myModalMemberInfo').modal('hide');
+														        parent.location.reload();
+														    }, 1500);                  
+					                  } else if (response == 2) {
+																$('.myModalPopup-body').html("Failed. This Initial is already in use.");
+																$('.myModalPopup-body').css('background-color', '#FF8205');
+																
+							                  $('#myModalPopup').modal('show'); 
+														    setTimeout(function () {
+														        $('#myModalPopup').modal('hide');
+														    }, 1500); 
+					                  } else {
+																$('.myModalPopup-body').html("Failed. Please Try again.");
+																$('.myModalPopup-body').css('background-color', '#FF8205');
+																
+							                  $('#myModalPopup').modal('show'); 
+														    setTimeout(function () {
+														        $('#myModalPopup').modal('hide');
+														    }, 1500); 
+					                  }
+					                  
+					                  //$('#myModalAdminInfo').modal('hide');
+					                  //$('.cart-item-no').html(response);  
+
+					             }  
+					        });  
+
+			}		
+
+
+
+	});
+  
+});
+</script>
+
+
+<style>
+.error{
+	color: red;
+	font-weight: 200;
+	margin-left: 0em;
+}		
+</style>
+
+<div class="rt_debugging"></div>
+
+
+
+        <div class="modal-header">
+          <h4 class="modal-title">DRIVER INFORMATION</h4>
+          <button type="button" class="btn" data-dismiss="modal" aria-label="Close" style="color:#fff;"><i class="bi bi-x"></i></button>
+        </div>
+        <div class="modal-body" style="background-color:#ffffff;">
+
+<FORM name=memberinfo id=memberinfo method="post">
+          <input type=hidden name=mode id="mode" value="<?=$mode?>">
+          <input type=hidden name=dr_uid id="dr_uid" value="<?=$dr_uid?>">
+          <input type=hidden name=initialValidateid id="initialValidateid" value="">
+        	<input type=hidden name=actionStr id="actionStr" value="DRIVERINFO">
+          
+            <table class="tb-info-box">
+
+              <tr>
+                <td class="td-title-info">First Name</td>
+                <td class="td-text-info">
+                  <input type="text" id="dr_firstname" name="dr_firstname" placeholder="James" required='required'  VALUE='<?=htmlspecialchars($dr_firstnameSTR, ENT_QUOTES)?>' maxlength=50>
+                </td>
+              </tr>
+
+              <tr>
+                <td class="td-title-info">Last Name</td>
+                <td class="td-text-info">
+                  <input type="text" NAME='dr_lastname' id='dr_lastname' placeholder="Lee" required='required'  VALUE='<?=htmlspecialchars($dr_lastnameSTR, ENT_QUOTES)?>' maxlength=50>
+                </td>
+              </tr>
+
+              <tr>
+                <td class="td-title-info">Initial</td>
+                <td class="td-text-info">
+                  <input type="text" NAME='dr_initial' id='dr_initial' placeholder="E.S" required='required' VALUE='<?=htmlspecialchars($dr_initialSTR, ENT_QUOTES)?>' onblur="checkInitial();" <?=$admTag?> maxlength=10>
+                </td>
+              </tr>
+              
+              <tr>
+                <td class="td-title-info">Cell</td>
+                <td class="td-text-info">
+                  <input type="text" name='dr_cell' id='dr_cell' placeholder="416-777-8888" value="<?=htmlspecialchars($dr_cellSTR, ENT_QUOTES)?>" maxlength="12">
+                </td>
+              </tr> 
+              
+              <tr>
+                <td class="td-title-info">Signup Date</td>
+                <td class="td-text-info"><?=$dr_createdateSTR?></td>
+              </tr>     
+                                                                    
+              <tr>
+                <td class="td-title-info">Status</td>
+                <td class="td-text-info">
+                  <select id="dr_status" name="dr_status" class="custom-select" required='required' >
+											<option value=''>Select</option>
+											<?=$dr_statusSTR?>
+                  </select>
+                </td>
+              </tr>
+              
+              
+<!--
+              <tr>
+                <td class="td-title-info">Access</td>
+                <td class="td-text-info">
+                  <select id="access" name="access" class="custom-select">
+                    <option value="local">Local</option>
+                    <option value="internet">Internet</option>
+                  </select>
+                </td>
+              </tr>
+-->
+
+            </table>
+           
+            <div class="modal-footer text-center grid-layout-col-2">
+              <button type="submit" class="btn-sub">SAVE</button>
+              <button type="button" class="btn-gray" data-dismiss="modal">CLOSE</button>
+            </div>
+         
+          </FORM>
+        </div>
+
+                
+                
+
+        
+  
+				
+
+<div class="modal fade" id="myModalPopup" tabindex="-1" role="dialog" aria-labelledby="myModalPopup"  style="opacity: 0.5; padding-right: 0px !important;">
+  <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+      <div class="modal-content" style="background-color:#2A9B56 !important; max-width:260px; margin: 0 auto;">
+        <div class="myModalPopup-body" style="text-align: center; border-radius: 5px; max-height:60px;	font-size:18px; background-color:#2A9B56; color: #FFFFFF; font-weight: bold;padding:0.5em 1em; ">
+
+        </div>     	
+      </div>
+  </div>
+</div>

public_html/lib/driver_lib_process.php

@@ -0,0 +1,97 @@
+<?php
+
+include getenv("DOCUMENT_ROOT")."/include/session_include.php";
+
+//$func->checkAdmin("index.php");
+
+/*
+for($i=0; $i<sizeof($_POST); $i++) {
+	list($key, $value) = each($_POST);
+	$$key = $value;
+
+	if(is_array($value))
+	{
+		$count = 10;
+		for($i = 0; $i < $count; $i ++) {
+			if ($value[$i]) echo "ARRAY[$key][$value[$i]]<br>";
+		}
+	}
+	else 	echo "[$key][$value]<br>";
+	//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]]<br>";
+//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();
+
+?>

public_html/lib/lib_getdriverinfo.php

@@ -0,0 +1,49 @@
+<?php
+
+include getenv("DOCUMENT_ROOT")."/include/session_include.php";
+
+//$func->checkAdmin("index.php");
+
+//echo "[$driveruid]";exit();
+
+
+/*
+for($i=0; $i<sizeof($_POST); $i++) {
+	list($key, $value) = each($_POST);
+	$$key = $value;
+
+	if(is_array($value))
+	{
+		$count = 10;
+		for($i = 0; $i < $count; $i ++) {
+			if ($value[$i]) echo "ARRAY[$key][$value[$i]]<br>";
+		}
+	}
+	else 	echo "[$key][$value]<br>";
+	//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;
+}
+	
+
+?>

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'];	

public_html/lib/member_lib.php

@@ -45,9 +45,10 @@ 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
@@ -78,6 +79,48 @@ foreach ($arrMemberLevel AS $key=>$value)
 								<option value='$key' $selectStr>$value</option>";
 }
 
+
+
+
+
+// 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 .= "
+								<option value='".$lt_region['rg_uid']."' $selectStr>".$lt_region['rg_region']."</option>";								
+														
+}
+
+
+// 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 .= "
+								<option value='".$lt_driver['dr_uid']."' $selectdefStr>".$lt_driver['dr_initial']."</option>";								
+								
+
+	if ($lt_driver['dr_uid'] == $m_currentdriver) $selectcurStr = "selected";
+	else $selectcurStr = "";
+	
+	$m_currentdriverSTR .= "
+								<option value='".$lt_driver['dr_uid']."' $selectcurStr>".$lt_driver['dr_initial']."</option>";
+																
+}
+
+
+
 ?>
 
 
@@ -194,12 +237,90 @@ function checkEmail() {
   xmlhttp.send();
 }
 
+
 </SCRIPT>
 
 
 <script>
 $(document).ready(function(){
 
+		loadLevel();
+
+		function loadLevel() {
+				var selectedLevel = $('#m_level').val();
+				
+		    if (selectedLevel === '9') {
+		        // driver 선택시 보이기
+		        $('#region_area').removeClass('hidden').show();
+		        $('#defaultdriver_area').removeClass('hidden').show();
+		        $('#currentdriver_area').removeClass('hidden').show();
+		        $('#initial_area').removeClass('hidden').show();
+		        $("#m_initial").attr('readonly', true);
+		        $("#m_firstname").attr('readonly', true);
+		        $("#m_lastname").attr('readonly', true);
+		    } else {
+		        // 그외: 모두 숨기기
+		        $('#region_area').hide();
+		        $('#defaultdriver_area').hide();
+		        $('#currentdriver_area').hide();
+		        $('#initial_area').hide();
+		        $("#m_firstname").attr('readonly', false);
+		        $("#m_lastname").attr('readonly', false);        
+		    }
+		}
+        
+    $('#m_level').on('change', function() {
+        var selectedLevel = $(this).val();
+        
+        if (selectedLevel === '9') {
+            // driver 선택시 보이기
+            $('#region_area').removeClass('hidden').show();
+            $('#defaultdriver_area').removeClass('hidden').show();
+            $('#currentdriver_area').removeClass('hidden').show();
+            $('#initial_area').removeClass('hidden').show();
+            $("#m_initial").attr('readonly', true);
+            $("#m_firstname").attr('readonly', true);
+            $("#m_lastname").attr('readonly', true);
+        } else {
+            // 그외: 모두 숨기기
+            $('#region_area').hide();
+            $('#defaultdriver_area').hide();
+            $('#currentdriver_area').hide();
+            $('#initial_area').hide();
+		        $("#m_firstname").attr('readonly', false);
+		        $("#m_lastname").attr('readonly', false);              
+        }
+    });
+
+
+    $('#m_currentdriver').on('change', function() {
+        var selectedcurrentdriver = $(this).val();
+        $.ajax({
+            type: "POST",
+            url:"/lib/lib_getdriverinfo.php",  
+            data: { driveruid : selectedcurrentdriver },
+				    success: function(response){ 
+				      //alert(response);
+				      var rt = response.split("|");
+				      if (rt[0].trim().match('1')) {
+				      		$('#m_firstname').val(rt[1]);
+				      		$('#m_lastname').val(rt[2]);
+				      		$('#m_initial').val(rt[3]);
+				      		$('#m_cell').val(rt[4]);
+				      		
+              } else {
+									$('.myModalPopup-body').html("Failed. Please Try again.");
+									$('.myModalPopup-body').css('background-color', '#FF8205');
+									
+                  $('#myModalPopup').modal('show'); 
+							    setTimeout(function () {
+							        $('#myModalPopup').modal('hide'); 
+							    }, 1500); 
+              }
+				    }
+		  	});
+    });
+    
 
 		// 숫자만 입력가능 xxx-xxx-xxxx 형식으로 자동 - 삽입
 		$('#m_cell').on('input', function() {
@@ -232,6 +353,24 @@ $(document).ready(function(){
 	      m_lastname: {
 	        required: true,
 	      },
+	      m_regionuid: {
+	        required: 	function(elem) {
+												if ($("#m_level").val() == '9') { return true; }
+												else { return false; }
+											},
+				}, 
+	      m_defaultdriver: {
+	        required: 	function(elem) {
+												if ($("#m_level").val() == '9') { return true; }
+												else { return false; }
+											},
+				}, 
+	      m_currentdriver: {
+	        required: 	function(elem) {
+												if ($("#m_level").val() == '9') { return true; }
+												else { return false; }
+											},
+				}, 				
 	    },
 	    messages: {
 					m_pwd: {
@@ -249,6 +388,15 @@ $(document).ready(function(){
 					m_lastname: {
 							required: "Please input Last name",
 					},
+					m_regionuid: {
+							required: "Please select Region",
+					},
+					m_defaultdriver: {
+							required: "Please select Default Driver",
+					},	
+					m_currentdriver: {
+							required: "Please select Current Driver",
+					},											
 	    },
 	    
 	    errorElement : 'div',
@@ -264,6 +412,11 @@ $(document).ready(function(){
 									var m_uid = $('#m_uid').val();
 									var m_userid = $('#m_userid').val();
 									var m_pwd = $('#m_pwd').val();
+									
+									var m_regionuid = $('#m_regionuid').val();
+									var m_currentdriver = $('#m_currentdriver').val();
+									var m_defaultdriver = $('#m_defaultdriver').val();
+									
 									var m_firstname = $('#m_firstname').val();
 									var m_lastname = $('#m_lastname').val();
 									var m_initial = $('#m_initial').val();
@@ -277,6 +430,8 @@ $(document).ready(function(){
 					             url:"/lib/member_lib_process.php",  
 					             method:"POST",  
 					             data:{mmode:mmode, m_uid:m_uid, m_userid:m_userid, m_pwd:m_pwd, 
+					             			m_regionuid:m_regionuid,
+					             			m_currentdriver:m_currentdriver, m_defaultdriver:m_defaultdriver, 
 					             			m_firstname:m_firstname, m_lastname:m_lastname, m_initial:m_initial, 
 					             			m_cell:m_cell, m_comment:m_comment, 
 					             			m_status:m_status, m_level:m_level	},
@@ -331,6 +486,7 @@ $(document).ready(function(){
 	font-weight: 200;
 	margin-left: 0em;
 }
+.hidden { display: none; }
 </style>
 
 <div class="rt_debugging"></div>
@@ -373,7 +529,48 @@ $(document).ready(function(){
               </tr>
 
               <tr>
-                <td class="td-title-info">Frist Name</td>
+                <td class="td-title-info">Level</td>
+                <td class="td-text-info">
+                  <select id="m_level" name="m_level" class="custom-select" required='required' >
+                  		<option value=''>Select</option>
+											<?=$m_levelSTR?>
+                  </select>
+                </td>
+              </tr>
+
+
+              <tr id="region_area" class="<?=$hiddenTag?>">
+                <td class="td-title-info">Region</td>
+                <td class="td-text-info">
+                  <select id="m_regionuid" name="m_regionuid" class="custom-select" required='required' >
+                  		<option value=''>Select</option>
+											<?=$m_regionSTR?>
+                  </select>
+                </td>
+              </tr>
+
+              <tr id="defaultdriver_area" class="<?=$hiddenTag?>">
+                <td class="td-title-info">Default Driver</td>
+                <td class="td-text-info">
+                  <select id="m_defaultdriver" name="m_defaultdriver" class="custom-select" required='required' >
+                  		<option value=''>Select</option>
+											<?=$m_defaultdriverSTR?>
+                  </select>
+                </td>
+              </tr>              
+
+              <tr id="currentdriver_area" class="<?=$hiddenTag?>">
+                <td class="td-title-info">Current Driver</td>
+                <td class="td-text-info">
+                  <select id="m_currentdriver" name="m_currentdriver" class="custom-select" required='required' >
+                  		<option value=''>Select</option>
+											<?=$m_currentdriverSTR?>
+                  </select>
+                </td>
+              </tr>  
+                    
+              <tr>
+                <td class="td-title-info">First Name</td>
                 <td class="td-text-info">
                   <input type="text" id="m_firstname" name="m_firstname" placeholder="James" required='required'  VALUE='<?=htmlspecialchars($m_firstnameSTR, ENT_QUOTES)?>' maxlength=50>
                 </td>
@@ -386,7 +583,7 @@ $(document).ready(function(){
                 </td>
               </tr>
 
-              <tr>
+              <tr id="initial_area" class="<?=$hiddenTag?>">
                 <td class="td-title-info">Initial</td>
                 <td class="td-text-info">
                   <input type="text" NAME='m_initial' id='m_initial' placeholder="E.S" VALUE='<?=htmlspecialchars($m_initialSTR, ENT_QUOTES)?>' maxlength=50>
@@ -444,15 +641,7 @@ $(document).ready(function(){
                 </td>
               </tr>
               
-              <tr>
+
-                <td class="td-title-info">Level</td>
-                <td class="td-text-info">
-                  <select id="m_level" name="m_level" class="custom-select" required='required' >
-                  		<option value=''>Select</option>
-											<?=$m_levelSTR?>
-                  </select>
-                </td>
-              </tr>
               
 <!--
               <tr>

public_html/lib/member_lib_process.php

@@ -46,12 +46,21 @@ $columns[] = "m_cell";
 
 if ($actionPage == "ADMINUSERINFO") {}
 
-$columns[] = "m_initial";				
 $columns[] = "m_status";
 $columns[] = "m_level";
 $columns[] = "m_comment";
 
 
+if ($m_level == 9) {
+	$columns[] = "m_initial";
+	$columns[] = "m_currentdriver";
+	$columns[] = "m_defaultdriver";
+	$columns[] = "m_currentdriverinitial";
+	$columns[] = "m_defaultdriverinitial";	
+	$columns[] = "m_regionuid";
+	$columns[] = "m_region";
+}
+
 ////////////	
 // data
 ////////////	
@@ -88,11 +97,32 @@ if ($user_password != "" && $user_password_chk != "") {
 
 if ($actionPage == "ADMINUSERINFO") {}
 
-$values[] = $m_initial;
 $values[] = $m_status;
 $values[] = $m_level;		// Admin : 1, Manager : 3, Staff : 5, Accounting : 6, Sales : 7, Driver : 9
 $values[] = str_replace("\\", "", trim($m_comment));
 
+if ($m_level == 9) {
+	$values[] = $m_initial;
+	$values[] = $m_currentdriver;
+	$values[] = $m_defaultdriver;
+
+	$qry_cd = "SELECT * FROM tbl_driver WHERE dr_uid = '$m_currentdriver'";
+	$rt_cd = $jdb->fQuery($qry_cd, "query error");
+	
+	$values[] = $rt_cd['dr_initial'];	
+	
+	$qry_dd = "SELECT * FROM tbl_driver WHERE dr_uid = '$m_defaultdriver'";
+	$rt_dd = $jdb->fQuery($qry_dd, "query error");
+	
+	$values[] = $rt_dd['dr_initial'];	
+	
+	$values[] = $m_regionuid;
+	
+	$qry_rg = "SELECT * FROM tbl_region WHERE rg_uid = '$m_regionuid'";
+	$rt_rg = $jdb->fQuery($qry_rg, "query error");
+
+	$values[] = $rt_rg['rg_region'];
+}
 
 //for ($i=0; $i < count($columns); $i++)
 //echo "[$columns[$i]][$values[$i]]<br>";

public_html/lib/order_history.php

@@ -62,15 +62,15 @@ if($d_accountno == "") {
 				
 				$d_quantitySTR = number_format(floatval($d_quantity));
 				
-				$qry_dvr = "SELECT m_initial FROM tbl_member WHERE m_uid = '".$d_driveruid."' ";
+				//$qry_dvr = "SELECT m_initial FROM tbl_member WHERE m_uid = '".$d_driveruid."' ";
-				$rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error");
+				//$rt_dvr = $jdb->fQuery($qry_dvr, "fetch query error");
 
 				$strList .= "
             <tr>
             	<td class='td-text-info'>$list_number</td>
               <td class='td-text-info' style=\"text-align: center;\">$d_visitdateSTR</td>
               <td class='td-text-info' style=\"text-align: right;margin-right: 20px;\">$d_quantitySTR</td>
-              <td class='td-text-info' style=\"text-align: center;\">".$rt_dvr['m_initial']."</td>
+              <td class='td-text-info' style=\"text-align: center;\">$d_drinitial</td>
               <td class='td-text-info'>$d_paystatusSTR</span></td>
             </tr>				
 				";

public_html/lib/order_lib.php

@@ -85,25 +85,26 @@ else {
 } 
 
 
-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 = "";
+else $add_qry = " ";
 
 // Get Sludge Info
-$qry_sludge = "SELECT IFNULL(c_sludge,0) as c_sludge FROM tbl_customer WHERE c_uid ='$d_customeruid' ";
+$qry_sludge = "SELECT c_sludge FROM tbl_customer WHERE c_uid ='$d_customeruid' ";
 $rt_sludge = $jdb->fQuery($qry_sludge, "fetch query error");
 
 
-// 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"); 
 
-while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
+// Get Driver Info (Request)
+$qry_dr = "SELECT * FROM tbl_driver WHERE dr_status = 'A' ".$add_qry." ORDER by dr_initial ASC ";
+$rt_dr = $jdb->nQuery($qry_dr, "list error"); 
 
-	if ($lt_driver['m_uid'] == $d_driveruid) $selectStr = "selected";
+while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) {
+
+	if ($lt_dr['dr_uid'] == $d_druid) $selectStr = "selected";
 	else $selectStr = "";
 	
-	$c_driveruidSTR .= "
+	$dr_uidSTR .= "
-								<option value='".$lt_driver['m_uid']."' $selectStr>".$lt_driver['m_initial']."</option>";
+								<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_initial']."</option>";
 								
 }
 
@@ -135,45 +136,6 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) {
 	  float:right;
 	}
 
-	/* Map > Input > Sludge */
-	.number-input {
-	display: flex;
-	align-items: center;
-	gap: 5px;
-	}
-
-	.number-input input {
-	width: 100%;
-	text-align: center;
-	}
-
-	.number-input button {
-	padding: 5px 10px;
-	cursor: pointer;
-	}
-
-	/* 기본 화살표 제거 */
-	.d_sludge::-webkit-inner-spin-button,
-	.d_sludge::-webkit-outer-spin-button {
-	-webkit-appearance: none;
-	margin: 0;
-	}
-	.d_sludge {
-	-moz-appearance: textfield;
-	}
-
-	.left, .right {
-	background: none;
-	border: none;
-	color: #77B469;
-	font-weight: bold;
-	cursor: pointer;
-	padding: 0;
-	margin: 0;
-	appearance: none;
-	box-shadow: none;
-	outline: none;
-	}
 </style>
 
 
@@ -363,7 +325,7 @@ $(document).ready(function(){
 
 
       <div class="modal-header">
-        <h4 class="modal-title">CUSTOMER INFORMATION</h4>
+        <h4 class="modal-title">&nbsp;&nbsp;<?=$d_nameSTR?></h4>
         <button type="button" class="btn" data-dismiss="modal" aria-label="Close" style="color:#fff;"><i class="bi bi-x"></i></button>
       </div>
       <div class="modal-body">
@@ -374,7 +336,6 @@ $(document).ready(function(){
     	<input type=hidden name=d_uid id=d_uid value="<?=$d_uid?>">
     	<input type=hidden name=d_paymenttype id=d_paymenttype value="<?=$d_paymenttype?>">
     	<input type=hidden name=d_customeruid id=d_customeruid value="<?=$d_customeruid?>">
-		<input type=hidden name=d_customerno id="d_customerno"value="<?=$d_accountno?>">
 			<input type=hidden name=mode id=mode value="update">
 
 <? if (trim($d_payeesign) != "") { ?>
@@ -382,12 +343,6 @@ $(document).ready(function(){
 <? }?>
 
           <table class="tb-info-box">
-			<tr>
-              <td class="td-title-info">Restaurant Name</td>
-              <td class="td-text-info">           	
-                  <?=$d_nameSTR?>
-              </td>
-            </tr>
             <tr>
               <td class="td-title-info td-name">Account No</td>
               <td class="td-text-info">           	
@@ -408,8 +363,8 @@ $(document).ready(function(){
             <tr>
               <td class="td-title-info">Driver</td>
               <td class="td-text-info">           	
-                <select id="d_driveruid" name="d_driveruid" class="custom-select">
+                <select id="d_druid" name="d_druid" class="custom-select">
-                  <?=$c_driveruidSTR?>
+                  <?=$dr_uidSTR?>
                 </select>
               </td>
             </tr>
@@ -421,16 +376,12 @@ $(document).ready(function(){
               </td>
             </tr>
 
-			<tr>
+            <tr>
-				<td class="td-title-info">Sludge (%)</td>
+              <td class="td-title-info">Sludge</td>
-				<td class="td-text-info">
+              <td class="td-text-info">
-					<div class="number-input">
+                <input type="text" id="d_sludge" name="d_sludge" value="<?=$rt_sludge['c_sludge']?>" placeholder="50">
-						<button class="left" type="button">▼</button>
+              </td>
-							<input type="number" id="d_sludge" name="d_sludge" class="d_sludge" value="<?= (isset($d_sludge) && trim((string)$d_sludge) !== '') ? $d_sludge : $rt_sludge['c_sludge'] ?>" min="0" max="100" placeholder="50">
+            </tr>
-						<button class="right" type="button">▲</button>
-					</div>
-				</td>
-			</tr>
 
 <? if ($d_paymenttype =="CA") { ?>
             <tr>
@@ -518,27 +469,3 @@ $(document).ready(function(){
       </div>
   </div>
 </div>
-
-<script>
-document.addEventListener('click', function (e) {
-  const leftBtn  = e.target.closest('.number-input .left');
-  const rightBtn = e.target.closest('.number-input .right');
-  if (!leftBtn && !rightBtn) return;
-
-  const container = e.target.closest('.number-input');
-  const input = container.querySelector('.d_sludge');
-  if (!input) return;
-
-  const step = 5;
-  const min  = input.min !== '' ? parseInt(input.min, 10) : -Infinity;
-  const max  = input.max !== '' ? parseInt(input.max, 10) :  Infinity;
-  let value  = parseInt(input.value || 0, 10);
-
-  if (leftBtn)  value = Math.max(min, value - step);
-  if (rightBtn) value = Math.min(max, value + step);
-
-  input.value = isNaN(value) ? 0 : value;
-
-  input.dispatchEvent(new Event('input', { bubbles: true }));
-});
-</script>

public_html/lib/order_lib_process.php

@@ -46,6 +46,9 @@ $columns[] = "d_visit";
 $columns[] = "d_visitdate";
 $columns[] = "d_status";
 
+$columns[] = "d_druid";
+$columns[] = "d_drinitial";
+			
 $columns[] = "d_payeename";
 $columns[] = "d_is_transfer"; // Integration to ERP
 
@@ -66,6 +69,13 @@ $values[] = "Y";
 $values[] = $d_visitdate."000000";  // d_visitdate
 $values[] = "F";
 
+// Get Driver Info
+$qry_dr = "SELECT * FROM tbl_driver WHERE dr_uid = '".$d_druid."' ";
+$rt_dr = $jdb->fQuery($qry_dr, "list error"); 
+
+$values[] = $d_druid;
+$values[] = $rt_dr['dr_initial'];
+
 $values[] = $d_payeename;
 $values[] = "N"; // Integration to ERP
 

public_html/lib/receipt_lib.php

@@ -55,6 +55,9 @@ if($duid == "") {
 	
 		$d_payeenameSTR = str_replace("\\", "", $d_payeename);
 		
+		$d_regionSTR = str_replace("\\", "", $d_region);
+		$d_drinitialSTR = str_replace("\\", "", $d_drinitial);
+		
 		$folderPath = getenv("DOCUMENT_ROOT")."/upload_sign/".$d_customeruid;
 		
 		if (is_file($folderPath."/".trim($d_payeesign))) {
@@ -114,10 +117,16 @@ if($duid == "") {
           <?=$d_addressSTR?>
         </td>
       </tr>
+      <tr>
+        <td class="td-title-info">Region</td>
+        <td class="td-text-info">
+          <?=$d_regionSTR?>
+        </td>
+      </tr>      
       <tr>
         <td class="td-title-info">Driver</td>
         <td class="td-text-info">
-          <?=$m_initialSTR?>
+          <?=$d_drinitialSTR?>
         </td>
       </tr>
       <tr>

public_html/lib/user_process.php

@@ -149,6 +149,11 @@ if ($actionStr == "PICKUPORDERCUSTOMER") {
 			$columns[] = "d_visitdate";
 			$columns[] = "d_status";
 
+			$columns[] = "d_druid";
+			$columns[] = "d_drinitial";
+			$columns[] = "d_regionuid";
+			$columns[] = "d_region";			
+
 			$columns[] = "d_payeename";
 			$columns[] = "d_is_transfer"; // Integration to ERP
 
@@ -212,6 +217,15 @@ if ($actionStr == "PICKUPORDERCUSTOMER") {
 			$values[] = $d_visitdateSTR;
 			$values[] = "F";
 
+			// Get Driver Info
+			$qry_dr = "SELECT * FROM tbl_driver WHERE dr_uid = '".$d_druid."' ";
+			$rt_dr = $jdb->fQuery($qry_dr, "list error"); 
+
+			$values[] = $d_druid;
+			$values[] = $rt_dr['dr_initial'];
+			$values[] = $c_regionuid;
+			$values[] = $c_region;			
+
 			$values[] = $d_payeename;
 			$values[] = "N"; // Integration to ERP
 
@@ -752,6 +766,11 @@ if ($actionStr == "ORDEROIL" && $mode == "insert") {
 									$columns[] = "d_createddate";
 									$columns[] = "d_status";
 
+									$columns[] = "d_druid";
+									$columns[] = "d_drinitial";
+									$columns[] = "d_regionuid";
+									$columns[] = "d_region";			
+			
 									//$columns[] = "d_inputdate";
 									//$columns[] = "d_quantity";
 									
@@ -802,6 +821,18 @@ if ($actionStr == "ORDEROIL" && $mode == "insert") {
 									$values[] = date("YmdHis");  // d_createddate
 									$values[] = "A";  // d_status
 
+									// Get Driver Info
+									$qry_dr = "SELECT * FROM tbl_driver AS d
+																INNER JOIN tbl_member AS m ON d.dr_uid = m.m_currentdriver
+														 WHERE m.m_uid = '".$c_driveruid."' ";
+
+									$rt_dr = $jdb->fQuery($qry_dr, "list error"); 
+
+									$values[] = $rt_dr['dr_uid'];
+									$values[] = $rt_dr['dr_initial'];
+									$values[] = $c_regionuid;
+									$values[] = $c_region;			
+			
 									//$values[] = "";  // d_inputdate
 									//$values[] = $d_quantity;  // d_quantity
 
@@ -837,6 +868,9 @@ if ($actionStr == "ORDEROIL" && $mode == "insert") {
 									
 									$jdb->nQuery($qry_customer, "update error");
 									
+			$logSTR = "tbl_daily[".$c_accountno."][c_uid=".$r_customeruid."][r_driveruid=".$r_driveruid."][c_driveruid=".$c_driveruid."][".date("YmdHis")."]";
+									addLog ("add", "ORDEROIL", "ADD", $lguserid, $logSTR, $lgno);	
+									
 									unset ($columns);
 									unset ($values);
 									
@@ -936,6 +970,42 @@ if ($actionStr == "MEMBERINFO" && $mode == "delete") {
 
 
 
+//////////////////////////////////////////////
+// DELETE DRIVER INFO (dr_status 만 D 로 변경)
+//////////////////////////////////////////////
+
+if ($actionStr == "DRIVERINFO" && $mode == "delete") {
+
+			// Delete 기능 제한 (Admin : 1, Manager : 3, Staff : 5 만 가능)
+			$permit = array("1", "3", "5");
+			if (in_array($_SESSION['ss_LEVEL'], $permit)) {
+			    $setTag = "";
+			}
+			else {
+				$msg = "Sorry, You don't have permission. Please contact Administrator.";
+				$func -> modalMsg ($msg, "");
+				exit();
+			}
+	
+			if($dr_uid == "") {
+				$msg = "Invalid data. Please try again.";
+				$func -> modalMsg ($msg, "");
+				exit();
+			}
+			
+			
+			$jdb->nQuery("UPDATE tbl_driver SET dr_status='D' WHERE dr_uid = '$dr_uid'", "delete error");
+			$jdb->CLOSE();
+			
+			$msg = "Deleted successfully.";
+			$urlSTR = "/index_intranet.php?view=driver_list&$goStr";
+			//$func -> alertBack($msg);
+			$func -> modalMsg ($msg, $urlSTR);
+			exit();
+}
+
+
+
 //////////////////////////////////////////////
 // ADD NOTE
 //////////////////////////////////////////////
@@ -1408,6 +1478,7 @@ if ($actionStr == "ADDREQUEST" && $mode == "create") {
 			$columns[] = "r_name";
 			
 			$columns[] = "r_driveruid";
+			$columns[] = "r_druid";
 			$columns[] = "r_createddate";
 			$columns[] = "r_note";
 
@@ -1436,10 +1507,11 @@ if ($actionStr == "ADDREQUEST" && $mode == "create") {
 			$values[] = $result['c_name'];
 			
 			$values[] = $r_driveruid;
+			$values[] = $r_druid;
 			$values[] = date("YmdHis");			
 			$values[] = str_replace("\\", "", trim($r_note));
 
-			$logSTR = "tbl_request[".$result['c_accountno']."][".$r_driveruid."][".date("YmdHis")."]";
+			$logSTR = "tbl_request[".$result['c_accountno']."][".$r_driveruid."][".$r_druid."][".date("YmdHis")."]";
 			addLog ("add", "REQUEST", "ADD", $lguserid, $logSTR, $lgno);	
 
 			$jdb->iQuery("tbl_request", $columns, $values);
@@ -1511,6 +1583,11 @@ if ($actionStr == "ADDREQUEST" && $mode == "create") {
 						$columns[] = "d_createddate";
 						$columns[] = "d_status";
 
+						$columns[] = "d_druid";
+						$columns[] = "d_drinitial";
+						$columns[] = "d_regionuid";
+						$columns[] = "d_region";			
+									
 						// Data		
 						$values[] = $r_requestdateSTR;
 						$values[] = "R";  // d_ordertype
@@ -1544,6 +1621,17 @@ if ($actionStr == "ADDREQUEST" && $mode == "create") {
 						$values[] = $_SESSION['ss_UID'];  // d_createruid
 						$values[] = date("YmdHis");  // d_createddate
 						$values[] = "A";  // d_status
+
+
+						// Get Driver Info
+						$qry_dr = "SELECT * FROM tbl_driver WHERE dr_uid = '".$r_druid."' ";
+						$rt_dr = $jdb->fQuery($qry_dr, "list error"); 
+
+						$values[] = $r_druid;
+						$values[] = $rt_dr['dr_initial'];
+						$values[] = $c_regionuid;
+						$values[] = $c_region;			
+						
 						//
 						$rtvalue = $jdb->iQuery("tbl_daily", $columns, $values);
 
@@ -1578,7 +1666,7 @@ if ($actionStr == "ADDREQUEST" && $mode == "create") {
 						$jdb->nQuery($qry_customer, "update error");
 
 						//
-						$logSTR = "tbl_daily[".$c_accountno."][r_driveruid=".$r_driveruid."][c_driveruid=".$c_driveruid."][".date("YmdHis")."]";
+						$logSTR = "tbl_daily[".$c_accountno."][c_uid=".$r_customeruid."][r_driveruid=".$r_driveruid."][c_driveruid=".$c_driveruid."][".date("YmdHis")."]";
 						addLog ("add", "REQUEST", "ADD", $lguserid, $logSTR, $lgno);	
 		
 			}
@@ -1709,7 +1797,7 @@ if ($actionStr == "PERSONINFO") {
 
 if ($actionStr == "DAILYRECORD") {
 
-			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, $urlSTR);
@@ -1735,6 +1823,7 @@ if ($actionStr == "DAILYRECORD") {
 					$columns[] = "h_balance_t";
 					$columns[] = "h_createddate";
 					$columns[] = "h_comment";
+					$columns[] = "h_druid";
 
 					// Data															
 
@@ -1755,6 +1844,7 @@ if ($actionStr == "DAILYRECORD") {
 					$values[] = $h_balance_t;
 					$values[] = date("YmdHis");;
 					$values[] = str_replace("\\", "", trim($h_comment));
+					$values[] = $h_druid;