feature: file receiveItemAset & change some query purchaseorderasest

application/controllers/mockup/purchase/order/PurchaseOrderAset.php

@@ -81,16 +81,13 @@ class PurchaseOrderAset extends MY_Controller {
             }
 
             $limit = 10;
-            $offset = 0;
-            if ($para['currpage'] > 0) {
-                $offset = ($para['currpage'] - 1) * $limit;
-            }
 
             $sql = "SELECT
                     PurchaseRequestID,
                     PurchaseRequestNumber,
                     PurchaseRequestDetailID,
                     PurchaseRequestFlagID,
+                    M_BranchID,
                     PurchaseRequestFlagM_BranchCode AS BranchCode,
                     PurchaseRequestItemCategoryID AS ItemCategoryID,
                     PurchaseRequestFlagQtyRest - PurchaseRequestFlagQtyProses AS UnprocessFlagQty,
@@ -102,24 +99,26 @@ class PurchaseOrderAset extends MY_Controller {
                     M_ItemDesc,
                     ItemUnitID,
                     ItemUnitName,
-                SupplierPricePrice as SupplierPrice
+                    SupplierPricePrice as SupplierPrice,
+                    M_UserUsername AS Requestedby
                 FROM purchase_request
                 JOIN purchase_request_detail ON PurchaseRequestDetailPurchaseRequestID = PurchaseRequestID
                     AND PurchaseRequestDetailIsActive = 'Y'
-                AND PurchaseRequestM_BranchCode = ?
                     AND PurchaseRequestItemCategoryID = '3' -- id category item asset
-                AND PurchaseRequestNumber LIKE ?
+                JOIN m_item ON M_ItemID = PurchaseRequestDetailM_ItemID
+                    AND (PurchaseRequestNumber LIKE ? OR M_ItemDesc LIKE ?)
                 JOIN purchase_request_flag ON PurchaseRequestFlagPurchaseRequestDetailID = PurchaseRequestDetailID
                     AND PurchaseRequestFlagStatus = 'PO'
                     AND PurchaseRequestFlagIsActive = 'Y'
-            JOIN m_item ON M_ItemID = PurchaseRequestDetailM_ItemID
+                JOIN m_branch ON M_BranchCode = PurchaseRequestFlagM_BranchCode
+                    AND M_BranchID = ?
+                    AND M_BranchIsActive = 'Y'
                 JOIN itemunit ON ItemUnitID = PurchaseRequestDetailItemUnitID
                 JOIN supplier_price ON SupplierPriceSupplierID = ?
                     AND SupplierPriceM_ItemID = M_ItemID
                     AND SupplierPriceItemUnitID = ItemUnitID
                     AND SupplierPriceIsActive = 'Y'
-            JOIN m_branch ON M_BranchCode = PurchaseRequestFlagM_BranchCode
+                JOIN m_user ON M_UserID = PurchaseRequestRequestedBy
-                AND M_BranchIsActive = 'Y'
                 WHERE NOT EXISTS (
                     SELECT 1
                     FROM purchase_order_detail
@@ -130,10 +129,10 @@ class PurchaseOrderAset extends MY_Controller {
                     WHERE PurchaseOrderDetailPurchaseRequestDetailID = PurchaseRequestDetailID
                 )";
 
-            $sql_data = $sql . " LIMIT ? OFFSET ? ";
+            $sql_data = $sql . " LIMIT ? ";
             $que_data = $this->db->query($sql_data, [
-                $para['branchcode'], $keyword, $para['supplierID'],
+                $keyword, $keyword, $para['branchID'], $para['supplierID'],
-                $limit, $offset
+                $limit
             ]);
             if (!$que_data) {
                 $this->sys_error_db("[Error] get daftar request data");
@@ -143,7 +142,7 @@ class PurchaseOrderAset extends MY_Controller {
 
             $sql_total = "SELECT COUNT(*) AS total FROM ($sql) AS x";
             $que_total = $this->db->query($sql_total, [
-                $para['branchcode'], $keyword, $para['supplierID']
+                $keyword, $keyword, $para['branchID'], $para['supplierID']
             ]);
             if (!$que_total) {
                 $this->sys_error_db("[Error] get total request aset");
@@ -459,6 +458,28 @@ class PurchaseOrderAset extends MY_Controller {
         }
     }
 
+    public function getUserApproveLevel() {
+        try {
+            if (!$this->isLogin) {
+                $this->sys_error("invalid token");
+                exit;
+            }
+
+            $user = $this->sys_user;
+            $sql = "SELECT M_UserM_ApproveLevelID FROM m_user
+            WHERE M_UserIsActive = 'Y' AND M_UserID = ? ";
+            $que = $this->db->query($sql, [$user['M_UserID']]);
+            if (!$que) {
+                $this->sys_error_db("[Error] failed get approval level user");
+                exit;
+            }
+            $data = $que->row_array();
+            $this->sys_ok($data);
+        } catch (Exception $exc) {
+            $this->sys_error($exc->getMessage());
+        }
+    }
+
     ## MUTATIONS ##
     public function createPoAsset() {
         try {
@@ -1027,7 +1048,6 @@ class PurchaseOrderAset extends MY_Controller {
         }
     }
 
-    // upload file
     public function uploadAttachment() {
         try {
             if (!$this->isLogin) {
@@ -1166,28 +1186,6 @@ class PurchaseOrderAset extends MY_Controller {
         }
     }
 
-    public function getUserApproveLevel() {
-        try {
-            if (!$this->isLogin) {
-                $this->sys_error("invalid token");
-                exit;
-            }
-
-            $user = $this->sys_user;
-            $sql = "SELECT M_UserM_ApproveLevelID FROM m_user
-            WHERE M_UserIsActive = 'Y' AND M_UserID = ? ";
-            $que = $this->db->query($sql, [$user['M_UserID']]);
-            if (!$que) {
-                $this->sys_error_db("[Error] failed get approval level user");
-                exit;
-            }
-            $data = $que->row_array();
-            $this->sys_ok($data);
-        } catch (Exception $exc) {
-            $this->sys_error($exc->getMessage());
-        }
-    }
-
     private function insertLog($poID, $type, $prm, $dataBefore, $dataAfter, $userID, $desc = '') {
         $sql = "INSERT INTO acc_one_log.purchase_order_log (
             PurchaseOrderLogPurchaseOrderID,