feature: po pay downpayment

add keterangan untuk http pi instalment
update penomoran dari fn fungsi
2026-07-20 13:13:59 +07:00 · 2026-07-15 10:48:53 +07:00 · 2026-07-15 10:48:53 +07:00 · 2026-07-15 10:48:53 +07:00 · 2026-07-15 10:48:53 +07:00 · 2026-07-15 10:48:53 +07:00
11 changed files with 5549 additions and 1817 deletions
--- a/application/controllers/map/InventarisCoaMapping.http
+++ b/application/controllers/map/InventarisCoaMapping.http
@@ -0,0 +1,113 @@
+@token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJNX1VzZXJJRCI6IjM4MCIsIk1fVXNlclVzZXJuYW1lIjoicmVnc2J5IiwiTV9Vc2VyR3JvdXBEYXNoYm9hcmQiOiJvbmUtdWlcL3Rlc3RcL3Z1ZXhcL2FjYy1vbmUtanVybmFsXC8iLCJNX1VzZXJEZWZhdWx0VF9TYW1wbGVTdGF0aW9uSUQiOiIwIiwiTV9TdGFmZk5hbWUiOiJTdGFmZiBSZWdpb25hbCIsImlzX2NvdXJpZXIiOiJOIiwidGltZV9hdXRvbG9nb3V0IjoiMTIwIiwiTV9Vc2VyTG9jYXRpb25JRCI6IjM3IiwiTV9Vc2VyTG9jYXRpb25GbGFnIjoiUiIsIlNfUmVnaW9uYWxOYW1lIjoiU3VyYWJheWEgUmF5YSIsIlNfUmVnaW9uYWxJRCI6IjYiLCJNX0JyYW5jaE5hbWUiOiIiLCJNX0JyYW5jaENvZGUiOiIiLCJNX0JyYW5jaElEIjoiMCIsImxvZ2luTGV2ZWwiOiJyZWdpb25hbCIsIk1fQnJhbmNoQ29tcGFueUlEIjoiMSIsIk1fQnJhbmNoQ29tcGFueU5hbWUiOiJQVCBQUkFNSVRBIiwiaXAiOiIxMzkuMTk1LjEyMi4yMzUiLCJhZ2VudCI6Ik1vemlsbGFcLzUuMCAoWDExOyBMaW51eCB4ODZfNjQ7IHJ2OjEzNy4wKSBHZWNrb1wvMjAxMDAxMDEgRmlyZWZveFwvMTM3LjAiLCJ2ZXJzaW9uIjoidjIiLCJsYXN0LWxvZ2luIjoiMjAyNS0wNi0wNCAxMzoyMDowNSIsIk1fU2F0ZWxsaXRlSUQiOjB9.hm6JtstjaQOzb7oDSXQ-oMWuX_jFQZH-HDr3r3OzPac"
+
+@host = accone.aplikasi.web.id/one-api
+
+###
+// create inventaris coa mapping
+POST https://{{host}}/map/InventarisCoaMapping/createInvCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_InventarisGolID": 1,
+    "CoaInventarisID": 101,
+    "CoaHutangID": 102,
+    "CoaPembelianID": 103,
+    "CoaBebanPenyusutanID": 104,
+    "CoaAkumulasiPenyusutanID": 105,
+    "CoaLabaPelepasanID": 106,
+    "CoaRugiPelepasanID": 107
+}
+
+###
+// get inventaris coa mapping by ID
+POST https://{{host}}/map/InventarisCoaMapping/getInvCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_InventarisCoaMappingID": 1
+}
+
+###
+// edit inventaris coa mapping
+POST https://{{host}}/map/InventarisCoaMapping/editInvCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_InventarisCoaMappingID": 1,
+    "M_InventarisGolID": 2,
+    "CoaInventarisID": 201,
+    "CoaHutangID": 202,
+    "CoaPembelianID": 203,
+    "CoaBebanPenyusutanID": 204,
+    "CoaAkumulasiPenyusutanID": 205,
+    "CoaLabaPelepasanID": 206,
+    "CoaRugiPelepasanID": 207
+}
+
+###
+// delete inventaris coa mapping
+POST https://{{host}}/map/InventarisCoaMapping/deleteInvCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_InventarisCoaMappingID": 1
+}
+
+###
+// create inventaris item coa mapping
+POST https://{{host}}/map/InventarisCoaMapping/createInvItemCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_ItemID": 10,
+    "CoaInventarisID": 201,
+    "CoaHutangID": 202,
+    "CoaPembelianID": 203,
+    "CoaBebanPenyusutanID": 204,
+    "CoaAkumulasiPenyusutanID": 205,
+    "CoaLabaPelepasanID": 206,
+    "CoaRugiPelepasanID": 207
+}
+
+###
+// get inventaris item coa mapping by ID
+POST https://{{host}}/map/InventarisCoaMapping/getInvItemCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_InventarisItemCoaMappingID": 1
+}
+
+###
+// edit inventaris item coa mapping
+POST https://{{host}}/map/InventarisCoaMapping/editInvItemCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_InventarisItemCoaMappingID": 1,
+    "M_ItemID": 11,
+    "CoaInventarisID": 301,
+    "CoaHutangID": 302,
+    "CoaPembelianID": 303,
+    "CoaBebanPenyusutanID": 304,
+    "CoaAkumulasiPenyusutanID": 305,
+    "CoaLabaPelepasanID": 306,
+    "CoaRugiPelepasanID": 307
+}
+
+###
+// delete inventaris item coa mapping
+POST https://{{host}}/map/InventarisCoaMapping/deleteInvItemCoaMapping/
+Content-Type: application/json
+
+{
+    "token": {{token}},
+    "M_InventarisItemCoaMappingID": 1
+}
--- a/application/controllers/map/InventarisCoaMapping.php
+++ b/application/controllers/map/InventarisCoaMapping.php
@@ -0,0 +1,624 @@
+<?php
+
+class InventarisCoaMapping extends MY_Controller
+{
+    var $db;
+    public function index()
+    {
+        echo "Inventaris COA Mapping API";
+    }
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+
+    ## QUERY ##
+    public function getListCoa()
+    {
+        try {
+            if (!$this->isLogin) {
+                throw new Exception('Invalid token');
+            }
+
+            $para = $this->sys_input;
+            $keyword = "%" . $para['keyword'] . "%";
+
+            $sql = "SELECT
+                    coaID,
+                    coaAccountNo,
+                    coaDescription
+                FROM coa
+                WHERE coaIsInput = 'Y'
+                    AND (
+                        coaDescription LIKE ?
+                        OR coaAccountNo LIKE ?
+                    )
+                    AND coaIsActive = 'Y'
+                LIMIT 15";
+            $que = $this->db->query($sql, [$keyword, $keyword]);
+            if (!$que) {
+                throw new Exception('failed to query data inventaris gol', 1);
+            }
+            $data = $que->result_array();
+
+            $this->sys_ok($data);
+        } catch (Exception $e) {
+            $msg = '[Error] ' . $e->getMessage();
+            $code = $e->getCode();
+            if ($code == 0) {
+                $this->sys_error($msg);
+            } else {
+                $this->sys_error_db($msg);
+            }
+            exit;
+        }
+    }
+
+    public function getListInventarisGol()
+    {
+        try {
+            if (!$this->isLogin) {
+                throw new Exception('Invalid token');
+            }
+
+            $sql = "SELECT
+                M_InventarisGolID,
+                M_InventarisGolCode,
+                M_InventarisGolName
+            FROM m_inventaris_gol gol
+            WHERE gol.M_InventarisGolIsActive = 'Y'
+            AND NOT EXISTS (
+                SELECT 1
+                FROM m_inventaris_coa_mapping m
+                WHERE m.M_InventarisCoaMappingM_InventarisGolID = gol.M_InventarisGolID
+                AND m.M_InventarisCoaMappingIsActive = 'Y'
+            );";
+            $que = $this->db->query($sql);
+            if (!$que) {
+                throw new Exception('failed to query data inventaris gol', 1);
+            }
+            $data = $que->result_array();
+
+            $output = [
+                'records' => $data,
+                'total' => count($data)
+            ];
+
+            $this->sys_ok($output);
+        } catch (Exception $e) {
+            $msg = '[Error] ' . $e->getMessage();
+            $code = $e->getCode();
+            if ($code == 0) {
+                $this->sys_error($msg);
+            } else {
+                $this->sys_error_db($msg);
+            }
+            exit;
+        }
+    }
+
+    public function getListInventorygolMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                throw new Exception('invalid token');
+            }
+
+            $para = $this->sys_input;
+            $keyword = "%" . $para['keyword'] . "%";
+
+            $limit = 10;
+            $offset = 0;
+            if ($para['currpage'] > 0) {
+                $offset = ($para['currpage'] - 1) * $limit;
+            }
+
+            $sql = "SELECT
+                    M_InventarisGolID,
+                    M_InventarisGolCode,
+                    M_InventarisGolName,
+                    M_InventarisCoaMappingID,
+                    M_InventarisCoaMappingCoaInventarisID,
+                    coaInv.coaAccountNo          AS CoaInventarisAccountNo,
+                    coaInv.coaDescription        AS CoaInventarisDescription,
+                    M_InventarisCoaMappingCoaHutangID,
+                    coaHtg.coaAccountNo          AS CoaHutangAccountNo,
+                    coaHtg.coaDescription        AS CoaHutangDescription,
+                    M_InventarisCoaMappingCoaBebanPenyusutanID,
+                    coaBbn.coaAccountNo          AS CoaBebanPenyusutanAccountNo,
+                    coaBbn.coaDescription        AS CoaBebanPenyusutanDescription,
+                    M_InventarisCoaMappingCoaAkumulasiPenyusutanID,
+                    coaAkm.coaAccountNo          AS CoaAkumulasiPenyusutanAccountNo,
+                    coaAkm.coaDescription        AS CoaAkumulasiPenyusutanDescription,
+                    M_InventarisCoaMappingCoaLabaPelepasanID,
+                    coaLab.coaAccountNo          AS CoaLabaPelepasanAccountNo,
+                    coaLab.coaDescription        AS CoaLabaPelepasanDescription,
+                    M_InventarisCoaMappingCoaRugiPelepasanID,
+                    coaRug.coaAccountNo          AS CoaRugiPelepasanAccountNo,
+                    coaRug.coaDescription        AS CoaRugiPelepasanDescription
+                FROM m_inventaris_gol
+                JOIN m_inventaris_coa_mapping
+                    ON M_InventarisCoaMappingM_InventarisGolID = M_InventarisGolID
+                    AND M_InventarisCoaMappingIsActive = 'Y'
+                    AND M_InventarisGolIsActive = 'Y'
+                    AND M_InventarisGolName LIKE ?
+                LEFT JOIN coa AS coaInv
+                    ON M_InventarisCoaMappingCoaInventarisID = coaInv.coaID
+                LEFT JOIN coa AS coaHtg
+                    ON M_InventarisCoaMappingCoaHutangID = coaHtg.coaID
+                LEFT JOIN coa AS coaBbn
+                    ON M_InventarisCoaMappingCoaBebanPenyusutanID = coaBbn.coaID
+                LEFT JOIN coa AS coaAkm
+                    ON M_InventarisCoaMappingCoaAkumulasiPenyusutanID = coaAkm.coaID
+                LEFT JOIN coa AS coaLab
+                    ON M_InventarisCoaMappingCoaLabaPelepasanID = coaLab.coaID
+                LEFT JOIN coa AS coaRug
+                    ON M_InventarisCoaMappingCoaRugiPelepasanID = coaRug.coaID
+                WHERE M_InventarisGolIsActive = 'Y'";
+
+            $sql_data = $sql . " ORDER BY M_InventarisGolID LIMIT ? OFFSET ? ";
+            $que = $this->db->query($sql_data, [
+                $keyword,
+                $limit,
+                $offset
+            ]);
+            if (!$que) {
+                throw new Exception('failed to query data mapping coa inventaris golongan', 1);
+            }
+
+            $sql_total = "SELECT COUNT(*) AS total FROM ($sql) AS x";
+            $que_total = $this->db->query($sql_total, [$keyword]);
+            if (!$que_total) {
+                throw new Exception('failed to get total rows data', 1);
+            }
+
+            $this->sys_ok([
+                "records" => $que->result_array(),
+                "total" => $que_total->row_array()['total']
+            ]);
+        } catch (Exception $e) {
+            $msg = '[Error] ' . $e->getMessage();
+            $code = $e->getCode();
+            if ($code == 0) {
+                $this->sys_error($msg);
+            } else {
+                $this->sys_error_db($msg);
+            }
+            exit;
+        }
+    }
+
+    public function getInvCoaMappingDetail()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $para = $this->sys_input;
+
+            $sql = "SELECT
+                M_InventarisCoaMappingID,
+                M_InventarisCoaMappingM_InventarisGolID,
+                M_InventarisCoaMappingCoaInventarisID,
+                M_InventarisCoaMappingCoaHutangID,
+                M_InventarisCoaMappingCoaPembelianID,
+                M_InventarisCoaMappingCoaBebanPenyusutanID,
+                M_InventarisCoaMappingCoaAkumulasiPenyusutanID,
+                M_InventarisCoaMappingCoaLabaPelepasanID,
+                M_InventarisCoaMappingCoaRugiPelepasanID,
+                M_InventarisCoaMappingCreatedUserID,
+                M_InventarisCoaMappingCreated,
+                M_InventarisCoaMappingLastUpdated
+            FROM m_inventaris_coa_mapping
+            WHERE M_InventarisCoaMappingIsActive = 'Y'
+                AND M_InventarisCoaMappingID = ?";
+            $query = $this->db->query($sql, [$para['M_InventarisCoaMappingID']]);
+            if (!$query) {
+                $this->sys_error_db("[Error] get data m_inventaris_coa_mapping");
+                exit;
+            }
+            $data = $query->row_array();
+
+            $this->sys_ok($data);
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+
+    ## MUTATIONS ##
+    public function createInvCoaMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $this->db->trans_begin();
+
+            $para = $this->sys_input;
+            $user = $this->sys_user;
+
+            $sql = "INSERT INTO m_inventaris_coa_mapping (
+                M_InventarisCoaMappingM_InventarisGolID,
+                M_InventarisCoaMappingCoaInventarisID,
+                M_InventarisCoaMappingCoaHutangID,
+                M_InventarisCoaMappingCoaPembelianID,
+                M_InventarisCoaMappingCoaBebanPenyusutanID,
+                M_InventarisCoaMappingCoaAkumulasiPenyusutanID,
+                M_InventarisCoaMappingCoaLabaPelepasanID,
+                M_InventarisCoaMappingCoaRugiPelepasanID,
+                M_InventarisCoaMappingCreatedUserID,
+                M_InventarisCoaMappingCreated,
+                M_InventarisCoaMappingLastUpdated
+            ) VALUES (?,?,?,?,?,?,?,?,?,NOW(),NOW())";
+            $query = $this->db->query($sql, [
+                $para['M_InventarisGolID'],
+                $para['CoaInventarisID'],
+                $para['CoaHutangID'],
+                $para['CoaPembelianID'],
+                $para['CoaBebanPenyusutanID'],
+                $para['CoaAkumulasiPenyusutanID'],
+                $para['CoaLabaPelepasanID'],
+                $para['CoaRugiPelepasanID'],
+                $user['M_UserID']
+            ]);
+            if (!$query) {
+                $this->db->trans_rollback();
+                $this->sys_error_db("[Error] insert into table m_inventaris_coa_mapping");
+                exit;
+            }
+
+            $insertID = $this->db->insert_id();
+
+            $this->db->trans_commit();
+            $this->sys_ok($insertID);
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+
+    public function editInvCoaMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $this->db->trans_begin();
+
+            $para = $this->sys_input;
+            $user = $this->sys_user;
+
+            $sql = "UPDATE m_inventaris_coa_mapping SET
+                M_InventarisCoaMappingM_InventarisGolID = ?,
+                M_InventarisCoaMappingCoaInventarisID = ?,
+                M_InventarisCoaMappingCoaHutangID = ?,
+                M_InventarisCoaMappingCoaPembelianID = ?,
+                M_InventarisCoaMappingCoaBebanPenyusutanID = ?,
+                M_InventarisCoaMappingCoaAkumulasiPenyusutanID = ?,
+                M_InventarisCoaMappingCoaLabaPelepasanID = ?,
+                M_InventarisCoaMappingCoaRugiPelepasanID = ?,
+                M_InventarisCoaMappingLastUpdated = NOW()
+            WHERE M_InventarisCoaMappingIsActive = 'Y'
+                AND M_InventarisCoaMappingID = ?";
+            $query = $this->db->query($sql, [
+                $para['M_InventarisGolID'],
+                $para['CoaInventarisID'],
+                $para['CoaHutangID'],
+                $para['CoaPembelianID'],
+                $para['CoaBebanPenyusutanID'],
+                $para['CoaAkumulasiPenyusutanID'],
+                $para['CoaLabaPelepasanID'],
+                $para['CoaRugiPelepasanID'],
+                $para['M_InventarisCoaMappingID']
+            ]);
+            if (!$query) {
+                $this->db->trans_rollback();
+                $this->sys_error_db("[Error] update table m_inventaris_coa_mapping");
+                exit;
+            }
+
+            $this->db->trans_commit();
+            $this->sys_ok("[Success] update data inventaris coa mapping");
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+
+    public function deleteInvCoaMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $this->db->trans_begin();
+
+            $para = $this->sys_input;
+
+            $sql = "UPDATE m_inventaris_coa_mapping SET
+                M_InventarisCoaMappingIsActive = 'N',
+                M_InventarisCoaMappingLastUpdated = NOW()
+            WHERE M_InventarisCoaMappingIsActive = 'Y'
+                AND M_InventarisCoaMappingID = ?";
+            $query = $this->db->query($sql, [$para['M_InventarisCoaMappingID']]);
+            if (!$query) {
+                $this->db->trans_rollback();
+                $this->sys_error_db("[Error] soft delete data m_inventaris_coa_mapping");
+                exit;
+            }
+
+            $this->db->trans_commit();
+            $this->sys_ok("[Success] delete data inventaris coa mapping");
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+
+
+    ## QUERY ITEM ##
+    public function getListItemInventaris()
+    {
+        try {
+            if (!$this->isLogin) {
+                throw new Exception('Invalid token');
+            }
+
+            $para = $this->sys_input;
+
+            $sql = "SELECT
+                    M_ItemID,
+                    M_ItemCode,
+                    M_ItemDesc,
+                    M_ItemM_InventarisGolID AS itemGolID,
+                    IFNULL(M_InventarisItemCoaMappingID, 0) AS itemCoaMapID,
+                    M_InventarisItemCoaMappingCoaInventarisID,
+                    coaInv.coaAccountNo          AS CoaInventarisAccountNo,
+                    coaInv.coaDescription        AS CoaInventarisDescription,
+                    M_InventarisItemCoaMappingCoaHutangID,
+                    coaHtg.coaAccountNo          AS CoaHutangAccountNo,
+                    coaHtg.coaDescription        AS CoaHutangDescription,
+                    M_InventarisItemCoaMappingCoaBebanPenyusutanID,
+                    coaBbn.coaAccountNo          AS CoaBebanPenyusutanAccountNo,
+                    coaBbn.coaDescription        AS CoaBebanPenyusutanDescription,
+                    M_InventarisItemCoaMappingCoaAkumulasiPenyusutanID,
+                    coaAkm.coaAccountNo          AS CoaAkumulasiPenyusutanAccountNo,
+                    coaAkm.coaDescription        AS CoaAkumulasiPenyusutanDescription,
+                    M_InventarisItemCoaMappingCoaLabaPelepasanID,
+                    coaLab.coaAccountNo          AS CoaLabaPelepasanAccountNo,
+                    coaLab.coaDescription        AS CoaLabaPelepasanDescription,
+                    M_InventarisItemCoaMappingCoaRugiPelepasanID,
+                    coaRug.coaAccountNo          AS CoaRugiPelepasanAccountNo,
+                    coaRug.coaDescription        AS CoaRugiPelepasanDescription
+                FROM m_item
+                LEFT JOIN m_inventaris_item_coa_mapping 
+                    ON M_ItemID = M_InventarisItemCoaMappingM_ItemID
+                    AND M_InventarisItemCoaMappingIsActive = 'Y'
+                LEFT JOIN coa AS coaInv
+                    ON M_InventarisItemCoaMappingCoaInventarisID = coaInv.coaID
+                LEFT JOIN coa AS coaHtg
+                    ON M_InventarisItemCoaMappingCoaHutangID = coaHtg.coaID
+                LEFT JOIN coa AS coaBbn
+                    ON M_InventarisItemCoaMappingCoaBebanPenyusutanID = coaBbn.coaID
+                LEFT JOIN coa AS coaAkm
+                    ON M_InventarisItemCoaMappingCoaAkumulasiPenyusutanID = coaAkm.coaID
+                LEFT JOIN coa AS coaLab
+                    ON M_InventarisItemCoaMappingCoaLabaPelepasanID = coaLab.coaID
+                LEFT JOIN coa AS coaRug
+                    ON M_InventarisItemCoaMappingCoaRugiPelepasanID = coaRug.coaID
+                WHERE M_ItemItem_CategoryID = 2
+                    AND M_ItemM_InventarisGolID = ?
+                    AND M_ItemIsActive = 'Y'";
+            $que = $this->db->query($sql, [
+                $para['golID']
+            ]);
+            if (!$que) {
+                throw new Exception('failed to query data inventaris gol', 1);
+            }
+            $data = $que->result_array();
+
+            $output = [
+                'records' => $data,
+                'total' => count($data)
+            ];
+
+            $this->sys_ok($output);
+        } catch (Exception $e) {
+            $msg = '[Error] ' . $e->getMessage();
+            $code = $e->getCode();
+            if ($code == 0) {
+                $this->sys_error($msg);
+            } else {
+                $this->sys_error_db($msg);
+            }
+            exit;
+        }
+    }
+
+    public function getInvItemCoaMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $para = $this->sys_input;
+
+            $sql = "SELECT
+                M_InventarisItemCoaMappingID,
+                M_InventarisItemCoaMappingM_ItemID,
+                M_InventarisItemCoaMappingCoaInventarisID,
+                M_InventarisItemCoaMappingCoaHutangID,
+                M_InventarisItemCoaMappingCoaPembelianID,
+                M_InventarisItemCoaMappingCoaBebanPenyusutanID,
+                M_InventarisItemCoaMappingCoaAkumulasiPenyusutanID,
+                M_InventarisItemCoaMappingCoaLabaPelepasanID,
+                M_InventarisItemCoaMappingCoaRugiPelepasanID,
+                M_InventarisItemCoaMappingCreatedUserID,
+                M_InventarisItemCoaMappingCreated,
+                M_InventarisItemCoaMappingLastUpdated
+            FROM m_inventaris_item_coa_mapping
+            WHERE M_InventarisItemCoaMappingIsActive = 'Y'
+                AND M_InventarisItemCoaMappingID = ?";
+            $query = $this->db->query($sql, [$para['M_InventarisItemCoaMappingID']]);
+            if (!$query) {
+                $this->sys_error_db("[Error] get data m_inventaris_item_coa_mapping");
+                exit;
+            }
+            $data = $query->row_array();
+
+            $this->sys_ok($data);
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+
+    ## MUTATIONS ITEM ##
+    public function createInvItemCoaMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $this->db->trans_begin();
+
+            $para = $this->sys_input;
+            $user = $this->sys_user;
+
+            $sql = "INSERT INTO m_inventaris_item_coa_mapping (
+                M_InventarisItemCoaMappingM_ItemID,
+                M_InventarisItemCoaMappingCoaInventarisID,
+                M_InventarisItemCoaMappingCoaHutangID,
+                M_InventarisItemCoaMappingCoaPembelianID,
+                M_InventarisItemCoaMappingCoaBebanPenyusutanID,
+                M_InventarisItemCoaMappingCoaAkumulasiPenyusutanID,
+                M_InventarisItemCoaMappingCoaLabaPelepasanID,
+                M_InventarisItemCoaMappingCoaRugiPelepasanID,
+                M_InventarisItemCoaMappingCreatedUserID,
+                M_InventarisItemCoaMappingCreated,
+                M_InventarisItemCoaMappingLastUpdated
+            ) VALUES (?,?,?,?,?,?,?,?,?,NOW(),NOW())";
+            $query = $this->db->query($sql, [
+                $para['M_ItemID'],
+                $para['CoaInventarisID'],
+                $para['CoaHutangID'],
+                $para['CoaPembelianID'],
+                $para['CoaBebanPenyusutanID'],
+                $para['CoaAkumulasiPenyusutanID'],
+                $para['CoaLabaPelepasanID'],
+                $para['CoaRugiPelepasanID'],
+                $user['M_UserID']
+            ]);
+            if (!$query) {
+                $this->db->trans_rollback();
+                $this->sys_error_db("[Error] insert into table m_inventaris_item_coa_mapping");
+                exit;
+            }
+
+            $insertID = $this->db->insert_id();
+
+            $this->db->trans_commit();
+            $this->sys_ok("[Success] insert coa item");
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+
+    public function editInvItemCoaMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $this->db->trans_begin();
+
+            $para = $this->sys_input;
+            $user = $this->sys_user;
+
+            $sql = "UPDATE m_inventaris_item_coa_mapping SET
+                M_InventarisItemCoaMappingM_ItemID = ?,
+                M_InventarisItemCoaMappingCoaInventarisID = ?,
+                M_InventarisItemCoaMappingCoaHutangID = ?,
+                M_InventarisItemCoaMappingCoaPembelianID = ?,
+                M_InventarisItemCoaMappingCoaBebanPenyusutanID = ?,
+                M_InventarisItemCoaMappingCoaAkumulasiPenyusutanID = ?,
+                M_InventarisItemCoaMappingCoaLabaPelepasanID = ?,
+                M_InventarisItemCoaMappingCoaRugiPelepasanID = ?,
+                M_InventarisItemCoaMappingLastUpdated = NOW()
+            WHERE M_InventarisItemCoaMappingIsActive = 'Y'
+                AND M_InventarisItemCoaMappingID = ?";
+            $query = $this->db->query($sql, [
+                $para['M_ItemID'],
+                $para['CoaInventarisID'],
+                $para['CoaHutangID'],
+                $para['CoaPembelianID'],
+                $para['CoaBebanPenyusutanID'],
+                $para['CoaAkumulasiPenyusutanID'],
+                $para['CoaLabaPelepasanID'],
+                $para['CoaRugiPelepasanID'],
+                $para['M_InventarisItemCoaMappingID']
+            ]);
+            if (!$query) {
+                $this->db->trans_rollback();
+                $this->sys_error_db("[Error] update table m_inventaris_item_coa_mapping");
+                exit;
+            }
+
+            $this->db->trans_commit();
+            $this->sys_ok("[Success] update data inventaris item coa mapping");
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+
+    public function deleteInvItemCoaMapping()
+    {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $this->db->trans_begin();
+
+            $para = $this->sys_input;
+
+            $sql = "UPDATE m_inventaris_item_coa_mapping SET
+                M_InventarisItemCoaMappingIsActive = 'N',
+                M_InventarisItemCoaMappingLastUpdated = NOW()
+            WHERE M_InventarisItemCoaMappingIsActive = 'Y'
+                AND M_InventarisItemCoaMappingID = ?";
+            $query = $this->db->query($sql, [$para['M_InventarisItemCoaMappingID']]);
+            if (!$query) {
+                $this->db->trans_rollback();
+                $this->sys_error_db("[Error] soft delete data m_inventaris_item_coa_mapping");
+                exit;
+            }
+
+            $this->db->trans_commit();
+            $this->sys_ok("[Success] delete data inventaris item coa mapping");
+        } catch (Exception $exc) {
+            $msg = $exc->getMessage();
+            $this->sys_error($msg);
+        }
+    }
+}
--- a/application/controllers/mockup/purchase/faktur/Fakturv4.php
+++ b/application/controllers/mockup/purchase/faktur/Fakturv4.php
@@ -496,6 +496,7 @@ class Fakturv4 extends MY_Controller
                        ELSE ''
                    END as WarehouseName,
                    ReceiveOrderPoID,
+                    ReceiveOrderPoTypePurchase,
                    PurchaseOrderItemCategoryID
                FROM supplier_invoice
                JOIN supplier_invoice_detail ON SupplierInvoiceID = SupplierInvoiceDetailSupplierInvoiceID
@@ -588,12 +589,11 @@ class Fakturv4 extends MY_Controller
                    'P'
                ) AS DiscountType,
                SupplierInvoiceReceiveOrderPoID,
-                ReceiveOrderPoNumber
+                ReceiveOrderPoNumber,
+                ReceiveOrderPoTypePurchase AS typePurchase
                FROM supplier_invoice
                JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
                JOIN receive_order_po ON ReceiveOrderPoID = SupplierInvoiceReceiveOrderPoID
-                -- JOIN purchase_order ON SupplierInvoicePurchaseOrderID = PurchaseOrderID
-                -- AND PurchaseOrderIsActive = 'Y'
                WHERE SupplierInvoiceIsActive = 'Y'
                    AND SupplierInvoiceID = ?";
            $que = $this->db->query($sql, $para['SInvoiceID']);
@@ -601,6 +601,7 @@ class Fakturv4 extends MY_Controller
                $this->sys_error_db('[Error] get detail data invoice');
                exit;
            }
+            $data = $que->row_array();

            $sqldet = "SELECT
                    SupplierInvoiceDetailID,
@@ -636,7 +637,30 @@ class Fakturv4 extends MY_Controller
                exit;
            }

-            $data = $que->result_array()[0];
+            if (isset($data['typePurchase']) && $data['typePurchase'] == 'aset') {
+                $sql_dp = "SELECT
+                        IFNULL(SupplierDownpaymentAmount, 0) AS dp_amount
+                    FROM supplier_invoice
+                    JOIN receive_order_po
+                        ON ReceiveOrderPoID = SupplierInvoiceReceiveOrderPoID
+                    JOIN purchase_order_asset_contract
+                        ON PurchaseOrderAssetContractReceiveOrderPoID = ReceiveOrderPoID
+                        AND PurchaseOrderAssetContractIsActive = 'Y'
+                    JOIN supplier_downpayment
+                        ON SupplierDownpaymentPurchasOrderID = PurchaseOrderAssetContractPurchaseOrderID
+                        AND SupplierDownpaymentIsActive = 'Y'
+                    WHERE SupplierInvoiceID = ?";
+                $que_dp = $this->db->query($sql_dp, [
+                    $para['SInvoiceID']
+                ]);
+                if (!$que_dp) {
+                    $this->sys_error_db("[Error] get info contract asset");
+                    exit;
+                }
+                $dp_amount = $que_dp->row_array()['dp_amount'];
+                $data['dp_amount'] = $dp_amount;
+            }
+
            $data['detail'] = $quedet->result_array();

            $result = $data;
@@ -1317,7 +1341,8 @@ class Fakturv4 extends MY_Controller
                    supplier_invoice_detail.*,
                    ReceiveOrderPoNumber,
                    ReceiveOrderPoM_BranchCode,
-                    ReceiveOrderPoS_RegionalID
+                    ReceiveOrderPoS_RegionalID,
+                    ReceiveOrderPoTypePurchase AS typePurchase
                FROM supplier_invoice
                JOIN supplier_invoice_detail ON SupplierInvoiceDetailSupplierInvoiceID = SupplierInvoiceID
                    AND SupplierInvoiceDetailIsActive = 'Y'
@@ -1453,7 +1478,6 @@ class Fakturv4 extends MY_Controller
            $coapph = $quepph->result_array()[0];

            $pphval = doubleval($invoice[0]['SupplierInvoiceTaxAmountPph']);
-
            if ($pphval > 0.00) {
                $insertpph = $this->InsertJurnalTx(
                    $jurnalID,
@@ -1465,22 +1489,22 @@ class Fakturv4 extends MY_Controller
                );
                if (!$insertpph['status']) {
                    $this->db->trans_rollback();
-                    $this->sys_error_db($insertpajak['msg']);
+                    $this->sys_error_db($insertpph['msg']);
                    exit;
                }
            }

            # insert shipping cost ke jurnal #
            // ----------------------------------------------------------------------------------------
-            $queryshipcost = $this->db->query($sqlcoa, ['5320700001']);
-            if (!$queryshipcost) {
-                $this->db->trans_rollback();
-                $this->sys_error_db("[Error] get coa cost ");
-                exit;
-            }
-            $coashipcost = $queryshipcost->result_array()[0];
-
            if ($ship_cost > 0.00) {
+                $queryshipcost = $this->db->query($sqlcoa, ['5320700001']);
+                if (!$queryshipcost) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] get coa cost ");
+                    exit;
+                }
+                $coashipcost = $queryshipcost->result_array()[0];
+
                $insertcost = $this->InsertJurnalTx(
                    $jurnalID,
                    $coashipcost['coaID'],
@@ -1496,6 +1520,63 @@ class Fakturv4 extends MY_Controller
                }
            }

+            /* Insert jurnal tx for down payment asset */
+            // ----------------------------------------------------------------------------------------
+            if (isset($invoice[0]['typePurchase']) && $invoice[0]['typePurchase'] == 'aset') {
+                $sql_dpasset = "SELECT
+                        PurchaseOrderAssetContractID,
+                        PurchaseOrderAssetContractName,
+                        SupplierDownpaymentAmount,
+                        coaID,
+                        coaDescription
+                    FROM purchase_order_asset_contract
+                    JOIN purchase_order ON PurchaseOrderID =  PurchaseOrderAssetContractPurchaseOrderID
+                    JOIN supplier_downpayment
+                        ON SupplierDownpaymentPurchasOrderID = PurchaseOrderID
+                        AND SupplierDownpaymentIsActive = 'Y'
+                    JOIN purchase_order_detail
+                        ON PurchaseOrderID = PurchaseOrderDetailPurchaseOrderID
+                        AND PurchaseOrderDetailIsActive = 'Y'
+                    JOIN m_item ON M_ItemID = PurchaseOrderDetailItemID
+                        AND M_ItemItem_CategoryID = 3
+                    JOIN fa_class ON Fa_ClassID = M_ItemFa_ClassID
+                        AND Fa_ClassIsActive = 'Y'
+                    JOIN coa ON coaID = Fa_ClassDownPaymentCoaID
+                        AND coaIsActive = 'Y'
+                    WHERE PurchaseOrderAssetContractReceiveOrderPoID = ?
+                        AND PurchaseOrderAssetContractIsActive = 'Y'
+                    LIMIT 1";
+                $que_dpasset = $this->db->query($sql_dpasset, [
+                    $invoice[0]['SupplierInvoiceReceiveOrderPoID']
+                ]);
+                if (!$que_dpasset) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] query dp asset not error");
+                    exit;
+                }
+                $dpasset_coa = $que_dpasset->row_array();
+                if (!empty($dpasset_coa)) {
+                    $totalDP = round($dpasset_coa['SupplierDownpaymentAmount'], 2);
+                    if ($totalDP > 0) {
+                        $insert_dp = $this->InsertJurnalTx(
+                            $jurnalID,
+                            $dpasset_coa['coaID'],
+                            $dpasset_coa['coaDescription'],
+                            $user['M_UserID'],
+                            0,
+                            $totalDP
+                        );
+                        if (!$insert_dp['status']) {
+                            $this->db->trans_rollback();
+                            $this->sys_error_db($insert_dp['msg']);
+                            exit;
+                        }
+
+                        $invoice = $this->CalcProrateDownPaymentAsset($invoice, $totalDP);
+                    }
+                }
+            }
+
            // insert jurnal tx hutang per item (kredit)
            // ----------------------------------------------------------------------------------------
            foreach ($invoice as $key => $inv) {
@@ -1603,52 +1684,20 @@ class Fakturv4 extends MY_Controller
                        $this->sys_error_db($status['msg']);
                        exit;
                    }
-                } else if ($item['M_ItemItem_CategoryID'] == '3' && !empty($item['M_ItemFa_ClassID'])) {
-                    $sqlsgp = "SELECT * FROM fa_class WHERE Fa_ClassID = ? AND Fa_ClassIsActive = 'Y'";
-                    $quesgp = $this->db->query($sqlsgp, [$item['M_ItemFa_ClassID']]);
-                    if (!$quesgp) {
-                        $this->db->trans_rollback();
-                        $this->sys_error_db("[Error] get map_nat_subgroup");
-                        exit;
-                    }
-                    $itemGroup = $quesgp->row_array();
-
-                    if (empty($itemGroup)) {
-                        $this->db->trans_rollback();
-                        $this->sys_error_db("[Error] fa class item tidak ditemukan / belum dimapping");
-                        exit;
-                    }
-
-                    $price = (doubleval($inv['SupplierInvoiceDetailTotal']) - doubleval($inv['SupplierInvoiceDetailDiscountPoProrata']));
-                    // $taxPPH  =  doubleval($inv['SupplierInvoiceTaxPercentPph']) * $price / 100;
-                    $taxPPN  =  doubleval($inv['SupplierInvoiceTaxPercentPpn']) * $price / 100;
-
-                    $kredit = round($price +  $taxPPN, 2);
-
-                    $status = $this->InsertJurnalTx(
-                        $jurnalID,
-                        $itemGroup['Fa_ClassCoaID'],
-                        $itemGroup['Fa_ClassCoaDesc'],
-                        $user['M_UserID'],
-                        0,
-                        $kredit
-                    );
-                    if (!$status) {
-                        $this->sys_error_db($status['msg']);
-                        exit;
-                    }
+                } else if ($item['M_ItemItem_CategoryID'] == '3') {
+                    $this->InsertJurnalTxAsset($jurnalID, $item['M_ItemID'], $inv, $user['M_UserID']);
                } else if ($item['M_ItemItem_CategoryID'] == '4') {
                    $this->InsertJurnalTxJasa($jurnalID, $item['M_ItemID'], $inv, $user['M_UserID']);
                }
            }

            $sqlinvgr = "INSERT INTO jurnal_addon (
-                jurnalAddOnJurnalID,
-                jurnalAddOnCode,
-                jurnalAddOnValue,
-                jurnalAddOnCreated,
-                jurnalAddOnCreatedUserID
-            ) VALUES (?,?,?,NOW(),?)";
+                    jurnalAddOnJurnalID,
+                    jurnalAddOnCode,
+                    jurnalAddOnValue,
+                    jurnalAddOnCreated,
+                    jurnalAddOnCreatedUserID
+                ) VALUES (?,?,?,NOW(),?)";
            $queinvgr = $this->db->query($sqlinvgr, [
                $jurnalID,
                'INVGR',
@@ -1674,13 +1723,13 @@ class Fakturv4 extends MY_Controller
    private function InsertJurnalTxJasa($jurnalID, $itemid, $invoice, $userid)
    {
        $sql_coa = "SELECT
-            JasaCoaMapHutangCoaID,
-            JasaCoaMapHutangCoaNo,
-            JasaCoaMapHutangCoaDesc
-        FROM jasa_coa_map
-        JOIN coa ON coaID = JasaCoaMapHutangCoaID
-            AND coaIsActive = 'Y'
-        WHERE JasaCoaMapM_ItemID = ?";
+                JasaCoaMapHutangCoaID,
+                JasaCoaMapHutangCoaNo,
+                JasaCoaMapHutangCoaDesc
+            FROM jasa_coa_map
+            JOIN coa ON coaID = JasaCoaMapHutangCoaID
+                AND coaIsActive = 'Y'
+            WHERE JasaCoaMapM_ItemID = ?";
        $que_coa = $this->db->query($sql_coa, [$itemid]);
        if (!$que_coa) {
            $this->db->trans_rollback();
@@ -1717,6 +1766,93 @@ class Fakturv4 extends MY_Controller
        }
    }

+    private function InsertJurnalTxAsset($jurnalID, $itemid, $invoice, $userid)
+    {
+        $sql_coa = "SELECT
+                Fa_ClassHutangCoaID,
+                Fa_ClassHutangCoaAccountNo,
+                Fa_ClassHutangCoaDesc
+            FROM m_item
+            JOIN fa_class ON Fa_ClassID = M_ItemFa_ClassID
+            WHERE M_ItemID = ?";
+        $que_coa = $this->db->query($sql_coa, $itemid);
+        if (!$que_coa) {
+            $this->db->trans_rollback();
+            $this->sys_error_db("[Error] failed get coa hutang asset");
+            exit;
+        }
+        $coaasset = $que_coa->row_array();
+        if ($que_coa->num_rows() <= 0) {
+            $this->db->trans_rollback();
+            $this->sys_error_db("[Error] aset debt coa not found");
+            exit;
+        }
+
+        $invtotal = doubleval($invoice['SupplierInvoiceDetailTotal']);
+        $disprorata = doubleval($invoice['SupplierInvoiceDetailDiscountPoProrata']);
+
+        $price = $invtotal - $disprorata;
+        $taxPPN = doubleval($invoice['SupplierInvoiceTaxPercentPpn']) * $price / 100;
+        $kredit = round($price + $taxPPN, 2);
+        $finalValue = round($kredit - doubleval($invoice['dpReduction']), 2);
+
+        $insert = $this->InsertJurnalTx(
+            $jurnalID,
+            $coaasset['Fa_ClassHutangCoaID'],
+            $coaasset['Fa_ClassHutangCoaDesc'],
+            $userid,
+            0,
+            $finalValue
+        );
+        if (!$insert) {
+            $this->db->trans_rollback();
+            $this->sys_error_db($insert['msg']);
+            exit;
+        }
+    }
+
+    private function CalcProrateDownPaymentAsset($items, $dpAmount)
+    {
+        $totalKredit = 0;
+        foreach ($items as $key => $value) {
+            $invtotal = doubleval($value['SupplierInvoiceDetailTotal']);
+            $disprorata = doubleval($value['SupplierInvoiceDetailDiscountPoProrata']);
+
+            $price = $invtotal - $disprorata;
+            $taxPPN = doubleval($value['SupplierInvoiceTaxPercentPpn']) * $price / 100;
+            $kredit = round($price + $taxPPN, 2);
+            $totalKredit = $totalKredit + $kredit;
+
+            $items[$key]['kredit'] = $kredit;
+        }
+
+        if ($totalKredit <= 0) {
+            foreach ($items as $key => $value) {
+                $items[$key]['dpReduction'] = 0;
+            }
+            return $items;
+        }
+
+        $runningReduction = 0;
+        end($items);
+        $lastKey = key($items);
+        reset($items);
+
+        foreach ($items as $key => $value) {
+            if ($key === $lastKey) {
+                $reduction = round($dpAmount - $runningReduction, 2);
+            } else {
+                $ratio = $value['kredit'] / $totalKredit;
+                $reduction = round($dpAmount * $ratio, 2);
+                $runningReduction += $reduction;
+            }
+
+            $items[$key]['dpReduction'] = $reduction;
+        }
+
+        return $items;
+    }
+
    function InsertJurnalTx($jurnalID, $coaID, $desc, $userID, $debit = 0, $kredit = 0): array
    {
        try {
--- a/application/controllers/mockup/purchase/order/PurchaseOrderAset.php
+++ b/application/controllers/mockup/purchase/order/PurchaseOrderAset.php
--- a/application/controllers/mockup/receive-item-po/ReceiveItemPOAsset.php
+++ b/application/controllers/mockup/receive-item-po/ReceiveItemPOAsset.php
--- a/application/controllers/mockup/receive-item-po/ReceiveItemPoV2.php
+++ b/application/controllers/mockup/receive-item-po/ReceiveItemPoV2.php
--- a/application/controllers/mockup/supplierpaymentapprovedv3/Billv2.php
+++ b/application/controllers/mockup/supplierpaymentapprovedv3/Billv2.php
@@ -28,29 +28,66 @@ class Billv2 extends MY_Controller {
                $offset = ($params['currentpage'] - 1) * $limit;
            }

-            $sql_base = "SELECT 
-                SupplierPaymentID,
-                SupplierPaymentDate,
-                SupplierPaymentNumber,
-                SupplierPaymentAmount,
-                SupplierPaymentStatus,
-                SupplierPaymentIsVerif,
-                SupplierPaymentIsApproved,
-                SupplierInvoiceID,
-                SupplierInvoiceNumber,
-                SupplierInvoiceDraftPaymentDate,
-                SupplierCode,
-                SupplierName
-            FROM supplier_payment 
-            JOIN supplier_invoice ON SupplierInvoiceID = SupplierPaymentSupplierInvoiceID 
-                AND SupplierPaymentNumber LIKE ?
-                AND (SupplierPaymentDate BETWEEN DATE(?) AND DATE(?))
-                AND (SupplierPaymentStatus = ? OR ? = 'All')
-            JOIN supplier ON SupplierID = SupplierInvoiceSupplierID
-            WHERE SupplierPaymentIsActive = 'Y' 
-            ORDER BY SupplierPaymentID DESC";
+            // ── UNION base — invoice branch + downpayment branch ────
+            $sql_base = "
+                SELECT
+                    sp.SupplierPaymentID,
+                    sp.SupplierPaymentDate,
+                    sp.SupplierPaymentNumber,
+                    sp.SupplierPaymentAmount,
+                    sp.SupplierPaymentStatus,
+                    sp.SupplierPaymentIsVerif,
+                    sp.SupplierPaymentIsApproved,
+                    sp.SupplierPaymentIsActive,
+                    si.SupplierInvoiceID,
+                    si.SupplierInvoiceNumber,
+                    si.SupplierInvoiceDraftPaymentDate,
+                    sup.SupplierCode,
+                    sup.SupplierName,
+                    'INVOICE' AS type
+                FROM supplier_payment sp
+                JOIN supplier_invoice si
+                    ON si.SupplierInvoiceID = sp.SupplierPaymentSupplierInvoiceID
+                JOIN supplier sup
+                    ON sup.SupplierID = si.SupplierInvoiceSupplierID
+                WHERE sp.SupplierPaymentSupplierInvoiceID > 0
+
+                UNION ALL
+
+                SELECT
+                    sp.SupplierPaymentID,
+                    sp.SupplierPaymentDate,
+                    sp.SupplierPaymentNumber,
+                    sp.SupplierPaymentAmount,
+                    sp.SupplierPaymentStatus,
+                    sp.SupplierPaymentIsVerif,
+                    sp.SupplierPaymentIsApproved,
+                    sp.SupplierPaymentIsActive,
+                    dp.SupplierDownpaymentID * -1               AS SupplierInvoiceID,
+                    CONCAT('DP-', po.PurchaseOrderNumber)       AS SupplierInvoiceNumber,
+                    dp.SupplierDownpaymentDueDate               AS SupplierInvoiceDraftPaymentDate,
+                    dp_sup.SupplierCode                         AS SupplierCode,
+                    dp_sup.SupplierName                         AS SupplierName,
+                    'DP'                                        AS type
+                FROM supplier_payment sp
+                JOIN supplier_downpayment dp
+                    ON dp.SupplierDownpaymentID = sp.SupplierPaymentSupplierDownpaymentID
+                JOIN supplier dp_sup
+                    ON dp_sup.SupplierID = dp.SupplierDownpaymentSupplierID
+                JOIN purchase_order po
+                    ON po.PurchaseOrderID = dp.SupplierDownpaymentPurchasOrderID
+                WHERE sp.SupplierPaymentSupplierDownpaymentID IS NOT NULL";
+
+            // ── Outer: common filters + ordering + pagination ───────
+            $sql_data = "
+                SELECT * FROM ($sql_base) AS combined
+                WHERE SupplierPaymentIsActive = 'Y'
+                    AND SupplierPaymentNumber LIKE ?
+                    AND (SupplierPaymentDate BETWEEN DATE(?) AND DATE(?))
+                    AND (SupplierPaymentStatus = ? OR ? = 'All')
+                ORDER BY SupplierPaymentID DESC
+                LIMIT ? OFFSET ?";

-            $sql_data = $sql_base . " LIMIT ? OFFSET ? ";
            $que_data = $this->db->query($sql_data, [
                $keyword, $params['startdate'], $params['enddate'],
                $params['status'], $params['status'], $limit, $offset
@@ -59,7 +96,14 @@ class Billv2 extends MY_Controller {
                throw new Exception("[Error] failed get data supplier payment", 2);
            }

-            $sql_total = "SELECT COUNT(*) AS total FROM ($sql_base) AS x";
+            // ── COUNT — wrap UNION in outer filter ──────────────────
+            $sql_total = "
+                SELECT COUNT(*) AS total FROM ($sql_base) AS combined
+                WHERE SupplierPaymentIsActive = 'Y'
+                    AND SupplierPaymentNumber LIKE ?
+                    AND (SupplierPaymentDate BETWEEN DATE(?) AND DATE(?))
+                    AND (SupplierPaymentStatus = ? OR ? = 'All')";
+
            $que_total = $this->db->query($sql_total, [
                $keyword, $params['startdate'], $params['enddate'],
                $params['status'], $params['status']
@@ -70,9 +114,9 @@ class Billv2 extends MY_Controller {

            $output = [
                "records" => $que_data->result_array(),
-                "total" =>$que_total->row_array()['total']
+                "total"   => $que_total->row_array()['total']
            ];
-            
+
            $this->sys_ok($output);
            exit;
        } catch (Exception $exc) {
@@ -96,70 +140,123 @@ class Billv2 extends MY_Controller {

            $para = $this->sys_input;

-            $sql = "SELECT 
-                SupplierInvoiceID, 
-                SupplierInvoiceRefNumber,
-                SupplierInvoiceDeliveryOrderNumber,
-                SupplierInvoiceSupplierInvoiceNumber,
-                SupplierInvoiceSupplierInvoiceDate,
-                SupplierInvoiceSubTotal,
-                SupplierInvoiceTaxPercentPph,
-                SupplierInvoiceTaxPercentPpn,
-                SupplierInvoiceTaxAmountPpn,
-                SupplierInvoiceDiscountAmount,
-                SupplierInvoiceDiscountPercent,
-                SupplierInvoiceShippingCost,
-                SupplierInvoiceGrandTotal,
-                SupplierInvoiceAdjustmentAmount,
-                SupplierInvoiceAdjustmentNote,
-                SupplierInvoiceNote,
-                IF (SupplierInvoiceDiscountAmount > 0, 'R', 'P') AS DiscountType
-            FROM supplier_payment 
-            JOIN supplier_invoice ON SupplierPaymentSupplierInvoiceID = SupplierInvoiceID 
-                AND SupplierPaymentID = ?
-                AND SupplierPaymentIsActive = 'Y'";
-            $que = $this->db->query($sql, [$para['paymentID']]);
-            if (!$que) {
-                throw new Exception("[Error] failed get row data", 2);
-            }
-            $data = $que->row_array();
+            // ── Detect payment type ──────────────────────────────────
+            $sql_type = "SELECT
+                    SupplierPaymentSupplierInvoiceID,
+                    SupplierPaymentSupplierDownpaymentID
+                FROM supplier_payment
+                WHERE SupplierPaymentID = ? AND SupplierPaymentIsActive = 'Y'";

-            $sql_detail = "SELECT 
-                SupplierInvoiceDetailID,
-                SupplierInvoiceDetailSupplierInvoiceID,
-                SupplierInvoiceDetailPurchaseOrderID,
-                SupplierInvoiceDetailPurchaseOrderSummaryID,
-                SupplierInvoiceDetailReceiveOrderPoID,
-                SupplierInvoiceDetailReceiveOrderPoDetailID,
-                SupplierInvoiceDetailItemID,
-                SupplierInvoiceDetailItemUnitID,
-                SupplierInvoiceDetailDescription,
-                SupplierInvoiceDetailQty,
-                SupplierInvoiceDetailPrice,
-                SupplierInvoiceDetailDiscountPercent,
-                SupplierInvoiceDetailDiscountDiscountRupiah,
-                SupplierInvoiceDetailDiscountDiscountType,
-                SupplierInvoiceDetailDiscountAmount,
-                (SupplierInvoiceDetailPrice - SupplierInvoiceDetailDiscountAmount) AS DiscountedPrice,
-                SupplierInvoiceDetailDiscountPoProrata,
-                SupplierInvoiceDetailTotal,
-                M_ItemCode,
-                M_ItemDesc
-            FROM supplier_payment_detail 
-            JOIN supplier_invoice_detail ON SupplierInvoiceDetailIsActive = 'Y'
-                AND SupplierPaymentDetailSupplierPaymentID = ?
-                AND SupplierInvoiceDetailSupplierInvoiceID = ?
-            JOIN m_item ON M_ItemID = SupplierInvoiceDetailItemID 
-                AND M_ItemIsActive = 'Y'
-            GROUP BY SupplierInvoiceDetailID";
-            $que_detail = $this->db->query($sql_detail, [
-                $para['paymentID'], $data['SupplierInvoiceID']
-            ]);
-            if (!$que_detail) {
-                throw new Exception("[Error] failed to get item payments", 2);
+            $que_type = $this->db->query($sql_type, [$para['paymentID']]);
+            if (!$que_type) {
+                throw new Exception("[Error] failed get payment header", 2);
+            }
+            $payment = $que_type->row_array();
+            if (!$payment) {
+                throw new Exception("[Error] payment not found", 2);
            }

-            $data['detail'] = $que_detail->result_array();
+            // ── INVOICE branch ──────────────────────────────────────
+            if ($payment['SupplierPaymentSupplierInvoiceID'] > 0) {
+                $sql = "SELECT
+                        si.SupplierInvoiceSubTotal,
+                        si.SupplierInvoiceShippingCost,
+                        si.SupplierInvoiceDiscountPercent,
+                        si.SupplierInvoiceDiscountAmount,
+                        si.SupplierInvoiceTaxPercentPpn,
+                        si.SupplierInvoiceTaxAmountPpn,
+                        si.SupplierInvoiceGrandTotal,
+                        si.SupplierInvoiceID,
+                        'INVOICE' AS type
+                    FROM supplier_payment sp
+                    JOIN supplier_invoice si
+                        ON si.SupplierInvoiceID = sp.SupplierPaymentSupplierInvoiceID
+                    WHERE sp.SupplierPaymentID = ? AND sp.SupplierPaymentIsActive = 'Y'";
+
+                $que = $this->db->query($sql, [$para['paymentID']]);
+                if (!$que) {
+                    throw new Exception("[Error] failed get row data", 2);
+                }
+                $data = $que->row_array();
+
+                $sql_detail = "SELECT
+                        M_ItemDesc,
+                        SupplierInvoiceDetailQty,
+                        SupplierInvoiceDetailPrice,
+                        SupplierInvoiceDetailDiscountAmount,
+                        (SupplierInvoiceDetailPrice - SupplierInvoiceDetailDiscountAmount) AS DiscountedPrice,
+                        SupplierInvoiceDetailTotal
+                    FROM supplier_payment_detail
+                    JOIN supplier_invoice_detail
+                        ON SupplierInvoiceDetailIsActive = 'Y'
+                        AND SupplierPaymentDetailSupplierPaymentID = ?
+                        AND SupplierInvoiceDetailSupplierInvoiceID = ?
+                    JOIN m_item
+                        ON M_ItemID = SupplierInvoiceDetailItemID AND M_ItemIsActive = 'Y'
+                    GROUP BY SupplierInvoiceDetailID";
+
+                $que_detail = $this->db->query($sql_detail, [
+                    $para['paymentID'], $data['SupplierInvoiceID']
+                ]);
+                if (!$que_detail) {
+                    throw new Exception("[Error] failed to get item payments", 2);
+                }
+
+                unset($data['SupplierInvoiceID']);
+                $data['detail'] = $que_detail->result_array();
+
+            // ── DOWNPAYMENT branch ──────────────────────────────────
+            } else {
+                $sql = "SELECT
+                        dp.SupplierDownpaymentPurchasOrderID,
+                        dp.SupplierDownpaymentAmount   AS SupplierInvoiceSubTotal,
+                        0                              AS SupplierInvoiceShippingCost,
+                        0                              AS SupplierInvoiceDiscountPercent,
+                        0                              AS SupplierInvoiceDiscountAmount,
+                        0                              AS SupplierInvoiceTaxPercentPpn,
+                        0                              AS SupplierInvoiceTaxAmountPpn,
+                        dp.SupplierDownpaymentAmount   AS SupplierInvoiceGrandTotal,
+                        'DP'                           AS type
+                    FROM supplier_payment sp
+                    JOIN supplier_downpayment dp
+                        ON dp.SupplierDownpaymentID = sp.SupplierPaymentSupplierDownpaymentID
+                    WHERE sp.SupplierPaymentID = ? AND sp.SupplierPaymentIsActive = 'Y'";
+
+                $que = $this->db->query($sql, [$para['paymentID']]);
+                if (!$que) {
+                    throw new Exception("[Error] failed get DP row data", 2);
+                }
+                $data = $que->row_array();
+
+                $sql_detail = "SELECT
+                        CONCAT('DP-', M_ItemDesc)                                       AS M_ItemDesc,
+                        PurchaseOrderDetailQty                                          AS SupplierInvoiceDetailQty,
+                        PurchaseOrderDetailPrice                                        AS SupplierInvoiceDetailPrice,
+                        PurchaseOrderSummaryDiscountAmount                              AS SupplierInvoiceDetailDiscountAmount,
+                        (PurchaseOrderDetailPrice - PurchaseOrderSummaryDiscountAmount) AS DiscountedPrice,
+                        PurchaseOrderSummaryTotal                                       AS SupplierInvoiceDetailTotal
+                    FROM supplier_downpayment
+                    JOIN purchase_order
+                        ON SupplierDownpaymentPurchasOrderID = PurchaseOrderID
+                    JOIN purchase_order_detail
+                        ON PurchaseOrderDetailPurchaseOrderID = PurchaseOrderID
+                        AND PurchaseOrderDetailIsActive = 'Y'
+                    JOIN purchase_order_summary
+                        ON PurchaseOrderSummaryID = PurchaseOrderDetailPurchaseSummaryID
+                        AND PurchaseOrderSummaryIsActive = 'Y'
+                    JOIN m_item
+                        ON M_ItemID = PurchaseOrderDetailItemID
+                    WHERE SupplierDownpaymentPurchasOrderID = ?";
+
+                $que_detail = $this->db->query($sql_detail, [
+                    $data['SupplierDownpaymentPurchasOrderID']
+                ]);
+                if (!$que_detail) {
+                    throw new Exception('failed to get dp detail', 2);
+                }
+
+                $data['detail'] = $que_detail->result_array();
+            }

            $this->sys_ok($data);
        } catch (Exception $exc) {
@@ -214,12 +311,12 @@ class Billv2 extends MY_Controller {
            $user = $this->sys_user;

            if ($para['userlevel'] == '1') {
-                $sql = "UPDATE supplier_payment SET 
+                $sql = "UPDATE supplier_payment SET
                    SupplierPaymentIsVerif = 'Y',
                    SupplierPaymentStatus = 'Verified',
                    SupplierPaymentVerifUserID = ?,
                    SupplierPaymentVerifDate = NOW()
-                WHERE SupplierPaymentID = ? 
+                WHERE SupplierPaymentID = ?
                    AND SupplierPaymentIsActive = 'Y'";
                $query = $this->db->query($sql, [
                    $user['M_UserID'], $para['paymentID']
@@ -231,12 +328,12 @@ class Billv2 extends MY_Controller {
            }

            if ($para['userlevel'] == '2') {
-                $sql = "UPDATE supplier_payment SET 
+                $sql = "UPDATE supplier_payment SET
                    SupplierPaymentIsApproved = 'Y',
                    SupplierPaymentStatus = 'Approved',
                    SupplierPaymentApprovedUserID = ?,
                    SupplierPaymentApprovedDate = NOW()
-                WHERE SupplierPaymentID = ? 
+                WHERE SupplierPaymentID = ?
                    AND SupplierPaymentIsActive = 'Y'";
                $query = $this->db->query($sql, [
                    $user['M_UserID'], $para['paymentID']
@@ -261,4 +358,4 @@ class Billv2 extends MY_Controller {
            exit;
        }
    }
-}
+}
--- a/application/controllers/mockup/supplierpaymentcashierv5/Bill.php
+++ b/application/controllers/mockup/supplierpaymentcashierv5/Bill.php
@@ -1,19 +1,20 @@
 <?php
 class Bill extends MY_Controller
 {
-   var $db_onedev;
-   public function index()
-   {
-      echo "Bill API";
-   }
-   public function __construct()
-   {
-      parent::__construct();
-      $this->db_onedev = $this->load->database("onedev", true);
-   }
+    var $db_onedev;
+    public function index()
+    {
+        echo "Bill API";
+    }
+    public function __construct()
+    {
+        parent::__construct();
+        $this->db_onedev = $this->load->database("onedev", true);
+    }

-   public function add_notes($orderid){
-	   $sql = "	SELECT SupplierPaymentSupplierInvoiceID as note_order_id,
+    public function add_notes($orderid)
+    {
+        $sql = "SELECT SupplierPaymentSupplierInvoiceID as note_order_id,
 				SupplierPaymentID as note_id,
 				SupplierPaymentDetailSupplierInvoiceDetailID as detail_id,
 				SupplierPaymentDate as note_date,
@@ -33,223 +34,590 @@ class Bill extends MY_Controller
 				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_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID AND SupplierPaymentDetailIsActive = '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
-				SupplierPaymentSupplierInvoiceID = {$orderid}
-				AND
-			 	SupplierPaymentIsActive = 'Y'
-				GROUP BY SupplierPaymentID";
-		$query = $this->db_onedev->query($sql);
-		if ($query) {
-			$rows = $query->result_array();
-			if($rows){
-				foreach($rows as $k => $v){
-					$rows[$k]['tests'] = $this->add_tests($v['note_id']);
-				}
-			}
-			return $rows;
-
-		} else {
-			$this->sys_error_db("get 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
-		 FROM supplier_invoice
-		 JOIN purchase_order ON SupplierInvoicePurchaseOrderID = 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 = ?
-		 GROUP BY jurnalTxID";
-	 $query = $this->db_onedev->query($sql, [$orderid]);
-	 if ($query) {
-		 $rows = $query->result_array();
-		 return $rows;
-
-	 } else {
-		 $this->sys_error_db("get notes", $this->db_onedev);
-		 exit;
-	 }
-}
-   public function add_tests($orderid){
-	$sql = "	SELECT SupplierPaymentSupplierInvoiceID as note_order_id,
-			 SupplierPaymentID as note_id,
-			 SupplierPaymentDate as note_date,
-			 SupplierPaymentNumber as note_number,
-			 GROUP_CONCAT(coaDescription separator ' , ') as paymenttypes_name,
-			 SUM(SupplierPaymentDetailAmount) as note_amount,
-			 M_UserUsername as note_user,
-			 SupplierPaymentDetailIsActive as note_active,
-			 PurchaseOrderNumber,
-			 SupplierInvoiceDetailTotal,
-			 SupplierPaymentDetailAmount
-			 FROM supplier_payment
-			 JOIN supplier_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID
-			 LEFT JOIN supplier_invoice_detail ON SupplierPaymentDetailSupplierInvoiceDetailID = SupplierInvoiceDetailID
-			 LEFT JOIN purchase_order ON SupplierInvoiceDetailPurchaseOrderID = PurchaseOrderID
-			 JOIN coa ON SupplierPaymentCoaID = coaID
-			 LEFT JOIN m_user ON SupplierPaymentDetailUserID = M_UserID
-			 WHERE
-			 SupplierPaymentID = {$orderid}
-			 GROUP BY SupplierPaymentDetailID";
-	 $query = $this->db_onedev->query($sql);
-	 if ($query) {
-		 $rows = $query->result_array();
-		 if($rows){
-		 }
-		 return $rows;
-
-	 } else {
-		 $this->sys_error_db("get notes", $this->db_onedev);
-		 exit;
-	 }
-}
-   public function search()
-   {
-	    //# cek token valid
-        if (! $this->isLogin) {
-        $this->sys_error("Invalid Token");
-        exit;
+			FROM supplier_payment
+			JOIN supplier_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID AND SupplierPaymentDetailIsActive = '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 SupplierPaymentSupplierInvoiceID = {$orderid}
+				AND SupplierPaymentIsActive = 'Y'
+			GROUP BY SupplierPaymentID";
+        $query = $this->db_onedev->query($sql);
+        if ($query) {
+            $rows = $query->result_array();
+            if ($rows) {
+                foreach ($rows as $k => $v) {
+                    $rows[$k]['tests'] = $this->add_tests($v['note_id']);
+                }
+            }
+            return $rows;
+        } else {
+            $this->sys_error_db("get notes", $this->db_onedev);
+            exit;
        }
-      $prm = $this->sys_input;
-	  $supplier = $prm["supplier"];
-      $search = $prm["search"];
-      $status = $prm["status"];
-	  $startdate = $prm["startdate"];
-	  $enddate = $prm["enddate"];
-	  $regionalid = $this->sys_user['S_RegionalID'];
+    }

-	  $number_limit = 10;
-	  $number_offset = ($prm['current_page'] - 1) * $number_limit ;
+    public function add_notes_downpayment($orderid)
+    {
+        $sql = "SELECT SupplierPaymentSupplierDownpaymentID AS note_order_id,
+                SupplierPaymentID AS note_id,
+                SupplierDownpaymentID AS detail_id,
+                SupplierPaymentDate AS note_date,
+                SupplierPaymentNumber AS note_number,
+                GROUP_CONCAT(DISTINCT coaDescription separator ' , ') AS paymenttypes_name,
+                SUM(SupplierDownpaymentAmount) AS note_amount,
+                n.M_UserUsername AS note_user,
+                SupplierDownpaymentIsActive 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_downpayment
+                ON SupplierDownpaymentID = SupplierPaymentSupplierDownpaymentID
+                AND SupplierDownpaymentIsActive = '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 SupplierPaymentSupplierDownpaymentID = {$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 DP notes", $this->db_onedev);
+            exit;
+        }
+    }

-	  $where = "SupplierInvoiceIsActive = 'Y'
-	  AND SupplierPaymentIsApproved = 'Y'
-	  AND SupplierPaymentIsVerif = 'Y'
-	  AND SupplierPaymentIsConfirm = '{$status}'
-	  AND (SupplierInvoiceNumber LIKE '%{$search}%' OR SupplierInvoiceSupplierInvoiceNumber LIKE '%{$search}%')
-	  AND SupplierName LIKE '%{$supplier}%'
-	  AND ReceiveOrderPoS_RegionalID = {$regionalid}
-	  AND SupplierInvoiceDraftPaymentDate BETWEEN '{$startdate}' AND '{$enddate}'";
+    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
+            FROM supplier_invoice
+            JOIN purchase_order
+                ON SupplierInvoicePurchaseOrderID = 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 = ?
+            GROUP BY jurnalTxID";
+        $query = $this->db_onedev->query($sql, [$orderid]);
+        if ($query) {
+            $rows = $query->result_array();
+            return $rows;
+        } else {
+            $this->sys_error_db("get notes", $this->db_onedev);
+            exit;
+        }
+    }

+    public function add_tests($orderid)
+    {
+        $sql = "SELECT
+                SupplierPaymentSupplierInvoiceID as note_order_id,
+                SupplierPaymentID as note_id,
+                SupplierPaymentDate as note_date,
+                SupplierPaymentNumber as note_number,
+                GROUP_CONCAT(coaDescription separator ' , ') as paymenttypes_name,
+                SUM(SupplierPaymentDetailAmount) as note_amount,
+                M_UserUsername as note_user,
+                SupplierPaymentDetailIsActive as note_active,
+                PurchaseOrderNumber,
+                SupplierInvoiceDetailTotal,
+                SupplierPaymentDetailAmount
+            FROM supplier_payment
+            JOIN supplier_payment_detail
+                ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID
+            LEFT JOIN supplier_invoice_detail
+                ON SupplierPaymentDetailSupplierInvoiceDetailID = SupplierInvoiceDetailID
+            LEFT JOIN purchase_order
+                ON SupplierInvoiceDetailPurchaseOrderID = PurchaseOrderID
+            JOIN coa
+                ON SupplierPaymentCoaID = coaID
+            LEFT JOIN m_user
+                ON SupplierPaymentDetailUserID = M_UserID
+            WHERE SupplierPaymentID = {$orderid}
+            GROUP BY SupplierPaymentDetailID";
+        $query = $this->db_onedev->query($sql);
+        if ($query) {
+            $rows = $query->result_array();
+            if ($rows) {
+            }
+            return $rows;
+        } else {
+            $this->sys_error_db("get notes", $this->db_onedev);
+            exit;
+        }
+    }

+    public function search_old()
+    {
+        if (! $this->isLogin) {
+            $this->sys_error("Invalid Token");
+            exit;
+        }

+        $prm = $this->sys_input;
+        $supplier   = $prm["supplier"];
+        $search     = $prm["search"];
+        $status     = $prm["status"];
+        $startdate  = $prm["startdate"];
+        $enddate    = $prm["enddate"];
+        $regionalid = $this->sys_user['S_RegionalID'];

-      $sql = "	SELECT count(*) as total
-				FROM supplier_invoice
-				JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
-				LEFT JOIN supplier_payment ON SupplierInvoiceID = SupplierPaymentSupplierInvoiceID AND SupplierPaymentIsActive = 'Y'
-				LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
-				JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
-				WHERE
-				$where
-				";
- // echo $sql;
-		$query = $this->db_onedev->query($sql, $sql_param);
+        $number_limit  = 10;
+        $number_offset = ((int)$prm['current_page'] - 1) * $number_limit;

+        // ── WHERE ────────────────────────────────────────────────
+        $where = " si.SupplierInvoiceIsActive = 'Y'
+            AND sp.SupplierPaymentIsApproved = 'Y'
+            AND sp.SupplierPaymentIsVerif = 'Y'
+            AND sp.SupplierPaymentIsConfirm = ?
+            AND (si.SupplierInvoiceNumber LIKE ?
+                 OR si.SupplierInvoiceSupplierInvoiceNumber LIKE ?)
+            AND sup.SupplierName LIKE ?
+            AND rop.ReceiveOrderPoS_RegionalID = ?
+            AND si.SupplierInvoiceDraftPaymentDate BETWEEN ? AND ? ";

-		$tot_count = 0;
-		$tot_page = 0;
-		if ($query) {
-			$tot_count = $query->result_array()[0]["total"];
-			$tot_page = ceil($tot_count/$number_limit);
-		} else {
-			$this->sys_error_db("supplier_invoice count", $this->db_onedev);
-			exit;
-		}
+        $where_params = [
+            $status,
+            '%' . $search . '%',
+            '%' . $search . '%',
+            '%' . $supplier . '%',
+            $regionalid,
+            $startdate,
+            $enddate,
+        ];

+        // ── COUNT ────────────────────────────────────────────────
+        $sql_count = "
+            SELECT count(*) as total
+            FROM supplier_invoice si
+            JOIN jurnal_addon ja ON ja.jurnalAddOnValue = si.SupplierInvoiceNumber
+            JOIN receive_order_po rop ON rop.ReceiveOrderPoID = si.SupplierInvoiceReceiveOrderPoID
+            LEFT JOIN supplier_payment sp
+                ON sp.SupplierPaymentSupplierInvoiceID = si.SupplierInvoiceID
+                AND sp.SupplierPaymentIsActive = 'Y'
+            LEFT JOIN supplier sup ON sup.SupplierID = si.SupplierInvoiceSupplierID
+            WHERE $where";

-		$sql = 	"SELECT supplier_invoice.*,
-				SupplierName,
-				'' M_MouName,
-				0 as totalbill,
-				0 as paid,
-				0 as unpaid,
-				SupplierInvoiceIsLunas as flaglunas,
-				'' as SupplierPaymentNumber,
-				0 as SupplierPaymentAmount,
-				'' as SupplierPaymentDate,
-				'' as SupplierInvoiceIssueRefNumber,
-				'' as notes,
-				'' as tagihans,
-				'N' as isbillterpusat,
-				DATE_FORMAT(SupplierInvoiceDraftPaymentDate,'%d-%m-%Y') as tanggalbayar,
-				DATE_FORMAT(SupplierInvoiceDraftPaymentDate,'%d%m%Y') as tanggalbayartext,
-				IF(SupplierPaymentID IS NULL,'N','Y') as status_invoice,
-				SupplierPaymentID,
-				SupplierPaymentIsConfirm,
-				DATE_FORMAT(IFNULL(SupplierInvoiceSupplierInvoiceDate,''),'%d-%m-%Y') as tanggalinvoice,
-				0 xrounding,
-				'' chex,
-				IFNULL(SupplierPaymentCashierNumber,'') SupplierPaymentCashierNumber
+        $query = $this->db_onedev->query($sql_count, $where_params);

+        $tot_count = 0;
+        $tot_page  = 0;
+        if ($query) {
+            $tot_count = $query->result_array()[0]["total"];
+            $tot_page  = ceil($tot_count / $number_limit);
+        } else {
+            $this->sys_error_db("supplier_invoice count", $this->db_onedev);
+            exit;
+        }

-				FROM supplier_invoice
-				LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
-				JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
-				JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
-				LEFT JOIN supplier_payment ON SupplierPaymentSupplierInvoiceID = SupplierInvoiceID AND SupplierPaymentIsActive = 'Y'
-				WHERE
-				$where
-				GROUP BY SupplierInvoiceID
-				ORDER BY SupplierInvoiceID ASC
-				limit $number_limit offset $number_offset";
-		//echo $sql;
-		$query = $this->db_onedev->query($sql, $sql_param);
-		$rows = $query->result_array();
-		if($rows){
-			foreach($rows as $k => $v){
-				$rows[$k]['chex'] = false;
-				$s_payment = $this->db_onedev->query("SELECT GROUP_CONCAT(SupplierPaymentNumber SEPARATOR ', ') as SupplierPaymentNumber,
-				SUM(IFNULL(SupplierPaymentAmount,0)) as SupplierPaymentAmount,
-				GROUP_CONCAT(DATE_FORMAT(SupplierPaymentDate,'%d-%m-%Y') SEPARATOR ', ') as SupplierPaymentDate
-				FROM supplier_payment
-				WHERE SupplierPaymentIsActive = 'Y' AND SupplierPaymentSupplierInvoiceID = {$v['SupplierInvoiceID']}")->row();
+        // ── DATA — only columns the frontend actually reads ──────
+        $sql_data = "
+            SELECT
+                si.SupplierInvoiceID,
+                si.SupplierInvoiceNumber,
+                si.SupplierInvoiceDraftPaymentDate,
+                si.SupplierInvoiceIsLunas                    AS flaglunas,
+                si.SupplierInvoiceSupplierInvoiceNumber,
+                DATE_FORMAT(
+                    IFNULL(si.SupplierInvoiceSupplierInvoiceDate,''),'%d-%m-%Y'
+                )                                             AS tanggalinvoice,
+                sup.SupplierName,
+                sp.SupplierPaymentID,
+                sp.SupplierPaymentIsConfirm,
+                IFNULL(sp.SupplierPaymentCashierNumber,'')    AS SupplierPaymentCashierNumber,
+                DATE_FORMAT(
+                    si.SupplierInvoiceDraftPaymentDate,'%d-%m-%Y'
+                )                                             AS tanggalbayar,
+                0                                             AS totalbill,
+                0                                             AS paid,
+                0                                             AS unpaid,
+                ''                                            AS SupplierPaymentNumber,
+                0                                             AS SupplierPaymentAmount,
+                ''                                            AS SupplierPaymentDate,
+                ''                                            AS notes,
+                ''                                            AS tagihans,
+                0                                             AS xrounding,
+                ''                                            AS chex
+            FROM supplier_invoice si
+            JOIN jurnal_addon ja ON ja.jurnalAddOnValue = si.SupplierInvoiceNumber
+            JOIN receive_order_po rop ON rop.ReceiveOrderPoID = si.SupplierInvoiceReceiveOrderPoID
+            LEFT JOIN supplier_payment sp
+                ON sp.SupplierPaymentSupplierInvoiceID = si.SupplierInvoiceID
+                AND sp.SupplierPaymentIsActive = 'Y'
+            LEFT JOIN supplier sup ON sup.SupplierID = si.SupplierInvoiceSupplierID
+            WHERE $where
+            GROUP BY si.SupplierInvoiceID
+            ORDER BY si.SupplierInvoiceID ASC
+            LIMIT ? OFFSET ?";

-				$s_jurnal = $this->db_onedev->query("SELECT SUM(jurnalTxCredit) totalbill
-				FROM supplier_invoice
-				JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
-			 	JOIN jurnal_tx ON jurnalTxJurnalID = jurnalAddOnJurnalID AND jurnalTxCredit <> 0 AND jurnalTxCoaID <> 563
-				WHERE SupplierInvoiceID = {$v['SupplierInvoiceID']}
-				GROUP BY SupplierInvoiceID")->row();
-				$amount = $s_payment->SupplierPaymentAmount ? $s_payment->SupplierPaymentAmount : "0.00";
-				$unpaid = (float)$s_jurnal->totalbill - (float)$amount;
-				$rows[$k]['SupplierPaymentNumber'] = $s_payment->SupplierPaymentNumber;
-				$rows[$k]['SupplierPaymentAmount'] = $amount;
-				$rows[$k]['SupplierPaymentDate'] = $s_payment->SupplierPaymentDate;
-				$rows[$k]['paid'] = $amount;
-				$rows[$k]['totalbill'] = $s_jurnal->totalbill ? $s_jurnal->totalbill : "0.00";
-				$rows[$k]['unpaid'] = number_format($unpaid, 2, '.', '');
+        $data_params = array_merge($where_params, [$number_limit, $number_offset]);
+        $query = $this->db_onedev->query($sql_data, $data_params);
+        $rows  = $query->result_array();

-				$rows[$k]['notes'] = $this->add_notes($v['SupplierInvoiceID']);
-				$rows[$k]['tagihans'] = $this->add_tagihans($v['SupplierInvoiceID']);
+        // ── ENRICH ───────────────────────────────────────────────
+        if ($rows) {
+            foreach ($rows as $k => $v) {
+                $rows[$k]['chex'] = false;
+                $inv_id = $v['SupplierInvoiceID'];

-			}
-		}
+                $s_payment = $this->db_onedev->query("
+                    SELECT
+                        GROUP_CONCAT(SupplierPaymentNumber SEPARATOR ', ') as SupplierPaymentNumber,
+                        SUM(IFNULL(SupplierPaymentAmount,0))                as SupplierPaymentAmount,
+                        GROUP_CONCAT(
+                            DATE_FORMAT(SupplierPaymentDate,'%d-%m-%Y')
+                            SEPARATOR ', '
+                        )                                                   as SupplierPaymentDate
+                    FROM supplier_payment
+                    WHERE SupplierPaymentIsActive = 'Y'
+                        AND SupplierPaymentSupplierInvoiceID = ?",
+                    [$inv_id]
+                )->row();

+                $s_jurnal = $this->db_onedev->query("
+                    SELECT SUM(jurnalTxCredit) totalbill
+                    FROM supplier_invoice si
+                    JOIN jurnal_addon ja ON ja.jurnalAddOnValue = si.SupplierInvoiceNumber
+                    JOIN jurnal_tx jt
+                        ON jt.jurnalTxJurnalID = ja.jurnalAddOnJurnalID
+                        AND jt.jurnalTxCredit <> 0
+                        AND jt.jurnalTxCoaID <> 563
+                    WHERE si.SupplierInvoiceID = ?
+                    GROUP BY si.SupplierInvoiceID",
+                    [$inv_id]
+                )->row();

-		$result = array("total" => $tot_page, "records" => $rows, "sql"=> $this->db_onedev->last_query());
-		$this->sys_ok($result);
-		exit;
-   }
+                $amount = $s_payment->SupplierPaymentAmount
+                    ? $s_payment->SupplierPaymentAmount
+                    : "0.00";
+                $unpaid = (float)$s_jurnal->totalbill - (float)$amount;

+                $rows[$k]['SupplierPaymentNumber'] = $s_payment->SupplierPaymentNumber;
+                $rows[$k]['SupplierPaymentAmount'] = $amount;
+                $rows[$k]['SupplierPaymentDate']   = $s_payment->SupplierPaymentDate;
+                $rows[$k]['paid']                  = $amount;
+                $rows[$k]['totalbill']             = $s_jurnal->totalbill
+                    ? $s_jurnal->totalbill
+                    : "0.00";
+                $rows[$k]['unpaid']                = number_format($unpaid, 2, '.', '');

+                $rows[$k]['notes']    = $this->add_notes($inv_id);
+                $rows[$k]['tagihans'] = $this->add_tagihans($inv_id);
+            }
+        }
+
+        $result = array("total" => $tot_page, "records" => $rows);
+        $this->sys_ok($result);
+        exit;
+    }
+
+    public function search()
+    {
+        if (! $this->isLogin) {
+            $this->sys_error("Invalid Token");
+            exit;
+        }
+
+        $prm = $this->sys_input;
+        $supplier   = $prm["supplier"];
+        $search     = $prm["search"];
+        $status     = $prm["status"];
+        $startdate  = $prm["startdate"];
+        $enddate    = $prm["enddate"];
+        $regionalid = $this->sys_user['S_RegionalID'];
+
+        $number_limit  = 10;
+        $number_offset = ((int)$prm['current_page'] - 1) * $number_limit;
+
+        // ── INVOICE branch WHERE ─────────────────────────────────
+        $inv_where = " si.SupplierInvoiceIsActive = 'Y'
+            AND rop.ReceiveOrderPoS_RegionalID = ? ";
+
+        $inv_params = [$regionalid];
+
+        // ── DOWNPAYMENT branch WHERE ─────────────────────────────
+        $dp_where = " dp.SupplierDownpaymentIsActive = 'Y'
+            AND po.PurchaseOrderS_RegionalID = ? ";
+
+        $dp_params = [$regionalid];
+
+        // ── UNION base ───────────────────────────────────────────
+        $sql_base = "
+            SELECT
+                si.SupplierInvoiceID,
+                si.SupplierInvoiceNumber,
+                si.SupplierInvoiceDraftPaymentDate,
+                si.SupplierInvoiceDraftPaymentDate                 AS filter_date,
+                si.SupplierInvoiceIsLunas                          AS flaglunas,
+                si.SupplierInvoiceSupplierInvoiceNumber,
+                DATE_FORMAT(
+                    IFNULL(si.SupplierInvoiceSupplierInvoiceDate,''),'%d-%m-%Y'
+                )                                                   AS tanggalinvoice,
+                sup.SupplierName,
+                sp.SupplierPaymentID,
+                sp.SupplierPaymentIsConfirm,
+                sp.SupplierPaymentIsApproved,
+                sp.SupplierPaymentIsVerif,
+                sp.SupplierPaymentIsActive,
+                IFNULL(sp.SupplierPaymentCashierNumber,'')          AS SupplierPaymentCashierNumber,
+                DATE_FORMAT(
+                    si.SupplierInvoiceDraftPaymentDate,'%d-%m-%Y'
+                )                                                   AS tanggalbayar,
+                0                                                   AS totalbill,
+                0                                                   AS paid,
+                0                                                   AS unpaid,
+                ''                                                  AS SupplierPaymentNumber,
+                0                                                   AS SupplierPaymentAmount,
+                ''                                                  AS SupplierPaymentDate,
+                ''                                                  AS notes,
+                ''                                                  AS tagihans,
+                0                                                   AS xrounding,
+                ''                                                  AS chex,
+                'INVOICE'                                           AS type
+            FROM supplier_invoice si
+            JOIN jurnal_addon ja ON ja.jurnalAddOnValue = si.SupplierInvoiceNumber
+            JOIN receive_order_po rop ON rop.ReceiveOrderPoID = si.SupplierInvoiceReceiveOrderPoID
+            LEFT JOIN supplier_payment sp
+                ON sp.SupplierPaymentSupplierInvoiceID = si.SupplierInvoiceID
+                AND sp.SupplierPaymentIsActive = 'Y'
+            LEFT JOIN supplier sup ON sup.SupplierID = si.SupplierInvoiceSupplierID
+            WHERE $inv_where
+            GROUP BY si.SupplierInvoiceID
+
+            UNION ALL
+
+            SELECT
+                dp.SupplierDownpaymentID * -1                      AS SupplierInvoiceID,
+                CONCAT('DP-', po.PurchaseOrderNumber)              AS SupplierInvoiceNumber,
+                dp.SupplierDownpaymentDueDate                      AS SupplierInvoiceDraftPaymentDate,
+                dp.SupplierDownpaymentDueDate                      AS filter_date,
+                dp.SupplierDownpaymentIsLunas                      AS flaglunas,
+                ''                                                 AS SupplierInvoiceSupplierInvoiceNumber,
+                DATE_FORMAT(dp.SupplierDownpaymentDate,'%d-%m-%Y') AS tanggalinvoice,
+                dp_sup.SupplierName                                AS SupplierName,
+                sp.SupplierPaymentID,
+                sp.SupplierPaymentIsConfirm,
+                sp.SupplierPaymentIsApproved,
+                sp.SupplierPaymentIsVerif,
+                sp.SupplierPaymentIsActive,
+                IFNULL(sp.SupplierPaymentCashierNumber,'')          AS SupplierPaymentCashierNumber,
+                DATE_FORMAT(
+                    dp.SupplierDownpaymentDueDate,'%d-%m-%Y'
+                )                                                   AS tanggalbayar,
+                dp.SupplierDownpaymentAmount                        AS totalbill,
+                CASE WHEN dp.SupplierDownpaymentStatus = 'Paid'
+                     THEN dp.SupplierDownpaymentAmount
+                     ELSE 0 END                                     AS paid,
+                CASE WHEN dp.SupplierDownpaymentStatus = 'Paid'
+                     THEN 0
+                     ELSE dp.SupplierDownpaymentAmount END          AS unpaid,
+                ''                                                  AS SupplierPaymentNumber,
+                0                                                   AS SupplierPaymentAmount,
+                ''                                                  AS SupplierPaymentDate,
+                ''                                                  AS notes,
+                ''                                                  AS tagihans,
+                0                                                   AS xrounding,
+                ''                                                  AS chex,
+                'DP'                                                AS type
+            FROM supplier_payment sp
+            JOIN supplier_downpayment dp
+                ON dp.SupplierDownpaymentID = sp.SupplierPaymentSupplierDownpaymentID
+            JOIN supplier dp_sup
+                ON dp_sup.SupplierID = dp.SupplierDownpaymentSupplierID
+            JOIN purchase_order po
+                ON po.PurchaseOrderID = dp.SupplierDownpaymentPurchasOrderID
+            WHERE $dp_where";
+
+        // ── Outer common filters ─────────────────────────────────
+        $outer_where = " SupplierPaymentIsActive = 'Y'
+            AND SupplierPaymentIsApproved = 'Y'
+            AND SupplierPaymentIsVerif = 'Y'
+            AND SupplierPaymentIsConfirm = ?
+            AND (SupplierInvoiceNumber LIKE ? OR SupplierInvoiceSupplierInvoiceNumber LIKE ?)
+            AND SupplierName LIKE ?
+            AND filter_date BETWEEN ? AND ? ";
+
+        $outer_params = [
+            $status,
+            '%' . $search . '%',
+            '%' . $search . '%',
+            '%' . $supplier . '%',
+            $startdate,
+            $enddate,
+        ];
+
+        // ── COUNT ────────────────────────────────────────────────
+        $sql_count = "
+            SELECT COUNT(*) AS total
+            FROM ($sql_base) AS combined
+            WHERE $outer_where";
+
+        $count_params = array_merge($inv_params, $dp_params, $outer_params);
+        $query = $this->db_onedev->query($sql_count, $count_params);
+
+        $tot_count = 0;
+        $tot_page  = 0;
+        if ($query) {
+            $tot_count = $query->result_array()[0]["total"];
+            $tot_page  = ceil($tot_count / $number_limit);
+        } else {
+            $this->sys_error_db("supplier payment count", $this->db_onedev);
+            exit;
+        }
+
+        // ── DATA ─────────────────────────────────────────────────
+        $sql_data = "
+            SELECT * FROM ($sql_base) AS combined
+            WHERE $outer_where
+            ORDER BY SupplierInvoiceID ASC
+            LIMIT ? OFFSET ?";
+
+        $data_params = array_merge($inv_params, $dp_params, $outer_params, [$number_limit, $number_offset]);
+        $query = $this->db_onedev->query($sql_data, $data_params);
+        $rows  = $query->result_array();
+
+        // ── ENRICH ───────────────────────────────────────────────
+        if ($rows) {
+            foreach ($rows as $k => $v) {
+
+                // ── Downpayment branch ──────────────────────────
+                if ($v['type'] === 'DP') {
+                    $rows[$k]['chex'] = false;
+                    $dp_id = abs($v['SupplierInvoiceID']);
+
+                    $s_payment = $this->db_onedev->query("
+                        SELECT
+                            GROUP_CONCAT(SupplierPaymentNumber SEPARATOR ', ') as SupplierPaymentNumber,
+                            SUM(IFNULL(SupplierPaymentAmount,0))                as SupplierPaymentAmount,
+                            GROUP_CONCAT(
+                                DATE_FORMAT(SupplierPaymentDate,'%d-%m-%Y')
+                                SEPARATOR ', '
+                            )                                                   as SupplierPaymentDate
+                        FROM supplier_payment
+                        WHERE SupplierPaymentIsActive = 'Y'
+                            AND SupplierPaymentSupplierDownpaymentID = ?",
+                        [$dp_id]
+                    )->row();
+
+                    $amount = $s_payment->SupplierPaymentAmount
+                        ? $s_payment->SupplierPaymentAmount
+                        : "0.00";
+
+                    $rows[$k]['SupplierPaymentNumber'] = $s_payment->SupplierPaymentNumber;
+                    $rows[$k]['SupplierPaymentAmount'] = $amount;
+                    $rows[$k]['SupplierPaymentDate']   = $s_payment->SupplierPaymentDate;
+                    $rows[$k]['paid']                  = $amount;
+                    $rows[$k]['notes']                 = $this->add_notes_downpayment($dp_id);
+                    $rows[$k]['tagihans']              = [];
+                    continue;
+                }
+
+                // ── Invoice branch ──────────────────────────────
+                $rows[$k]['chex'] = false;
+                $inv_id = $v['SupplierInvoiceID'];
+
+                $s_payment = $this->db_onedev->query("
+                    SELECT
+                        GROUP_CONCAT(SupplierPaymentNumber SEPARATOR ', ') as SupplierPaymentNumber,
+                        SUM(IFNULL(SupplierPaymentAmount,0))                as SupplierPaymentAmount,
+                        GROUP_CONCAT(
+                            DATE_FORMAT(SupplierPaymentDate,'%d-%m-%Y')
+                            SEPARATOR ', '
+                        )                                                   as SupplierPaymentDate
+                    FROM supplier_payment
+                    WHERE SupplierPaymentIsActive = 'Y'
+                        AND SupplierPaymentSupplierInvoiceID = ?",
+                    [$inv_id]
+                )->row();
+
+                $s_jurnal = $this->db_onedev->query("
+                    SELECT SUM(jurnalTxCredit) totalbill
+                    FROM supplier_invoice si
+                    JOIN jurnal_addon ja ON ja.jurnalAddOnValue = si.SupplierInvoiceNumber
+                    JOIN jurnal_tx jt
+                        ON jt.jurnalTxJurnalID = ja.jurnalAddOnJurnalID
+                        AND jt.jurnalTxCredit <> 0
+                        AND jt.jurnalTxCoaID <> 563
+                    WHERE si.SupplierInvoiceID = ?
+                    GROUP BY si.SupplierInvoiceID",
+                    [$inv_id]
+                )->row();
+
+                $amount = $s_payment->SupplierPaymentAmount
+                    ? $s_payment->SupplierPaymentAmount
+                    : "0.00";
+                $unpaid = (float)$s_jurnal->totalbill - (float)$amount;
+
+                $rows[$k]['SupplierPaymentNumber'] = $s_payment->SupplierPaymentNumber;
+                $rows[$k]['SupplierPaymentAmount'] = $amount;
+                $rows[$k]['SupplierPaymentDate']   = $s_payment->SupplierPaymentDate;
+                $rows[$k]['paid']                  = $amount;
+                $rows[$k]['totalbill']             = $s_jurnal->totalbill
+                    ? $s_jurnal->totalbill
+                    : "0.00";
+                $rows[$k]['unpaid']                = number_format($unpaid, 2, '.', '');
+
+                $rows[$k]['notes']    = $this->add_notes($inv_id);
+                $rows[$k]['tagihans'] = $this->add_tagihans($inv_id);
+            }
+        }
+
+        $result = array("total" => $tot_page, "records" => $rows);
+        $this->sys_ok($result);
+        exit;
+    }
 }
--- a/application/controllers/mockup/supplierpaymentcashierv5/PaymentV2.php
+++ b/application/controllers/mockup/supplierpaymentcashierv5/PaymentV2.php
@@ -70,14 +70,28 @@ class PaymentV2 extends MY_Controller
            }

            # UPDATE status lunas supplier invoice #
-            $sql_suppinvoice = "UPDATE supplier_invoice
-            SET SupplierInvoiceIsLunas = 'Y'
-            WHERE SupplierInvoiceID = ?";
-            $que_suppinvoice = $this->db->query($sql_suppinvoice, [$param['SupplierInvoiceID']]);
-            if (!$que_suppinvoice) {
-                $this->db->trans_rollback();
-                $this->sys_error_db("[Error] update status lunas invoice");
-                exit;
+            if ($param['type'] == 'DP') {
+                $sql_updatedp = "UPDATE supplier_downpayment
+                    SET SupplierDownpaymentIsLunas = 'Y'
+                    WHERE SupplierDownpaymentID = ?";
+                $que_updatedp = $this->db->query($sql_updatedp, [
+                    abs($param['SupplierInvoiceID'])
+                ]);
+                if (!$que_updatedp) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] update status lunas downpayment");
+                    exit;
+                }
+            } else {
+                $sql_suppinvoice = "UPDATE supplier_invoice
+                    SET SupplierInvoiceIsLunas = 'Y'
+                    WHERE SupplierInvoiceID = ?";
+                $que_suppinvoice = $this->db->query($sql_suppinvoice, [$param['SupplierInvoiceID']]);
+                if (!$que_suppinvoice) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] update status lunas invoice");
+                    exit;
+                }
            }

            # GET Latest data supplier payment #
@@ -89,16 +103,33 @@ class PaymentV2 extends MY_Controller
                exit;
            }
            $suppayment_header = $que_suppayment->row_array();
+            $suppayment_detail = [];

-            $sql_suppaymentdetail = "SELECT * FROM supplier_payment_detail
+            if ($param['type'] == 'DP') {
+                $sql_suppaymentdetail = "SELECT supplier_downpayment.*
+                    FROM supplier_payment
+                    JOIN supplier_downpayment
+                        ON SupplierPaymentSupplierDownpaymentID = SupplierDownpaymentID
+                        AND SupplierDownpaymentIsActive = 'Y'
+                    WHERE SupplierPaymentID = ?";
+                $que_suppaymentdetail = $this->db->query($sql_suppaymentdetail, [$param['orderid']]);
+                if (!$que_suppaymentdetail) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] get data latest supplier downpayment");
+                    exit;
+                }
+                $suppayment_detail = $que_suppaymentdetail->result_array();
+            } else {
+                $sql_suppaymentdetail = "SELECT * FROM supplier_payment_detail
                WHERE SupplierPaymentDetailSupplierPaymentID = ?";
-            $que_suppaymentdetail = $this->db->query($sql_suppaymentdetail, [$param['orderid']]);
-            if (!$que_suppaymentdetail) {
-                $this->db->trans_rollback();
-                $this->sys_error_db("[Error] get data latest supplier payment detail");
-                exit;
+                $que_suppaymentdetail = $this->db->query($sql_suppaymentdetail, [$param['orderid']]);
+                if (!$que_suppaymentdetail) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] get data latest supplier payment detail");
+                    exit;
+                }
+                $suppayment_detail = $que_suppaymentdetail->result_array();
            }
-            $suppayment_detail = $que_suppaymentdetail->result_array();

            $data_log = [
                "header" => $suppayment_header,
@@ -121,38 +152,85 @@ class PaymentV2 extends MY_Controller
            # INSERT JURNAL #
            $detail_transac = [];

-            # GET data hutang #
-            $sql_datahutang = "SELECT
-                    SupplierPaymentNumber AS addonvalue,
-                    SupplierPaymentDetailID,
-                    jurnalTxCoaID AS coaID,
-                    jurnalTxDescription AS coaDescription,
-                    SupplierPaymentDetailAmount,
-                    SupplierInvoiceDetailItemID
-                FROM supplier_payment
-                JOIN supplier_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID
-                JOIN supplier_invoice_detail ON SupplierInvoiceDetailSupplierInvoiceID = SupplierPaymentSupplierInvoiceID
-                    AND SupplierInvoiceDetailIsActive = 'Y'
-                JOIN jurnal_tx ON SupplierPaymentDetailSupplierInvoiceDetailID = jurnalTxID
-                WHERE SupplierPaymentID = ?
-                AND SupplierPaymentDetailIsActive = 'Y'";
-            $que_datahutang = $this->db->query($sql_datahutang, [$param['orderid']]);
-            if (!$que_datahutang) {
-                $this->db->trans_rollback();
-                $this->sys_error_db("[Error] get data hutang item");
-                exit;
-            }
-            $data_hutang = $que_datahutang->result_array();
-            foreach ($data_hutang as $key => $debt) {
-                $detail_transac[] = [
-                    "coaID" => $debt['coaID'],
-                    "coaDescription" => $debt['coaDescription'],
-                    "debit" => $debt['SupplierPaymentDetailAmount'],
-                    "credit" => 0,
-                    "addoncode" => "JFA",
-                    "addonvalue" => $debt['addonvalue'],
-                    "addonitemid" => $debt['SupplierInvoiceDetailItemID']
-                ];
+            if ($param['type'] == "DP") {
+                $sql_coaDP = "SELECT
+                        coaID,
+                        coaDescription,
+                        SupplierDownpaymentAmount,
+                        M_ItemID,
+                        SupplierPaymentNumber,
+                        M_ItemID
+                    FROM supplier_payment
+                    JOIN supplier_downpayment
+                        ON SupplierDownpaymentID = SupplierPaymentSupplierDownpaymentID
+                        AND SupplierDownpaymentIsActive = 'Y'
+                    JOIN purchase_order_detail
+                        ON SupplierDownpaymentPurchasOrderID =  PurchaseOrderDetailPurchaseOrderID
+                        AND PurchaseOrderDetailIsActive = 'Y'
+                    JOIN m_item
+                        ON M_ItemID = PurchaseOrderDetailItemID
+                        AND M_ItemIsActive = 'Y'
+                    JOIN fa_class
+                        ON Fa_ClassID = M_ItemFa_ClassID
+                        AND M_ItemIsActive = 'Y'
+                    JOIN coa
+                        ON coaID = Fa_ClassDownPaymentCoaID
+                        AND coaIsActive = 'Y'
+                    WHERE SupplierPaymentID = ?";
+                $que_coaDP = $this->db->query($sql_coaDP, [
+                    $param['orderid']
+                ]);
+                if (!$que_coaDP) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] get data hutang item");
+                    exit;
+                }
+                $data_dp = $que_coaDP->result_array();
+                foreach ($data_dp as $key => $dp) {
+                    $detail_transac[] = [
+                        "coaID" => $dp['coaID'],
+                        "coaDescription" => $dp['coaDescription'],
+                        "debit" => $dp['SupplierDownpaymentAmount'],
+                        "credit" => 0,
+                        "addoncode" => "DP-JFA",
+                        "addonvalue" => $dp['SupplierPaymentNumber'],
+                        "addonitemid" => $dp['M_ItemID']
+                    ];
+                }
+            } else {
+                # GET data hutang #
+                $sql_datahutang = "SELECT
+                        SupplierPaymentNumber AS addonvalue,
+                        SupplierPaymentDetailID,
+                        jurnalTxCoaID AS coaID,
+                        jurnalTxDescription AS coaDescription,
+                        SupplierPaymentDetailAmount,
+                        SupplierInvoiceDetailItemID
+                    FROM supplier_payment
+                    JOIN supplier_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID
+                    JOIN supplier_invoice_detail ON SupplierInvoiceDetailSupplierInvoiceID = SupplierPaymentSupplierInvoiceID
+                        AND SupplierInvoiceDetailIsActive = 'Y'
+                    JOIN jurnal_tx ON SupplierPaymentDetailSupplierInvoiceDetailID = jurnalTxID
+                    WHERE SupplierPaymentID = ?
+                    AND SupplierPaymentDetailIsActive = 'Y'";
+                $que_datahutang = $this->db->query($sql_datahutang, [$param['orderid']]);
+                if (!$que_datahutang) {
+                    $this->db->trans_rollback();
+                    $this->sys_error_db("[Error] get data hutang item");
+                    exit;
+                }
+                $data_hutang = $que_datahutang->result_array();
+                foreach ($data_hutang as $key => $debt) {
+                    $detail_transac[] = [
+                        "coaID" => $debt['coaID'],
+                        "coaDescription" => $debt['coaDescription'],
+                        "debit" => $debt['SupplierPaymentDetailAmount'],
+                        "credit" => 0,
+                        "addoncode" => "JFA",
+                        "addonvalue" => $debt['addonvalue'],
+                        "addonitemid" => $debt['SupplierInvoiceDetailItemID']
+                    ];
+                }
            }

            # GET data bayar #
--- a/application/controllers/mockup/supplierpaymentv4/Bill.php
+++ b/application/controllers/mockup/supplierpaymentv4/Bill.php
@@ -1,20 +1,22 @@
 <?php
 class Bill extends MY_Controller
 {
-   var $db_onedev;
-   public function index()
-   {
-      echo "Bill API";
-   }
-   public function __construct()
-   {
-      parent::__construct();
-      $this->db_onedev = $this->load->database("onedev", true);
-   }
-   
-   public function add_notes($orderid){
-	   $sql = "	SELECT SupplierPaymentSupplierInvoiceID as note_order_id,
-				SupplierPaymentID as note_id, 
+    var $db_onedev;
+    public function index()
+    {
+        echo "Bill API";
+    }
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->db_onedev = $this->load->database("onedev", true);
+    }
+
+    public function add_notes($orderid)
+    {
+        $sql = "SELECT SupplierPaymentSupplierInvoiceID as note_order_id,
+				SupplierPaymentID as note_id,
 				SupplierPaymentDetailSupplierInvoiceDetailID as detail_id,
 				SupplierPaymentDate as note_date,
 				SupplierPaymentNumber as note_number,
@@ -41,27 +43,80 @@ class Bill extends MY_Controller
 				LEFT JOIN m_user a ON SupplierPaymentApprovedUserID = a.M_UserID
 				LEFT JOIN m_user b ON SupplierPaymentVerifUserID = b.M_UserID
 				WHERE
-				SupplierPaymentSupplierInvoiceID = {$orderid} 
+				SupplierPaymentSupplierInvoiceID = {$orderid}
 				AND
 			 	SupplierPaymentIsActive = 'Y'
 				GROUP BY SupplierPaymentID";
-		$query = $this->db_onedev->query($sql);
-		if ($query) {
-			$rows = $query->result_array();
-			if($rows){
-				foreach($rows as $k => $v){
-					$rows[$k]['tests'] = $this->add_tests($v['note_id']);
-				}
-			}
-			return $rows;
-			
-		} else {
-			$this->sys_error_db("get notes", $this->db_onedev);
-			exit;
-		} 
-   }
-   public function add_tagihans($orderid){
-	$sql = "SELECT SupplierInvoiceID as tagihan_id, 
+        $query = $this->db_onedev->query($sql);
+        if ($query) {
+            $rows = $query->result_array();
+            if ($rows) {
+                foreach ($rows as $k => $v) {
+                    $rows[$k]['tests'] = $this->add_tests($v['note_id']);
+                }
+            }
+            return $rows;
+        } else {
+            $this->sys_error_db("get notes", $this->db_onedev);
+            exit;
+        }
+    }
+
+    public function add_notes_downpayment($orderid)
+    {
+        $sql = "SELECT SupplierPaymentSupplierDownpaymentID AS note_order_id,
+                SupplierPaymentID AS note_id,
+                SupplierDownpaymentID AS detail_id,
+                SupplierPaymentDate AS note_date,
+                SupplierPaymentNumber AS note_number,
+                GROUP_CONCAT(DISTINCT coaDescription separator ' , ') AS paymenttypes_name,
+                SUM(SupplierDownpaymentAmount) AS note_amount,
+                n.M_UserUsername AS note_user,
+                SupplierDownpaymentIsActive 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_downpayment
+                ON SupplierDownpaymentID = SupplierPaymentSupplierDownpaymentID
+                AND SupplierDownpaymentIsActive = '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 SupplierPaymentSupplierDownpaymentID = {$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 DP 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,
@@ -85,19 +140,20 @@ class Bill extends MY_Controller
 			 SupplierInvoiceID = {$orderid}
 			 GROUP BY jurnalTxID
 			 ";
-	 $query = $this->db_onedev->query($sql);
-	 if ($query) {
-		 $rows = $query->result_array();
-		 return $rows;
-		 
-	 } else {
-		 $this->sys_error_db("get notes", $this->db_onedev);
-		 exit;
-	 } 
-}
-   public function add_tests($orderid){
-	$sql = "	SELECT SupplierPaymentSupplierInvoiceID as note_order_id,
-			 SupplierPaymentID as note_id, 
+        $query = $this->db_onedev->query($sql);
+        if ($query) {
+            $rows = $query->result_array();
+            return $rows;
+        } else {
+            $this->sys_error_db("get notes", $this->db_onedev);
+            exit;
+        }
+    }
+
+    public function add_tests($orderid)
+    {
+        $sql = "	SELECT SupplierPaymentSupplierInvoiceID as note_order_id,
+			 SupplierPaymentID as note_id,
 			 SupplierPaymentDate as note_date,
 			 SupplierPaymentNumber as note_number,
 			 GROUP_CONCAT(coaDescription separator ' , ') as paymenttypes_name,
@@ -108,150 +164,414 @@ class Bill extends MY_Controller
 			 SupplierInvoiceDetailTotal,
 			 SupplierPaymentDetailAmount
 			 FROM supplier_payment
-			 JOIN supplier_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID 
+			 JOIN supplier_payment_detail ON SupplierPaymentDetailSupplierPaymentID = SupplierPaymentID
 			 LEFT JOIN supplier_invoice_detail ON SupplierPaymentDetailSupplierInvoiceDetailID = SupplierInvoiceDetailID
 			 LEFT JOIN purchase_order ON SupplierInvoiceDetailPurchaseOrderID = PurchaseOrderID
 			 LEFT JOIN coa ON SupplierPaymentCoaID = coaID
 			 LEFT JOIN m_user ON SupplierPaymentDetailUserID = M_UserID
 			 WHERE
-			 SupplierPaymentID = {$orderid} 
+			 SupplierPaymentID = {$orderid}
 			 GROUP BY SupplierPaymentDetailID";
-	 $query = $this->db_onedev->query($sql);
-	 if ($query) {
-		 $rows = $query->result_array();
-		 if($rows){
-		 }
-		 return $rows;
-		 
-	 } else {
-		 $this->sys_error_db("get notes", $this->db_onedev);
-		 exit;
-	 } 
-}
-   public function search()
-   {
-	    //# cek token valid
-        if (! $this->isLogin) {
-        $this->sys_error("Invalid Token");
-        exit;
+        $query = $this->db_onedev->query($sql);
+        if ($query) {
+            $rows = $query->result_array();
+            if ($rows) {
+            }
+            return $rows;
+        } else {
+            $this->sys_error_db("get notes", $this->db_onedev);
+            exit;
        }
-      $prm = $this->sys_input;
-	  $supplier = $prm["supplier"];
-      $search = $prm["search"];
-      $status = $prm["status"];
-	  $startdate = $prm["startdate"];
-	  $enddate = $prm["enddate"];
-	  $regionalid = $this->sys_user['S_RegionalID'];
+    }

-	  $number_limit = 10;
-	  $number_offset = ($prm['current_page'] - 1) * $number_limit ;
+    public function search_old()
+    {
+        //# cek token valid
+        if (! $this->isLogin) {
+            $this->sys_error("Invalid Token");
+            exit;
+        }

-	  $where = "SupplierInvoiceIsActive = 'Y'
-	  AND SupplierInvoiceStatus = 'Approved'
-	  AND SupplierInvoiceGrandTotal > 0 
-	  AND IF(SupplierPaymentID IS NULL,'N','Y') = '{$status}' 
-	  AND (SupplierInvoiceNumber LIKE '%{$search}%' AND SupplierName LIKE '%{$supplier}%')
-	  AND ReceiveOrderPoS_RegionalID = {$regionalid}
-	  AND SupplierInvoiceDraftPaymentDate BETWEEN '{$startdate}' AND '{$enddate}'";
-		
-	  
-	    
+        $prm = $this->sys_input;
+        $supplier = $prm["supplier"];
+        $search = $prm["search"];
+        $status = $prm["status"];
+        $startdate = $prm["startdate"];
+        $enddate = $prm["enddate"];
+        $regionalid = $this->sys_user['S_RegionalID'];

-      $sql = "	SELECT count(*) as total
-				FROM supplier_invoice
-				JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
-				LEFT JOIN supplier_payment ON SupplierInvoiceID = SupplierPaymentSupplierInvoiceID AND SupplierPaymentIsActive = 'Y'
-				LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
-				JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
-				WHERE
-				$where 
-				";
- // echo $sql;
-		$query = $this->db_onedev->query($sql, $sql_param);
+        $number_limit = 10;
+        $number_offset = ($prm['current_page'] - 1) * $number_limit;

-		
-		$tot_count = 0;
-		$tot_page = 0;
-		if ($query) {
-			$tot_count = $query->result_array()[0]["total"];
-			$tot_page = ceil($tot_count/$number_limit);
-		} else {
-			$this->sys_error_db("supplier_invoice count", $this->db_onedev);
-			exit;
-		}    
-	  
-	  
-		$sql = 	"SELECT supplier_invoice.*,
-				SupplierName,
-				'' M_MouName,
-				0 as totalbill,
-				0 as paid,
-				0 as unpaid,
-				SupplierInvoiceIsLunas as flaglunas,
-				0 as SupplierPaymentID,
-				'' as SupplierPaymentNumber,
-				0 as SupplierPaymentAmount,			
-				'' as SupplierPaymentDate,
-				'' as SupplierInvoiceIssueRefNumber,
-				'' as notes,
-				'' as tagihans,
-				'N' as isbillterpusat,
-				DATE_FORMAT(SupplierInvoiceDraftPaymentDate,'%d-%m-%Y') as tanggalbayar,
-				DATE_FORMAT(SupplierInvoiceDraftPaymentDate,'%d%m%Y') as tanggalbayartext,
-				IF(SupplierPaymentID IS NULL,'N','Y') as status_invoice,
-				IFNULL(SupplierPaymentIsApproved,'N') as SupplierPaymentIsApproved,
-				IFNULL(SupplierPaymentIsVerif,'N') as SupplierPaymentIsVerif,
-				IFNULL(SupplierPaymentCashierNumber,'') SupplierPaymentCashierNumber
-
-				FROM supplier_invoice
-				LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
-				JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
-				JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
-				LEFT JOIN supplier_payment ON SupplierPaymentSupplierInvoiceID = SupplierInvoiceID AND SupplierPaymentIsActive = 'Y'
-				WHERE
-				$where 
-				GROUP BY SupplierInvoiceID
-				ORDER BY SupplierInvoiceID ASC
-				limit $number_limit offset $number_offset";
-		//echo $sql;
-		$query = $this->db_onedev->query($sql, $sql_param);
-		$rows = $query->result_array();
-		if($rows){
-			foreach($rows as $k => $v){
-				$s_payment = $this->db_onedev->query("SELECT GROUP_CONCAT(SupplierPaymentNumber SEPARATOR ', ') as SupplierPaymentNumber,
-				SUM(IFNULL(SupplierPaymentAmount,0)) as SupplierPaymentAmount,
-				IFNULL(SupplierPaymentID,0) SupplierPaymentID,
-				GROUP_CONCAT(DATE_FORMAT(SupplierPaymentDate,'%d-%m-%Y') SEPARATOR ', ') as SupplierPaymentDate
-				FROM supplier_payment
-				WHERE SupplierPaymentIsActive = 'Y' AND SupplierPaymentSupplierInvoiceID = {$v['SupplierInvoiceID']}")->row();
-
-				$s_jurnal = $this->db_onedev->query("SELECT SUM(jurnalTxCredit) totalbill
-				FROM supplier_invoice
-				JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
-			 	JOIN jurnal_tx ON jurnalTxJurnalID = jurnalAddOnJurnalID AND jurnalTxCredit <> 0 AND jurnalTxCoaID <> 563
-				WHERE SupplierInvoiceID = {$v['SupplierInvoiceID']}
-				GROUP BY SupplierInvoiceID")->row();
-				$amount = $s_payment->SupplierPaymentAmount ? $s_payment->SupplierPaymentAmount : "0.00";
-				$unpaid = (float)$s_jurnal->totalbill - (float)$amount;
-				$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]['totalbill'] = $s_jurnal->totalbill ? $s_jurnal->totalbill : "0.00";
-				$rows[$k]['unpaid'] = number_format($unpaid, 2, '.', '');
-
-				$rows[$k]['notes'] = $this->add_notes($v['SupplierInvoiceID']);
-				$rows[$k]['tagihans'] = $this->add_tagihans($v['SupplierInvoiceID']);
-
-			}
-		}
-	  
-
-		$result = array("total" => $tot_page, "records" => $rows, "sql"=> $this->db_onedev->last_query());
-		$this->sys_ok($result);
-		exit;
-   }
+        $where = "SupplierInvoiceIsActive = 'Y'
+    AND SupplierInvoiceStatus = 'Approved'
+    AND SupplierInvoiceGrandTotal > 0
+    AND IF(SupplierPaymentID IS NULL,'N','Y') = '{$status}'
+    AND (SupplierInvoiceNumber LIKE '%{$search}%' AND SupplierName LIKE '%{$supplier}%')
+    AND ReceiveOrderPoS_RegionalID = {$regionalid}
+    AND SupplierInvoiceDraftPaymentDate BETWEEN '{$startdate}' AND '{$enddate}'";


+
+
+        $sql = "	SELECT count(*) as total
+    	FROM supplier_invoice
+    	JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
+    	LEFT JOIN supplier_payment ON SupplierInvoiceID = SupplierPaymentSupplierInvoiceID AND SupplierPaymentIsActive = 'Y'
+    	LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
+    	JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
+    	WHERE
+    	$where
+    	";
+        // echo $sql;
+        $query = $this->db_onedev->query($sql, $sql_param);
+
+
+        $tot_count = 0;
+        $tot_page = 0;
+        if ($query) {
+            $tot_count = $query->result_array()[0]["total"];
+            $tot_page = ceil($tot_count / $number_limit);
+        } else {
+            $this->sys_error_db("supplier_invoice count", $this->db_onedev);
+            exit;
+        }
+
+
+        $sql =     "SELECT supplier_invoice.*,
+    	SupplierName,
+    	'' M_MouName,
+    	0 as totalbill,
+    	0 as paid,
+    	0 as unpaid,
+    	SupplierInvoiceIsLunas as flaglunas,
+    	0 as SupplierPaymentID,
+    	'' as SupplierPaymentNumber,
+    	0 as SupplierPaymentAmount,
+    	'' as SupplierPaymentDate,
+    	'' as SupplierInvoiceIssueRefNumber,
+    	'' as notes,
+    	'' as tagihans,
+    	'N' as isbillterpusat,
+    	DATE_FORMAT(SupplierInvoiceDraftPaymentDate,'%d-%m-%Y') as tanggalbayar,
+    	DATE_FORMAT(SupplierInvoiceDraftPaymentDate,'%d%m%Y') as tanggalbayartext,
+    	IF(SupplierPaymentID IS NULL,'N','Y') as status_invoice,
+    	IFNULL(SupplierPaymentIsApproved,'N') as SupplierPaymentIsApproved,
+    	IFNULL(SupplierPaymentIsVerif,'N') as SupplierPaymentIsVerif,
+    	IFNULL(SupplierPaymentCashierNumber,'') SupplierPaymentCashierNumber
+
+    	FROM supplier_invoice
+    	LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
+    	JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
+    	JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
+    	LEFT JOIN supplier_payment ON SupplierPaymentSupplierInvoiceID = SupplierInvoiceID AND SupplierPaymentIsActive = 'Y'
+    	WHERE
+    	$where
+    	GROUP BY SupplierInvoiceID
+    	ORDER BY SupplierInvoiceID ASC
+    	limit $number_limit offset $number_offset";
+        //echo $sql;
+        $query = $this->db_onedev->query($sql, $sql_param);
+        $rows = $query->result_array();
+        if ($rows) {
+            foreach ($rows as $k => $v) {
+                $s_payment = $this->db_onedev->query("SELECT GROUP_CONCAT(SupplierPaymentNumber SEPARATOR ', ') as SupplierPaymentNumber,
+    	SUM(IFNULL(SupplierPaymentAmount,0)) as SupplierPaymentAmount,
+    	IFNULL(SupplierPaymentID,0) SupplierPaymentID,
+    	GROUP_CONCAT(DATE_FORMAT(SupplierPaymentDate,'%d-%m-%Y') SEPARATOR ', ') as SupplierPaymentDate
+    	FROM supplier_payment
+    	WHERE SupplierPaymentIsActive = 'Y' AND SupplierPaymentSupplierInvoiceID = {$v['SupplierInvoiceID']}")->row();
+
+                $s_jurnal = $this->db_onedev->query("SELECT SUM(jurnalTxCredit) totalbill
+    	FROM supplier_invoice
+    	JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
+     	JOIN jurnal_tx ON jurnalTxJurnalID = jurnalAddOnJurnalID AND jurnalTxCredit <> 0 AND jurnalTxCoaID <> 563
+    	WHERE SupplierInvoiceID = {$v['SupplierInvoiceID']}
+    	GROUP BY SupplierInvoiceID")->row();
+                $amount = $s_payment->SupplierPaymentAmount ? $s_payment->SupplierPaymentAmount : "0.00";
+                $unpaid = (float)$s_jurnal->totalbill - (float)$amount;
+                $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]['totalbill'] = $s_jurnal->totalbill ? $s_jurnal->totalbill : "0.00";
+                $rows[$k]['unpaid'] = number_format($unpaid, 2, '.', '');
+
+                $rows[$k]['notes'] = $this->add_notes($v['SupplierInvoiceID']);
+                $rows[$k]['tagihans'] = $this->add_tagihans($v['SupplierInvoiceID']);
+            }
+        }
+
+
+        $result = array("total" => $tot_page, "records" => $rows, "sql" => $this->db_onedev->last_query());
+        $this->sys_ok($result);
+        exit;
+    }
+
+    /**
+     * search — unified invoice + downpayment list:
+     *   - Only columns the frontend actually reads (no wildcard, no dead aliases)
+     *   - UNION ALL merges supplier_invoice and supplier_downpayment
+     *   - DP rows enriched via SupplierPaymentSupplierDownpaymentID FK
+     *   - All queries use PDO parameterised placeholders
+     */
+    public function search()
+    {
+        if (! $this->isLogin) {
+            $this->sys_error("Invalid Token");
+            exit;
+        }
+
+        $prm = $this->sys_input;
+        $supplier   = $prm["supplier"];
+        $search     = $prm["search"];
+        $status     = $prm["status"];
+        $startdate  = $prm["startdate"];
+        $enddate    = $prm["enddate"];
+        $regionalid = $this->sys_user['S_RegionalID'];
+
+        $number_limit  = 10;
+        $number_offset = ((int)$prm['current_page'] - 1) * $number_limit;
+
+        // ── INVOICE WHERE ──────────────────────────────────────────
+        $inv_where = " SupplierInvoiceIsActive = 'Y'
+            AND SupplierInvoiceStatus = 'Approved'
+            AND SupplierInvoiceGrandTotal > 0
+            AND SupplierInvoiceIsInstallment = 'N'
+            AND IF(SupplierPaymentID IS NULL,'N','Y') = ?
+            AND SupplierInvoiceNumber LIKE ?
+            AND SupplierName LIKE ?
+            AND ReceiveOrderPoS_RegionalID = ?
+            AND SupplierInvoiceDraftPaymentDate BETWEEN ? AND ? ";
+
+        $inv_params = [
+            $status,
+            '%' . $search . '%',
+            '%' . $supplier . '%',
+            $regionalid,
+            $startdate,
+            $enddate,
+        ];
+
+        // ── DOWNPAYMENT WHERE ──────────────────────────────────────
+        $dp_where = " SupplierDownpaymentIsActive = 'Y'
+            AND IF(SupplierDownpaymentStatus = 'Paid','Y','N') = ?
+            AND PurchaseOrderNumber LIKE ?
+            AND SupplierName LIKE ?
+            AND PurchaseOrderS_RegionalID = ?
+            AND SupplierDownpaymentDueDate BETWEEN ? AND ? ";
+
+        $dp_params = [
+            $status,
+            '%' . $search . '%',
+            '%' . $supplier . '%',
+            $regionalid,
+            $startdate,
+            $enddate,
+        ];
+
+        // ── COUNT query — UNION of both sources ────────────────────
+        $sql_count = "SELECT SUM(cnt) as total FROM (
+            SELECT count(*) as cnt
+            FROM supplier_invoice
+            JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
+            LEFT JOIN supplier_payment
+                ON SupplierInvoiceID = SupplierPaymentSupplierInvoiceID
+                AND SupplierPaymentIsActive = 'Y'
+            LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
+            JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
+            WHERE $inv_where
+
+            UNION ALL
+
+            SELECT count(*) as cnt
+            FROM supplier_downpayment
+            JOIN purchase_order ON PurchaseOrderID = SupplierDownpaymentPurchasOrderID
+            JOIN supplier ON SupplierID = SupplierDownpaymentSupplierID
+            WHERE $dp_where
+        ) AS combined";
+
+        $count_params = array_merge($inv_params, $dp_params);
+        $query = $this->db_onedev->query($sql_count, $count_params);
+
+        $tot_count = 0;
+        $tot_page  = 0;
+        if ($query) {
+            $tot_count = $query->result_array()[0]["total"];
+            $tot_page  = ceil($tot_count / $number_limit);
+        } else {
+            $this->sys_error_db("payment instructions count", $this->db_onedev);
+            exit;
+        }
+
+        // ── DATA query — UNION with identical columns ──────────────
+        $sql_data = "
+            SELECT * FROM (
+                SELECT
+                    SupplierInvoiceID,
+                    SupplierInvoiceNumber,
+                    SupplierInvoiceDraftPaymentDate,
+                    SupplierInvoiceIsLunas                    as flaglunas,
+                    SupplierName,
+                    DATE_FORMAT(SupplierInvoiceDraftPaymentDate,'%d-%m-%Y') as tanggalbayar,
+                    IFNULL(SupplierPaymentIsApproved,'N')    as SupplierPaymentIsApproved,
+                    IFNULL(SupplierPaymentCashierNumber,'')   as SupplierPaymentCashierNumber,
+                    0                                         as totalbill,
+                    0                                         as paid,
+                    0                                         as unpaid,
+                    0                                         as SupplierPaymentID,
+                    ''                                        as SupplierPaymentNumber,
+                    0                                         as SupplierPaymentAmount,
+                    ''                                        as SupplierPaymentDate,
+                    ''                                        as notes,
+                    ''                                        as tagihans,
+                    'INVOICE'                                 as type
+                FROM supplier_invoice
+                LEFT JOIN supplier ON SupplierInvoiceSupplierID = SupplierID
+                JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
+                JOIN receive_order_po ON SupplierInvoiceReceiveOrderPoID = ReceiveOrderPoID
+                LEFT JOIN supplier_payment
+                    ON SupplierPaymentSupplierInvoiceID = SupplierInvoiceID
+                    AND SupplierPaymentIsActive = 'Y'
+                WHERE $inv_where
+                GROUP BY SupplierInvoiceID
+
+                UNION ALL
+
+                SELECT
+                    SupplierDownpaymentID * -1                    as SupplierInvoiceID,
+                    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,
+                    SupplierDownpaymentAmount                     as totalbill,
+                    CASE WHEN SupplierDownpaymentStatus = 'Paid'
+                         THEN SupplierDownpaymentAmount
+                         ELSE 0 END                               as paid,
+                    CASE WHEN SupplierDownpaymentStatus = 'Paid'
+                         THEN 0
+                         ELSE SupplierDownpaymentAmount END       as unpaid,
+                    0                                             as SupplierPaymentID,
+                    ''                                            as SupplierPaymentNumber,
+                    0                                             as SupplierPaymentAmount,
+                    ''                                            as SupplierPaymentDate,
+                    ''                                            as notes,
+                    ''                                            as tagihans,
+                    'DP'                                          as type
+                FROM supplier_downpayment
+                JOIN purchase_order ON PurchaseOrderID = SupplierDownpaymentPurchasOrderID
+                JOIN supplier ON SupplierID = SupplierDownpaymentSupplierID
+                WHERE $dp_where
+            ) AS combined
+            ORDER BY SupplierInvoiceID ASC
+            LIMIT ? OFFSET ?";
+
+        $data_params = array_merge($inv_params, $dp_params, [$number_limit, $number_offset]);
+        $query = $this->db_onedev->query($sql_data, $data_params);
+        $rows  = $query->result_array();
+
+        // ── ENRICH — per-row sub-queries ───────────────────────────
+        if ($rows) {
+            foreach ($rows as $k => $v) {
+
+                // ── Downpayment branch ──────────────────────────
+                if ($v['type'] === 'DP') {
+                    $dp_id = abs($v['SupplierInvoiceID']);
+
+                    $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 SupplierPaymentSupplierDownpaymentID = ?",
+                        [$dp_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_downpayment($dp_id);
+                    $rows[$k]['tagihans']              = [];
+                    // totalbill, unpaid already correct from UNION CASE
+                    continue;
+                }
+
+                // ── Invoice branch ───────────────────────────────
+                $inv_id = $v['SupplierInvoiceID'];
+
+                $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 SupplierPaymentSupplierInvoiceID = ?",
+                    [$inv_id]
+                )->row();
+
+                $s_jurnal = $this->db_onedev->query("
+                    SELECT SUM(jurnalTxCredit) totalbill
+                    FROM supplier_invoice
+                    JOIN jurnal_addon ON jurnalAddOnValue = SupplierInvoiceNumber
+                    JOIN jurnal_tx
+                        ON jurnalTxJurnalID = jurnalAddOnJurnalID
+                        AND jurnalTxCredit <> 0
+                        AND jurnalTxCoaID <> 563
+                    WHERE SupplierInvoiceID = ?
+                    GROUP BY SupplierInvoiceID",
+                    [$inv_id]
+                )->row();
+
+                $amount = $s_payment->SupplierPaymentAmount
+                    ? $s_payment->SupplierPaymentAmount
+                    : "0.00";
+                $unpaid = (float)$s_jurnal->totalbill - (float)$amount;
+
+                $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]['totalbill']             = $s_jurnal->totalbill
+                    ? $s_jurnal->totalbill
+                    : "0.00";
+                $rows[$k]['unpaid']                = number_format($unpaid, 2, '.', '');
+
+                $rows[$k]['notes']    = $this->add_notes($inv_id);
+                $rows[$k]['tagihans'] = $this->add_tagihans($inv_id);
+            }
+        }
+
+        $result = array("total" => $tot_page, "records" => $rows);
+        $this->sys_ok($result);
+        exit;
+    }
 }
--- a/application/controllers/mockup/supplierpaymentv4/Payment.php
+++ b/application/controllers/mockup/supplierpaymentv4/Payment.php
Author	SHA1	Message	Date
sasadib	64f434cd78	feature: po pay downpayment	2026-07-20 13:13:59 +07:00
Hanan Askarim	61e2e4f2ec	add keterangan untuk http pi instalment	2026-07-15 10:48:53 +07:00
Hanan Askarim	79fd2864cc	update penomoran dari fn fungsi	2026-07-15 10:48:53 +07:00
Hanan Askarim	344c5d42e6	fix http pembayaran	2026-07-15 10:48:53 +07:00
Hanan Askarim	f30c6dbb60	add supplier invoice number	2026-07-15 10:48:53 +07:00
Hanan Askarim	2d072fad16	gabungkan fungsi get data dengan create jurnal	2026-07-15 10:48:53 +07:00
Hanan Askarim	aef86b7acf	add pengambilan co dari fa_class	2026-07-15 10:48:53 +07:00
Hanan Askarim	efdf8af569	add pembuatan jurnal pi cicilan order asset	2026-07-15 10:48:53 +07:00
Hanan Askarim	712cbbb80b	fix query get cicilan dan insert supplier invoice	2026-07-15 10:48:53 +07:00
Hanan Askarim	977694905c	add generate po contract	2026-07-15 10:48:53 +07:00
sasadib	ee3748066e	feature: receive item order asset & insert jurnal faktur asset	2026-07-15 10:43:56 +07:00
sasadib	709dfdae33	update: api purchase order asset & receive order asset	2026-07-13 09:08:43 +07:00
sasadib	e62ec1d994	feature: file receiveItemAset & change some query purchaseorderasest	2026-07-10 15:49:00 +07:00
bintanghr	34fb944e6e	add: inventaris item coa mapping API	2026-07-10 08:30:36 +07:00
bintanghr	17445d9534	add: inventaris coa mapping API	2026-07-10 08:30:36 +07:00
sasadib	17423ac0b5	change table asset attachment into contract_asset_attachment	2026-07-10 08:30:12 +07:00