From ca13983005d9730cb53ff743b2351b9bd86af996 Mon Sep 17 00:00:00 2001
From: Hyojin Ahn <hyojin.ahn@greenoilinc.com>
Date: Mon, 29 Dec 2025 09:25:52 -0500
Subject: [PATCH] [FORECAST] - In right panel, Oil History shows empty for not
 CA

---
 public_html/lib/shortInfo_right_lib.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/public_html/lib/shortInfo_right_lib.php b/public_html/lib/shortInfo_right_lib.php
index 1daa779..a3d9451 100644
--- a/public_html/lib/shortInfo_right_lib.php
+++ b/public_html/lib/shortInfo_right_lib.php
@@ -84,7 +84,7 @@ $oil_start = ($oil_page - 1) * $oilPerPage;
 
 // 데이터 조회
 $oilQuery = "
-    SELECT *
+    SELECT d_visitdate, d_quantity, m_initial, d_payamount, d_paymenttype, d_paynote, d_paystatus
     FROM tbl_daily td
     LEFT OUTER JOIN tbl_request tr ON td.d_ruid = tr.r_uid
     LEFT OUTER JOIN tbl_member tm ON td.d_driveruid = tm.m_uid
@@ -187,7 +187,26 @@ $coResult = $jdb->nQuery($coQuery, "co query error");
             $date = onlyDate($oil['d_visitdate']);
             $qty  = number_format($oil['d_quantity']);
             $drv  = $oil['m_initial'] ?: "-";
-            $pay  = ($oil['d_paystatus'] == "P") ? "Paid ($".$oil['d_payamount'].")" : "Unpaid";
+
+            $amount = isset($oil['d_payamount']) ? $oil['d_payamount'] : "";
+            $paymentType = $oil['d_paymenttype'] ?? "";
+            $payNote = trim($oil['d_paynote'] ?? "");
+
+            if ($oil['d_paystatus'] === "P") {
+                $pay = "Paid ($" . $amount . ")";
+            } else {
+                if ($paymentType === "CA") {
+                    $pay = "Unpaid";
+                } else {
+                    if ($payNote !== "") {
+                        // 특수문자 처리
+                        $pay = htmlspecialchars($payNote, ENT_QUOTES);
+                    } else {
+                        $pay = "";
+                    }
+                }
+            }
+
 
             echo "
             <tr>