KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'new-super' into afiqhamzah-feat-mykad-reader-registration

Browse Source
This commit is contained in:
afiq.hamzah
2022-11-14 11:20:28 +08:00
parent 4c38a77ad9 7e748b5811
commit 21e76ca8b4
5 changed files with 31 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+20
View File
@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use App\Dashboard;
use App\User;
class LoginController extends Controller
{
@@ -149,4 +150,23 @@ class LoginController extends Controller
Session::flush();
return Redirect::to('/');
}
public function GetRolesHarian(Request $request, $kodcaw){
if($request->role_harian == 'teller'){
$kakitangan = User::where([['role_harian','teller'],['cawangan',$kodcaw]])->get();
}else if($request->role_harian == 'khazanah'){
$kakitangan = User::where([['role_harian','khazanah'],['cawangan',$kodcaw]])->get();
}else if($request->role_harian == 'pc'){
$kakitangan = User::where([['role_harian','pc'],['cawangan',$kodcaw]])->get();
}else if($request->role_harian == 'penilai'){
$kakitangan = User::where([['role_harian','penilai'],['cawangan',$kodcaw]])->get();
}else if($request->role_harian == 'ppc'){
$kakitangan = User::where([['role_harian','ppc'],['cawangan',$kodcaw]])->get();
}else{
$kakitangan = User::all();
}
return response()->json($kakitangan,200);
}
}
app/Http/Controllers/LelongController.php
+6 -58
View File
@@ -69,64 +69,15 @@ class LelongController extends Controller
}
// public function transaksituntutbaki(Request $request){
// $auth_user = Auth::user();
// $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
// 'batchno' => $request->batchno,
// 'jenis' => $request->jenis,
// 'norujukan' => $request->norujukan,
// 'teller' => $request->teller,
// 'bakipjm' => $request->bakipjm,
// 'bakiupah' => $request->bakiupah,
// 'cajlain' => $request->cajlain,
// 'cajlelong' => $request->cajlelong,
// 'jumlah' => $request->jumlah,
// 'nowakil' => $request->nowakil,
// 'hargajual' => $request->hargajual
// ])->json();
// $updatetuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan);
// $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
// $keluar = $getTunai2['keluar'];
// $baki = $getTunai2['baki'];
// $masuk = $getTunai2['masuk'];
// $bakiawal = $getTunai2['bakiawal'];
// $pendahuluan = $getTunai2['tambah'];
// $serahan = $getTunai2['kurang'];
// $bakiakhir = $baki;
// if($request->jenis == 'T'){
// $bakiakhir -= $request->jumlah;
// }
// else
// {
// $bakiakhir += -($request->jumlah);
// }
// //masuk dalam tunai aliran
// $updateTunai=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
// 'kodlaluan' => $request->teller,
// 'keluar' => $keluar,
// 'masuk' => $masuk,
// 'bakiakhir' => $bakiakhir
// ]);
// if($updatetuntutbaki)
// {
// return response('Berjaya');
// }else{
// return response('Gagal');
// }
// }
public function transaksituntutbaki(Request $request){
$auth_user = Auth::user();
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $request->norujukan)->json();
if($lelong)
{
return response('Berjaya');
}
$tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
'batchno' => $request->batchno,
@@ -149,9 +100,6 @@ class LelongController extends Controller
$keluar = $getTunai2['keluar'];
$baki = $getTunai2['baki'];
$masuk = $getTunai2['masuk'];
$bakiawal = $getTunai2['bakiawal'];
$pendahuluan = $getTunai2['tambah'];
$serahan = $getTunai2['kurang'];
$bakiakhir = $baki;