From dbe03ffc0500bd6a72120da07ddf6bc071f69b1e Mon Sep 17 00:00:00 2001
From: "sas.fajri" <sas.fajri@gmail.com>
Date: Sun, 24 May 2026 17:26:02 +0700
Subject: [PATCH] Fix close v2 search

---
 .../mockup/closecashier/Close_v2.php          | 49 +++----------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/application/controllers/mockup/closecashier/Close_v2.php b/application/controllers/mockup/closecashier/Close_v2.php
index c2b33355..bf31850e 100644
--- a/application/controllers/mockup/closecashier/Close_v2.php
+++ b/application/controllers/mockup/closecashier/Close_v2.php
@@ -74,54 +74,19 @@ class Close_v2 extends MY_Controller
          ORDER BY F_PaymentKasirID asc
 				limit $number_limit offset $number_offset";
       //echo $sql;
-      $query = $this->db_onedev->query($sql, $sql_param);
-      $rows = $query->result_array();
+      $query = $this->db_onedev->query($sql, $sql_param);
+      if (!$query) {
+         $this->sys_error_db("f_payment_kasir rows", $this->db_onedev);
+         exit;
+      }
+      $rows = $query->result_array();
       if ($rows) {
          foreach ($rows as $k => $v) {
             $rows[$k]['notes'] = $this->add_notes($v['F_PaymentKasirID']);
          }
       }
 
-      $sql_klinik = "	SELECT count(*) as total
-      FROM one_klinik.f_payment_kasir WHERE
-      $where ( ('{$status}' = 'N' AND (F_PaymentKasirIsReceived = 'N' )) OR ('{$status}' = 'Y' AND F_PaymentKasirIsReceived = 'Y') )";
-      $query_klinik = $this->db_onedev->query($sql_klinik);
-
-      $tot_count_klinik = 0;
-      if ($query_klinik) {
-         $tot_count_klinik = $query->result_array()[0]["total"];
-         $tot_page = ceil(($tot_count + $tot_count_klinik) / $number_limit);
-      }
-
-      $sql_klinik = "SELECT F_PaymentKasirID	,
-      F_PaymentKasirNumber	,
-      'KLINIK' AS Status,
-      date_format(F_PaymentKasirDate,'%d-%m-%Y %T') as  F_PaymentKasirDate	,
-      F_PaymentKasirCreated	,
-      F_PaymentKasirLastUpdated	,M_StaffName,`fn_getstaffname`(F_PaymentKasirReceivedUserID) as StaffKasir,
-      if(F_PaymentKasirIsReceived = 'N','Belum Diterima' ,'Sudah diterima') as F_PaymentKasirIsReceived	,
-      F_PaymentKasirIsActive
-
-      FROM one_klinik.f_payment_kasir
-      JOIN m_user on F_PaymentKasirUserID = M_UserID
-      join m_staff on M_UserM_StaffID = M_StaffID
-      WHERE
-      $where
-      ( ('{$status}' = 'N' AND (F_PaymentKasirIsReceived = 'N' )) OR ('{$status}' = 'Y' AND F_PaymentKasirIsReceived = 'Y') )
-
-      ORDER BY F_PaymentKasirID asc
-      limit $number_limit offset $number_offset";
-      $query_klinik = $this->db_onedev->query($sql_klinik);
-      $rows_klinik = $query_klinik->result_array();
-      if ($rows_klinik) {
-         foreach ($rows_klinik as $k => $v) {
-            $rows_klinik[$k]['notes'] = $this->add_notes($v['F_PaymentKasirID']);
-         }
-         $rows = array_merge($rows, $rows_klinik);
-      }
-
-
-      $result = array("total" => $tot_page, "records" => $rows, "sql" => $this->db_onedev->last_query());
+      $result = array("total" => $tot_page, "records" => $rows, "sql" => $this->db_onedev->last_query());
       $this->sys_ok($result);
       exit;
    }