From 7c3e577e59209c54df906036b8cb4887fffbe6bd Mon Sep 17 00:00:00 2001
From: Hyojin Ahn <hyojin.ahn@greenoilinc.com>
Date: Tue, 30 Dec 2025 15:01:26 -0500
Subject: [PATCH] [OIL HISTORY] - shows sludge at detail page

---
 public_html/doc/oilhistory_detail.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/public_html/doc/oilhistory_detail.php b/public_html/doc/oilhistory_detail.php
index abbb5f0..0a4d41f 100644
--- a/public_html/doc/oilhistory_detail.php
+++ b/public_html/doc/oilhistory_detail.php
@@ -1,15 +1,15 @@
 <?
-// Level 9 ���ϸ� ��� ����
+// Level 9 이하만 사용 가능
 $func->checkLevelModal(9);
 
-// Delete ��� ���� (Admin : 1, Staff : 5, Accounting : 6 �� ����)
+// Delete 기능 제한 (Admin : 1, Staff : 5, Accounting : 6 만 가능)
 $permit = array("1", "5", "6");
 if (in_array($_SESSION['ss_LEVEL'], $permit)) {
     $setTag = "";
 }
 else $setTag = "DISABLED";	
 
-// Admin �� ����ϴ� ����� ����
+// Admin 만 사용하는 기능을 위해
 $permitAdm = array("1");
 if (in_array($_SESSION['ss_LEVEL'], $permitAdm)) {
     $setTagAdm = "";
@@ -65,11 +65,11 @@ $qry_oil = "SELECT COUNT(d_uid) FROM tbl_daily
 $total_count=$jdb->rQuery($qry_oil, "record query error");
 //echo "[$total_count][$query]<br>";
 
-//����¡��������
+//페이징변수설정
 if(!$pageqna) $pageqna = 1;
 if ($pageflag != "note") $pageqna = 1;
-if(!$list_count) $list_count = $INIT_PAGECNT; //��¸���Ʈ ����
-if(!$page_count) $page_count = $INIT_PAGEVIEWCNT; //��������� ����
+if(!$list_count) $list_count = $INIT_PAGECNT; //출력리스트 갯수
+if(!$page_count) $page_count = $INIT_PAGEVIEWCNT; //출력페이지 갯수
 $list_number = $total_count - (($pageqna-1)*$list_count);
 $start_number = $list_count * ($pageqna-1);
 
@@ -100,6 +100,7 @@ while($list=mysqli_fetch_array($rt_oilh, MYSQLI_ASSOC)) {
 		
 	$d_paystatusSTR = $arrPaidStatus[$d_paystatus];
 	if ($d_paystatus == "P") $d_paystatusSTR = $d_paystatusSTR." ($".$d_payamount.")";
+    if ($d_paystatus == "N" && $d_paynote != '') $d_paystatusSTR = $d_paynote;
 	
 	$d_quantitySTR = number_format(floatval($d_quantity));
 	
@@ -111,6 +112,7 @@ while($list=mysqli_fetch_array($rt_oilh, MYSQLI_ASSOC)) {
               <td>$list_number</td>
               <td>$d_visitdateSTR</td>
               <td>$d_quantitySTR</td>
+              <td>$d_sludge</td>
               <td>".$rt_dvr['m_initial']."</td>
               <td>$d_paystatusSTR</td>
             </tr>
@@ -186,6 +188,7 @@ while($list=mysqli_fetch_array($rt_oilh, MYSQLI_ASSOC)) {
                 <th>No</th>
                 <th>Pickup Date</th>
                 <th>Oil Quantity</th>
+                <th>Sludge</th>
                 <th>Driver</th>
                 <th>Paid (Cash)</th>
             </tr>