feature: payment instruction & cashier case cicilan dan downpayment
This commit is contained in:
@@ -114,38 +114,126 @@ class Bill extends MY_Controller
|
||||
}
|
||||
}
|
||||
|
||||
public function add_notes_installment($orderid)
|
||||
{
|
||||
$sql = "SELECT SupplierPaymentSupplierInstallmentID as note_order_id,
|
||||
SupplierPaymentID as note_id,
|
||||
SupplierInstallmentID as detail_id,
|
||||
SupplierPaymentDate as note_date,
|
||||
SupplierPaymentNumber as note_number,
|
||||
GROUP_CONCAT(DISTINCT coaDescription separator ' , ') as paymenttypes_name,
|
||||
SUM(SupplierInstallmentAmount) as note_amount,
|
||||
n.M_UserUsername as note_user,
|
||||
SupplierInstallmentIsActive as note_active,
|
||||
'N' as show_detail,
|
||||
SupplierPaymentNote as keterangan,
|
||||
SupplierPaymentCoaID,
|
||||
coaID,
|
||||
coaDescription,
|
||||
SupplierPaymentIsConfirm,
|
||||
CONCAT(
|
||||
'Confirmed by : ',c.M_UserUsername, ' ',
|
||||
DATE_FORMAT(SupplierPaymentConfirmDate,'%d-%m-%Y %H:%i')
|
||||
) AS d_confirm,
|
||||
SupplierPaymentIsApproved,
|
||||
CONCAT(
|
||||
'Approved by : ',a.M_UserUsername, ' ',
|
||||
DATE_FORMAT(SupplierPaymentApprovedDate,'%d-%m-%Y %H:%i')
|
||||
) AS d_approved,
|
||||
CONCAT(
|
||||
'Verified by : ',b.M_UserUsername, ' ',
|
||||
DATE_FORMAT(SupplierPaymentVerifDate,'%d-%m-%Y %H:%i')
|
||||
) AS d_verif
|
||||
FROM supplier_payment
|
||||
JOIN supplier_installment
|
||||
ON SupplierInstallmentID = SupplierPaymentSupplierInstallmentID
|
||||
AND SupplierInstallmentIsActive = 'Y'
|
||||
LEFT JOIN coa ON SupplierPaymentCoaID = coaID
|
||||
LEFT JOIN m_user n ON SupplierPaymentUserID = n.M_UserID
|
||||
LEFT JOIN m_user c ON SupplierPaymentConfirmUserID = c.M_UserID
|
||||
LEFT JOIN m_user a ON SupplierPaymentApprovedUserID = a.M_UserID
|
||||
LEFT JOIN m_user b ON SupplierPaymentVerifUserID = b.M_UserID
|
||||
WHERE SupplierPaymentSupplierInstallmentID = {$orderid}
|
||||
AND SupplierPaymentIsActive = 'Y'
|
||||
GROUP BY SupplierPaymentID";
|
||||
$query = $this->db_onedev->query($sql);
|
||||
if ($query) {
|
||||
$rows = $query->result_array();
|
||||
return $rows ?: [];
|
||||
} else {
|
||||
$this->sys_error_db("get Installment notes", $this->db_onedev);
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
public function add_tagihans($orderid)
|
||||
{
|
||||
$sql = "SELECT SupplierInvoiceID as tagihan_id,
|
||||
PurchaseOrderNumber as tagihan_number,
|
||||
jurnalTxDescription as pasien,
|
||||
jurnalTxCredit as tagihan_total,
|
||||
IF(SupplierPaymentDetailID IS NULL , jurnalTxCredit, jurnalTxCredit - SUM(SupplierPaymentDetailAmount)) as tagihan_tagihan,
|
||||
0 as tagihan_bayar,
|
||||
DATE_FORMAT(SupplierInvoiceDueDate,'%d-%m-%Y') as tagihan_duedate,
|
||||
SupplierInvoiceIsActive as tagihan_active,
|
||||
'N' as show_detail,
|
||||
jurnalTxID SupplierInvoiceDetailID,
|
||||
PurchaseOrderID SupplierInvoiceDetailPurchaseOrderID
|
||||
$sql_dp = "SELECT
|
||||
Fa_ClassDownPaymentCoaID
|
||||
FROM supplier_invoice_detail
|
||||
JOIN m_item
|
||||
ON M_ItemID = SupplierInvoiceDetailItemID
|
||||
AND SupplierInvoiceDetailSupplierInvoiceID = ?
|
||||
AND SupplierInvoiceDetailIsActive = 'Y'
|
||||
AND SupplierInvoiceDetailIsVerified = 'Y'
|
||||
JOIN fa_class
|
||||
ON Fa_ClassID = M_ItemFa_ClassID
|
||||
AND Fa_ClassIsActive = 'Y'";
|
||||
$que_dp = $this->db_onedev->query($sql_dp, [$orderid]);
|
||||
if (!$que_dp) {
|
||||
$this->sys_error_db("failed to get coa id dp tagihans", $this->db_onedev);
|
||||
exit;
|
||||
}
|
||||
$dataDP = $que_dp->result_array();
|
||||
$excludeIds = array_column($dataDP, 'Fa_ClassDownPaymentCoaID');
|
||||
$excludeIds[] = 563; // always excluded
|
||||
$excludeIds = array_unique($excludeIds);
|
||||
$excludeIds = array_values($excludeIds); // re-index
|
||||
|
||||
FROM supplier_invoice
|
||||
JOIN receive_order_po ON ReceiveOrderPoID = SupplierInvoiceReceiveOrderPoID
|
||||
JOIN receive_order_po_detail ON ReceiveOrderPoDetailReceiveOrderPoID = ReceiveOrderPoID
|
||||
JOIN purchase_order ON ReceiveOrderPoDetailPurchaseOrderID = PurchaseOrderID
|
||||
JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
|
||||
JOIN jurnal_tx ON jurnalTxJurnalID = jurnalAddOnJurnalID AND jurnalTxCredit <> 0 AND jurnalTxCoaID <> 563
|
||||
LEFT JOIN supplier_payment ON SupplierPaymentSupplierInvoiceID = SupplierInvoiceID AND SupplierInvoiceIsActive = 'Y'
|
||||
LEFT JOIN supplier_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID AND SupplierPaymentDetailSupplierInvoiceDetailID = jurnalTxID AND SupplierPaymentDetailIsActive = 'Y'
|
||||
WHERE
|
||||
SupplierInvoiceID = {$orderid}
|
||||
GROUP BY jurnalTxID
|
||||
";
|
||||
$query = $this->db_onedev->query($sql);
|
||||
$notInPlaceholders = implode(',', array_fill(0, count($excludeIds), '?'));
|
||||
|
||||
$sql = "SELECT
|
||||
SupplierInvoiceID as tagihan_id,
|
||||
PurchaseOrderNumber as tagihan_number,
|
||||
jurnalTxDescription as pasien,
|
||||
jurnalTxCredit as tagihan_total,
|
||||
IF(SupplierPaymentDetailID IS NULL , jurnalTxCredit, jurnalTxCredit - SUM(SupplierPaymentDetailAmount)) as tagihan_tagihan,
|
||||
0 as tagihan_bayar,
|
||||
DATE_FORMAT(SupplierInvoiceDueDate,'%d-%m-%Y') as tagihan_duedate,
|
||||
SupplierInvoiceIsActive as tagihan_active,
|
||||
'N' as show_detail,
|
||||
jurnalTxID SupplierInvoiceDetailID,
|
||||
PurchaseOrderID SupplierInvoiceDetailPurchaseOrderID
|
||||
FROM supplier_invoice
|
||||
JOIN receive_order_po
|
||||
ON ReceiveOrderPoID = SupplierInvoiceReceiveOrderPoID
|
||||
JOIN receive_order_po_detail
|
||||
ON ReceiveOrderPoDetailReceiveOrderPoID = ReceiveOrderPoID
|
||||
JOIN purchase_order
|
||||
ON ReceiveOrderPoDetailPurchaseOrderID = PurchaseOrderID
|
||||
JOIN jurnal_addon
|
||||
ON jurnalAddOnValue = SupplierInvoiceNumber
|
||||
AND jurnalAddOnIsActive = 'Y'
|
||||
JOIN jurnal_tx
|
||||
ON jurnalTxJurnalID = jurnalAddOnJurnalID
|
||||
AND jurnalTxIsActive = 'Y'
|
||||
AND jurnalTxCredit <> 0
|
||||
AND jurnalTxCoaID NOT IN ($notInPlaceholders)
|
||||
LEFT JOIN supplier_payment
|
||||
ON SupplierPaymentSupplierInvoiceID = SupplierInvoiceID
|
||||
AND SupplierInvoiceIsActive = 'Y'
|
||||
LEFT JOIN supplier_payment_detail
|
||||
ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID
|
||||
AND SupplierPaymentDetailSupplierInvoiceDetailID = jurnalTxID
|
||||
AND SupplierPaymentDetailIsActive = 'Y'
|
||||
WHERE SupplierInvoiceID = ?
|
||||
GROUP BY jurnalTxID";
|
||||
$query = $this->db_onedev->query($sql, array_merge($excludeIds, [$orderid]));
|
||||
if ($query) {
|
||||
$rows = $query->result_array();
|
||||
return $rows;
|
||||
} else {
|
||||
$this->sys_error_db("get notes", $this->db_onedev);
|
||||
$this->sys_error_db("get tagihans", $this->db_onedev);
|
||||
exit;
|
||||
}
|
||||
}
|
||||
@@ -371,7 +459,24 @@ class Bill extends MY_Controller
|
||||
$enddate,
|
||||
];
|
||||
|
||||
// ── COUNT query — UNION of both sources ────────────────────
|
||||
// ── INSTALLMENT WHERE ───────────────────────────────────
|
||||
$inst_where = " inst.SupplierInstallmentIsActive = 'Y'
|
||||
AND IF(sp.SupplierPaymentID IS NULL,'N','Y') = ?
|
||||
AND CONCAT('INST-', si.SupplierInvoiceNumber) LIKE ?
|
||||
AND sup.SupplierName LIKE ?
|
||||
AND rop.ReceiveOrderPoS_RegionalID = ?
|
||||
AND inst.SupplierInstallmentDueDate BETWEEN ? AND ? ";
|
||||
|
||||
$inst_params = [
|
||||
$status,
|
||||
'%' . $search . '%',
|
||||
'%' . $supplier . '%',
|
||||
$regionalid,
|
||||
$startdate,
|
||||
$enddate,
|
||||
];
|
||||
|
||||
// ── COUNT query — UNION of all three sources ────────────
|
||||
$sql_count = "SELECT SUM(cnt) as total FROM (
|
||||
SELECT count(*) as cnt
|
||||
FROM supplier_invoice
|
||||
@@ -390,9 +495,24 @@ class Bill extends MY_Controller
|
||||
JOIN purchase_order ON PurchaseOrderID = SupplierDownpaymentPurchasOrderID
|
||||
JOIN supplier ON SupplierID = SupplierDownpaymentSupplierID
|
||||
WHERE $dp_where
|
||||
|
||||
UNION ALL
|
||||
|
||||
SELECT count(*) as cnt
|
||||
FROM supplier_installment inst
|
||||
LEFT JOIN supplier_payment sp
|
||||
ON sp.SupplierPaymentSupplierInstallmentID = inst.SupplierInstallmentID
|
||||
AND sp.SupplierPaymentIsActive = 'Y'
|
||||
JOIN supplier_invoice si
|
||||
ON si.SupplierInvoiceID = inst.SupplierInstallmentSupplierInvoiceID
|
||||
JOIN receive_order_po rop
|
||||
ON rop.ReceiveOrderPoID = si.SupplierInvoiceReceiveOrderPoID
|
||||
JOIN supplier sup
|
||||
ON sup.SupplierID = inst.SupplierInstallmentSupplierID
|
||||
WHERE $inst_where
|
||||
) AS combined";
|
||||
|
||||
$count_params = array_merge($inv_params, $dp_params);
|
||||
$count_params = array_merge($inv_params, $dp_params, $inst_params);
|
||||
$query = $this->db_onedev->query($sql_count, $count_params);
|
||||
|
||||
$tot_count = 0;
|
||||
@@ -410,6 +530,8 @@ class Bill extends MY_Controller
|
||||
SELECT * FROM (
|
||||
SELECT
|
||||
SupplierInvoiceID,
|
||||
0 as DownpaymentID,
|
||||
0 as InstallmentID,
|
||||
SupplierInvoiceNumber,
|
||||
SupplierInvoiceDraftPaymentDate,
|
||||
SupplierInvoiceIsLunas as flaglunas,
|
||||
@@ -426,6 +548,7 @@ class Bill extends MY_Controller
|
||||
'' as SupplierPaymentDate,
|
||||
'' as notes,
|
||||
'' as tagihans,
|
||||
0 as parent_invoice_id,
|
||||
'INVOICE' as type
|
||||
FROM supplier_invoice
|
||||
LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
|
||||
@@ -440,14 +563,16 @@ class Bill extends MY_Controller
|
||||
UNION ALL
|
||||
|
||||
SELECT
|
||||
SupplierDownpaymentID * -1 as SupplierInvoiceID,
|
||||
0 as SupplierInvoiceID,
|
||||
SupplierDownpaymentID as DownpaymentID,
|
||||
0 as InstallmentID,
|
||||
CONCAT('DP-', PurchaseOrderNumber) as SupplierInvoiceNumber,
|
||||
SupplierDownpaymentDueDate as SupplierInvoiceDraftPaymentDate,
|
||||
SupplierDownpaymentIsLunas as flaglunas,
|
||||
SupplierName,
|
||||
DATE_FORMAT(SupplierDownpaymentDueDate,'%d-%m-%Y') as tanggalbayar,
|
||||
'N' as SupplierPaymentIsApproved,
|
||||
'' as SupplierPaymentCashierNumber,
|
||||
IFNULL(SupplierPaymentIsApproved,'N') as SupplierPaymentIsApproved,
|
||||
IFNULL(SupplierPaymentCashierNumber,'') as SupplierPaymentCashierNumber,
|
||||
SupplierDownpaymentAmount as totalbill,
|
||||
CASE WHEN SupplierDownpaymentStatus = 'Paid'
|
||||
THEN SupplierDownpaymentAmount
|
||||
@@ -461,17 +586,65 @@ class Bill extends MY_Controller
|
||||
'' as SupplierPaymentDate,
|
||||
'' as notes,
|
||||
'' as tagihans,
|
||||
0 as parent_invoice_id,
|
||||
'DP' as type
|
||||
FROM supplier_downpayment
|
||||
JOIN purchase_order ON PurchaseOrderID = SupplierDownpaymentPurchasOrderID
|
||||
JOIN supplier ON SupplierID = SupplierDownpaymentSupplierID
|
||||
LEFT JOIN supplier_payment
|
||||
ON SupplierPaymentSupplierDownpaymentID = SupplierDownpaymentID
|
||||
AND SupplierPaymentIsActive = 'Y'
|
||||
WHERE $dp_where
|
||||
|
||||
UNION ALL
|
||||
|
||||
SELECT
|
||||
0 as SupplierInvoiceID,
|
||||
0 as DownpaymentID,
|
||||
inst.SupplierInstallmentID as InstallmentID,
|
||||
CONCAT('INST-', si.SupplierInvoiceNumber) as SupplierInvoiceNumber,
|
||||
inst.SupplierInstallmentDueDate as SupplierInvoiceDraftPaymentDate,
|
||||
inst.SupplierInstallmentIsLunas as flaglunas,
|
||||
sup.SupplierName,
|
||||
DATE_FORMAT(inst.SupplierInstallmentDueDate,'%d-%m-%Y') as tanggalbayar,
|
||||
IFNULL(sp.SupplierPaymentIsApproved,'N') as SupplierPaymentIsApproved,
|
||||
IFNULL(sp.SupplierPaymentCashierNumber,'') as SupplierPaymentCashierNumber,
|
||||
inst.SupplierInstallmentAmount as totalbill,
|
||||
CASE WHEN inst.SupplierInstallmentStatus = 'Paid'
|
||||
THEN inst.SupplierInstallmentAmount
|
||||
ELSE 0 END as paid,
|
||||
CASE WHEN inst.SupplierInstallmentStatus = 'Paid'
|
||||
THEN 0
|
||||
ELSE inst.SupplierInstallmentAmount END as unpaid,
|
||||
0 as SupplierPaymentID,
|
||||
'' as SupplierPaymentNumber,
|
||||
0 as SupplierPaymentAmount,
|
||||
'' as SupplierPaymentDate,
|
||||
'' as notes,
|
||||
'' as tagihans,
|
||||
si.SupplierInvoiceID as parent_invoice_id,
|
||||
'INSTALLMENT' as type
|
||||
FROM supplier_installment inst
|
||||
LEFT JOIN supplier_payment sp
|
||||
ON sp.SupplierPaymentSupplierInstallmentID = inst.SupplierInstallmentID
|
||||
AND sp.SupplierPaymentIsActive = 'Y'
|
||||
JOIN supplier_invoice si
|
||||
ON si.SupplierInvoiceID = inst.SupplierInstallmentSupplierInvoiceID
|
||||
JOIN receive_order_po rop
|
||||
ON rop.ReceiveOrderPoID = si.SupplierInvoiceReceiveOrderPoID
|
||||
JOIN supplier sup
|
||||
ON sup.SupplierID = inst.SupplierInstallmentSupplierID
|
||||
WHERE $inst_where
|
||||
) AS combined
|
||||
ORDER BY SupplierInvoiceID ASC
|
||||
LIMIT ? OFFSET ?";
|
||||
|
||||
$data_params = array_merge($inv_params, $dp_params, [$number_limit, $number_offset]);
|
||||
$data_params = array_merge($inv_params, $dp_params, $inst_params, [$number_limit, $number_offset]);
|
||||
$query = $this->db_onedev->query($sql_data, $data_params);
|
||||
if (!$query) {
|
||||
$this->sys_error_db("payment instructions data", $this->db_onedev);
|
||||
exit;
|
||||
}
|
||||
$rows = $query->result_array();
|
||||
|
||||
// ── ENRICH — per-row sub-queries ───────────────────────────
|
||||
@@ -480,7 +653,7 @@ class Bill extends MY_Controller
|
||||
|
||||
// ── Downpayment branch ──────────────────────────
|
||||
if ($v['type'] === 'DP') {
|
||||
$dp_id = abs($v['SupplierInvoiceID']);
|
||||
$dp_id = $v['DownpaymentID'];
|
||||
|
||||
$s_payment = $this->db_onedev->query("
|
||||
SELECT
|
||||
@@ -515,6 +688,44 @@ class Bill extends MY_Controller
|
||||
continue;
|
||||
}
|
||||
|
||||
// ── Installment branch ─────────────────────────
|
||||
if ($v['type'] === 'INSTALLMENT') {
|
||||
$inst_id = $v['InstallmentID'];
|
||||
$parent_invoice_id = $v['parent_invoice_id'];
|
||||
|
||||
$s_payment = $this->db_onedev->query("
|
||||
SELECT
|
||||
GROUP_CONCAT(SupplierPaymentNumber SEPARATOR ', ') as SupplierPaymentNumber,
|
||||
SUM(IFNULL(SupplierPaymentAmount,0)) as SupplierPaymentAmount,
|
||||
IFNULL(SupplierPaymentID,0) as SupplierPaymentID,
|
||||
GROUP_CONCAT(
|
||||
DATE_FORMAT(SupplierPaymentDate,'%d-%m-%Y')
|
||||
SEPARATOR ', '
|
||||
) as SupplierPaymentDate
|
||||
FROM supplier_payment
|
||||
WHERE SupplierPaymentIsActive = 'Y'
|
||||
AND SupplierPaymentSupplierInstallmentID = ?",
|
||||
[$inst_id]
|
||||
)->row();
|
||||
|
||||
$amount = $s_payment->SupplierPaymentAmount
|
||||
? $s_payment->SupplierPaymentAmount
|
||||
: "0.00";
|
||||
$rows[$k]['SupplierPaymentID'] = $s_payment->SupplierPaymentID
|
||||
? $s_payment->SupplierPaymentID
|
||||
: '0';
|
||||
$rows[$k]['SupplierPaymentNumber'] = $s_payment->SupplierPaymentNumber
|
||||
? $s_payment->SupplierPaymentNumber
|
||||
: '';
|
||||
$rows[$k]['SupplierPaymentAmount'] = $amount;
|
||||
$rows[$k]['SupplierPaymentDate'] = $s_payment->SupplierPaymentDate;
|
||||
$rows[$k]['paid'] = $amount;
|
||||
$rows[$k]['notes'] = $this->add_notes_installment($inst_id);
|
||||
$rows[$k]['tagihans'] = $this->add_tagihans($parent_invoice_id);
|
||||
// totalbill, unpaid already correct from UNION CASE
|
||||
continue;
|
||||
}
|
||||
|
||||
// ── Invoice branch ───────────────────────────────
|
||||
$inv_id = $v['SupplierInvoiceID'];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user