From 195feeb1d86ce256f3ba67c051bb56834d3083eb Mon Sep 17 00:00:00 2001
From: Hyojin Ahn <djhyoja@gmail.com>
Date: Tue, 30 Jun 2026 12:21:55 -0400
Subject: [PATCH] =?UTF-8?q?v1.3.18=20-=20[RECEIPT]=20Excel=20Download=20?=
 =?UTF-8?q?=EC=97=90=EB=8F=84=20=EB=93=9C=EB=9D=BC=EC=9D=B4=EB=B2=84=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=EC=9C=BC=EB=A1=9C=20=ED=91=9C=EC=8B=9C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public_html/doc/export_process.php | 4 +++-
 public_html/lib/receipt_lib.php    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public_html/doc/export_process.php b/public_html/doc/export_process.php
index 62ad285..37a88a5 100644
--- a/public_html/doc/export_process.php
+++ b/public_html/doc/export_process.php
@@ -625,6 +625,8 @@ if ($actionStr == "CUSTOMER") {
     $query = "
         SELECT *
         FROM tbl_daily d
+        LEFT OUTER JOIN tbl_driver dr
+        ON d.d_druid = dr.dr_uid
         WHERE d.d_customeruid != ''
           AND d.d_status = 'F'
           AND d.d_paystatus = 'P'
@@ -654,7 +656,7 @@ if ($actionStr == "CUSTOMER") {
         $d_accountnoSTR = str_replace("\\", "", $d_accountno);
 
 				$d_regionSTR = str_replace("\\", "", $d_region);
-				$d_driverSTR = str_replace("\\", "", $d_drinitial);
+				$d_driverSTR = str_replace("\\", "", $dr_lastname.$dr_firstname." (".$d_drinitial.")");
 				
 				
 
diff --git a/public_html/lib/receipt_lib.php b/public_html/lib/receipt_lib.php
index 7e595e1..6c0dfca 100644
--- a/public_html/lib/receipt_lib.php
+++ b/public_html/lib/receipt_lib.php
@@ -36,7 +36,7 @@ if($duid == "") {
 } else {
 
 		// Get Information
-		$query = "SELECT * FROM tbl_daily WHERE d_uid = '".$d_uid."' LIMIT 1 ";
+		$query = "SELECT * FROM tbl_daily LEFT OUTER JOIN tbl_driver ON d_druid = dr_uid WHERE d_uid = '".$d_uid."' LIMIT 1 ";
 		$result=$jdb->fQuery($query, "fetch query error");
 		//echo"$query";
 
@@ -56,7 +56,7 @@ if($duid == "") {
 		$d_payeenameSTR = str_replace("\\", "", $d_payeename);
 		
 		$d_regionSTR = str_replace("\\", "", $d_region);
-		$d_drinitialSTR = str_replace("\\", "", $d_drinitial);
+		$d_drinitialSTR = str_replace("\\", "", $dr_lastname.$dr_firstname." (".$d_drinitial.")");
 		
 		$folderPath = getenv("DOCUMENT_ROOT")."/upload_sign/".$d_customeruid;