mikael-zakaria/crm-summit
1
0
Fork 0
forked from mahdahar/crm-summit
Code Pull Requests Activity

Update Zones Api Perbaikan hanya get cities pakai Params zoneid saja

Browse Source
This commit is contained in:
mikael-zakaria 2025-10-22 10:23:46 +07:00
parent f4961f862e
commit 34449ec836
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Controllers/Api/ZonesApi.php
View File

@ -15,12 +15,12 @@ class ZonesApi extends BaseController {
}
public function getProvinces() {
$filters = [
'zoneid' => $this->request->getVar('zoneid') ?? null,
'zonename' => $this->request->getVar('zonename') ?? null
];
// $filters = [
// 'zoneid' => $this->request->getVar('zoneid') ?? null,
// 'zonename' => $this->request->getVar('zonename') ?? null
// ];
$rows = $this->model->getAllProvinces($filters);
$rows = $this->model->getAllProvinces();
if (empty($rows)) { return $this->respond([ 'status' => 'success', 'message' => "data not found", 'data' => [] ], 200); }
return $this->respond([ 'status' => 'success', 'message'=> "Data fetched successfully", 'data' => $rows ], 200);
@ -28,12 +28,11 @@ class ZonesApi extends BaseController {
public function getCities() {
$filters = [
'zoneid' => $this->request->getVar('zoneid') ?? null,
'zonename' => $this->request->getVar('zonename') ?? null
$filter = [
'zoneid' => $this->request->getVar('zoneid') ?? null
];
$rows = $this->model->getAllCities($filters);
$rows = $this->model->getAllCities($filter);
if (empty($rows)) { return $this->respond([ 'status' => 'success', 'message' => "data not found", 'data' => [] ], 200); }
return $this->respond([ 'status' => 'success', 'message'=> "Data fetched successfully", 'data' => $rows ], 200);

23
app/Models/ZonesModel.php
View File

@ -8,27 +8,24 @@ class ZonesModel extends Model {
protected $primaryKey = 'zoneid';
protected $allowedFields = [ 'zonecode', 'zoneclass', 'parentzoneid', 'zonename' ];
public function getAllProvinces($filters = []) {
public function getAllProvinces() {
$this->select('zoneid, zonename')->where('parentzoneid IS NULL', null, false);
if (!empty($filters['zoneid'])) {
$this->where('zoneid', $filters['zoneid']);
}
if (!empty($filters['zonename'])) {
$this->like('zonename', $filters['zonename'], 'both');
}
// if (!empty($filters['zoneid'])) {
// $this->where('zoneid', $filters['zoneid']);
// }
// if (!empty($filters['zonename'])) {
// $this->like('zonename', $filters['zonename'], 'both');
// }
return $this->findAll();
}
public function getAllCities($filters = []) {
public function getAllCities($filter = []) {
$rows = $this->select('zoneid, zonename')->where('parentzoneid IS NOT NULL', null, false);
if (!empty($filters['zoneid'])) {
$this->where('zoneid', $filters['zoneid']);
}
if (!empty($filters['zonename'])) {
$this->like('zonename', $filters['zonename'], 'both');
if (!empty($filter['zoneid'])) {
$this->where('parentzoneid', $filter['zoneid']);
}
return $this->findAll();