diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 6eb13d0..c82629a 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -770,21 +770,21 @@ class KhazanahController extends Controller $request->merge(['kodlaluan' => $auth_user['name']]); $data_request = $request->except('_token'); - dd($data_request); - $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/createpanjar/'. $auth_user['cawangan'],$data_request)->json(); + $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/deletepanjar/'. $auth_user['cawangan'],$data_request)->json(); + if($updatepanjar['result'] == 'success') { - if($denopanjar['jenis'] === 'perubatan') + if($updatepanjar['jenis'] === 'perubatan') { - $listUser = User::where('name','=',$senaraipanjar['tuntutoleh'])->get(); + $listUser = User::where('name','=',$updatepanjar['tuntutoleh'])->get(); - $totalsebenar = floatval($listUser[0]->perubatan) + floatval($denopanjar['serahan']); + // $totalsebenar = floatval($listUser[0]->perubatan) + floatval($denopanjar['serahan']); $overrideuser = User::where('cawangan','=',$auth_user['cawangan']) - ->where('name','=',$senaraipanjar['tuntutoleh']) + ->where('name','=',$updatepanjar['tuntutoleh']) ->update(array( - 'perubatan' => $bakiperubatan + 'perubatan' => $updatepanjar['bakiperubatan'] )); } diff --git a/app/Http/Controllers/PerubatanController.php b/app/Http/Controllers/PerubatanController.php new file mode 100644 index 0000000..3c896f0 --- /dev/null +++ b/app/Http/Controllers/PerubatanController.php @@ -0,0 +1,27 @@ +middleware('auth'); + } + + public function index(){ + $api_url = config('api.url'); + $auth_user = Auth::user(); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $paginate = User::paginate(5); + + return view('operasi.perubatan.index',compact('cawangan_info','api_url','auth_user','paginate')); + + } +} diff --git a/database/migrations/2024_11_06_000000_add_users_perubatanasal_table.php b/database/migrations/2024_11_06_000000_add_users_perubatanasal_table.php new file mode 100644 index 0000000..2dc1c89 --- /dev/null +++ b/database/migrations/2024_11_06_000000_add_users_perubatanasal_table.php @@ -0,0 +1,35 @@ +decimal('perubatan_asal', 11, 2); + } + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + // public function down() + // { + // Schema::dropIfExists('users'); + // } +} diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php index a4135e9..a86275b 100644 --- a/resources/views/homepage/operasi/home.blade.php +++ b/resources/views/homepage/operasi/home.blade.php @@ -18,6 +18,7 @@ Kakitangan Parameter Komoditi + Perubatan diff --git a/resources/views/operasi/perubatan/index.blade.php b/resources/views/operasi/perubatan/index.blade.php new file mode 100644 index 0000000..d8459f5 --- /dev/null +++ b/resources/views/operasi/perubatan/index.blade.php @@ -0,0 +1,34 @@ +@extends('layouts.app_operasi') + +@section('content') +
+
+
+
+ + + +
+ @foreach($paginate as $page) +
+

{{ $page->name }}

+

{{ $page->perubatan }}

+

{{ $page->perubatan_asal }}

+
+ @endforeach + + + +
+
+
+
+
+@endsection diff --git a/routes/web.php b/routes/web.php index 9a312fc..5d56b03 100644 --- a/routes/web.php +++ b/routes/web.php @@ -475,4 +475,7 @@ Route::get('supports/driver/mykad-reader/download',['as'=>'mykadreader.driver.do Route::get('/event/tellercash',['as'=>'event.tellercash','uses'=>'EventTriggerController@TellerCash'])->middleware('auth'); +/* Perubatan */ +Route::get('/perubatan',['as'=>'perubatan','uses'=>'PerubatanController@index'])->middleware('auth','operasi'); +