[FORECAST]
- In right panel, Oil History shows empty for not CA
This commit is contained in:
parent
2ac354d0e0
commit
ca13983005
|
|
@ -84,7 +84,7 @@ $oil_start = ($oil_page - 1) * $oilPerPage;
|
||||||
|
|
||||||
// 데이터 조회
|
// 데이터 조회
|
||||||
$oilQuery = "
|
$oilQuery = "
|
||||||
SELECT *
|
SELECT d_visitdate, d_quantity, m_initial, d_payamount, d_paymenttype, d_paynote, d_paystatus
|
||||||
FROM tbl_daily td
|
FROM tbl_daily td
|
||||||
LEFT OUTER JOIN tbl_request tr ON td.d_ruid = tr.r_uid
|
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
|
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']);
|
$date = onlyDate($oil['d_visitdate']);
|
||||||
$qty = number_format($oil['d_quantity']);
|
$qty = number_format($oil['d_quantity']);
|
||||||
$drv = $oil['m_initial'] ?: "-";
|
$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 "
|
echo "
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue