diff --git a/.env.example b/.env.example index f97cdc50..a9c25572 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,7 @@ APP_KEY= APP_DEBUG=true APP_URL=http://localhost API_URL=https://api_arrahn.test/lelong/ +API_URL_KAUNTER=http://kaunter.test/lelong/ API_VERIFY = false LOG_CHANNEL=stack diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 4aa01c2c..a10447ea 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -870,7 +870,7 @@ class MarhunController extends Controller ->whereNull('disahkan_oleh') ->whereNull('disahkan_pada') ->where('pengesahan.lelong_id', $id) - ->whereIn('status_ubah', [1,2,3,4,5,7,8]) + ->whereIn('status_ubah', [1,2,3,4,5,7,8,9,10]) ->selectRaw('count(*) as total, sum(status) as tstat,pengesahan.norujukan') ->groupBy('pengesahan.norujukan') ->get() @@ -1729,16 +1729,16 @@ class MarhunController extends Controller ->get(); //get staf cwgn roles harian - $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'penilai' ])->json(); - $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'khazanah' ])->json(); - $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'pc' ])->json(); // dd($roles_harian_penilai); @@ -1772,16 +1772,16 @@ class MarhunController extends Controller ->orderBy('id', 'desc') ->get(); - $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'penilai' ])->json(); - $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'khazanah' ])->json(); - $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'pc' ])->json(); diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index ba45ee34..a5e2a47e 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -325,7 +325,7 @@ class SerahanController extends Controller ->get(); // dd($invois); - $khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'khazanah' ])->json(); // dd($roles_harian_khazanah); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index e978f95a..3e417b83 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -614,15 +614,15 @@ class TangguhLelongController extends Controller } //get staf cwgn roles harian - $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'penilai' ])->json(); - $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'khazanah' ])->json(); - $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ 'role_harian' => 'pc' ])->json();