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;