From 4e850352e02619a0783a78cc4a6814658519712b Mon Sep 17 00:00:00 2001
From: Hyojin Ahn <djhyoja@gmail.com>
Date: Mon, 29 Jun 2026 13:55:31 -0400
Subject: [PATCH] =?UTF-8?q?v1.3.16=20-=20[CUSTOMER]=20=EB=93=9C=EB=9D=BC?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=84=20=EC=9D=B4=EB=A6=84=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C.=20-=20[EXPENSE]=20=EB=93=9C=EB=9D=BC?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=84=20=EC=9D=B4=EB=A6=84=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public_html/doc/customer_list.php  | 7 ++++---
 public_html/doc/report_expense.php | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public_html/doc/customer_list.php b/public_html/doc/customer_list.php
index bee1d50..11f9c1b 100644
--- a/public_html/doc/customer_list.php
+++ b/public_html/doc/customer_list.php
@@ -198,9 +198,10 @@ foreach ($rows as $list) {
               <td>$c_paymenttype </td>
               <td>$c_rate </td>
               <td>$containerChipsHtml </td>
-              <td>$m_initial </td>
+              <td>$m_lastname$m_firstname ($m_initial) </td>
+              <!--td>$m_initial ($m_lastname$m_firstname) </td-->
               <td>$c_phoneSTR </td>
-              <td>$c_statusSTR </td>
+              <td>$c_status </td>
               <!--td style=\"min-width:70px;\">$c_istopSTR </td-->
               <td>$c_contractdateSTR </td>
               <td>$c_inactivedateSTR </td>
@@ -447,7 +448,7 @@ $(document).ready(function(){
                 <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><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>
+                <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">Sts</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_is_top">Rank</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_contractdate">Contract</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_inactivedate">Inactive</a></th>
diff --git a/public_html/doc/report_expense.php b/public_html/doc/report_expense.php
index 0e7cac3..45e3f53 100644
--- a/public_html/doc/report_expense.php
+++ b/public_html/doc/report_expense.php
@@ -110,7 +110,7 @@ $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_druid, m_initial
+$query = "SELECT d_orderdate, d_druid, m_initial, m_lastname, m_firstname
 					FROM tbl_daily 
 					INNER JOIN tbl_member ON (d_druid = m_currentdriver) 
 					WHERE d_orderdate >= '".substr($APPLYDATE,0,8)."' AND d_orderdate <= '".date('Ymd')."' ". $add_subqry . "
@@ -245,7 +245,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) {
             <tr>
               <td>$list_number</td>
               <td>$d_orderdateSTR</td>
-              <td>$m_initial</td>
+              <td>$m_lastname$m_firstname ($m_initial)</td>
               <td style=\"text-align:right; padding-right:20px;\">$openingbalance</td>
               <td style=\"text-align:right; padding-right:20px;\">$h_balance_in</td>
               <td style=\"text-align:right; padding-right:20px;\">$cashoutTODAY</td>
@@ -307,7 +307,7 @@ while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) {
 	else $selectStr = "";
 	
 	$c_driveruidSTR .= "
-								<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_initial']."</option>";
+								<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_lastname'].$lt_dr['dr_firstname']." (".$lt_dr['dr_initial'].")</option>";
 								
 }