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

fix kelulusan

Browse Source
This commit is contained in:
hafifierahman
2021-01-17 08:47:05 +08:00
parent fb6d301884
commit 8f7ce44ee9
11 changed files with 340 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+4 -3
View File
@@ -413,7 +413,7 @@ class GadaianController extends Controller
$wakil = [];
}
return view('print.resittebussebelum',compact('gadai','customers_info','penebusan','wakil','totaltransaction'));
return view('print.resittebussebelum',compact('gadai','customers_info','penebusan','wakil'));
}
public function history(Request $request)
@@ -425,6 +425,7 @@ class GadaianController extends Controller
if(sizeof($gadai) > 0)
$history = $gadai[0][0]['historygadaian'];
$count = 0;
$arrayhist = [];
@@ -436,7 +437,7 @@ class GadaianController extends Controller
"norujukan" => $history
])->json();
array_push($arrayhist,["norujukan" => $history,"jenistebus" => $tebus[0]['jenistebus'],"jbg" => $tebus[0]['jbg'],"t_tebus" => $tebus[0]['t_tebus']]);
array_push($arrayhist,["norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
if(sizeof($gadai) > 0)
$history = $gadai[0][0]['historygadaian'];
@@ -504,7 +505,7 @@ class GadaianController extends Controller
'teller' => $auth_user['name']
])->json();
event(new StatusLiked('Penghantaran kepada Khazanah!'));
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
return response()->json($createlulus,201);
}
app/Http/Controllers/KhazanahController.php
+51 -36
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
//Events
use App\Events\StatusLiked;
use App\Events\NotifikasiPembayaran;
use App\Events\OperasiNotice;
use App\User;
@@ -80,7 +81,7 @@ class KhazanahController extends Controller
//Peti Besi Cawangan
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$getVault = $getVault[0]['BakiAwal'];
$getVault = $getVault[0]['bakiawal'];
//Marhun Terkumpul
$marhun = Http::get(config('api.url'). '/api/marhunterkumpul/laporan/'. $auth_user['cawangan'] .'/'. $harini->toDateString())->json();
@@ -274,6 +275,7 @@ class KhazanahController extends Controller
$api_url = config('api.url');
$norujukan = $request->norujukan;
$pelulus = $request->pelulus;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
@@ -286,7 +288,20 @@ class KhazanahController extends Controller
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
if($pelulus == 'khazanah')
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "khazanah"
])->json();
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi"
])->json();
event(new OperasiNotice($auth_user['cawangan'],$auth_user['name']));
}
}
@@ -318,7 +333,7 @@ class KhazanahController extends Controller
// 'teller' => $request->teller
])->json();
event(new StatusLiked('Penghantaran kepada Khazanah!'));
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
return response()->json($createlulus,201);
}
@@ -466,12 +481,12 @@ class KhazanahController extends Controller
$rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100'];
//wang Syilling Initialize
$rekodsen1 = $denominasilist[0]['txtSen1']; $rekodsen5 = $denominasilist[0]['txtSen5']; $rekodsen10 = $denominasilist[0]['txtSen10'];
$rekodsen20 = $denominasilist[0]['txtSen20']; $rekodsen50 = $denominasilist[0]['txtSen50'];
$rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10'];
$rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50'];
//Wang Ringgit Initialize
$rekodring1 = $denominasilist[0]['txtRing1']; $rekodring5 = $denominasilist[0]['txtRing5']; $rekodring10 = $denominasilist[0]['txtRing10'];
$rekodring20 = $denominasilist[0]['txtRing20']; $rekodring50 = $denominasilist[0]['txtRing50']; $rekodring100 = $denominasilist[0]['txtRing100'];
$rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10'];
$rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100'];
//Tolok Rekod
$rekodb1 -= intval($request->ambilanb1);
@@ -503,20 +518,20 @@ class KhazanahController extends Controller
'bd20'=> $rekodb20,
'bd50'=> $rekodb50,
'bd100'=> $rekodb100,
'txtRing1'=> $rekodring1,
'txtRing5'=> $rekodring5,
'txtSen1'=> $rekodsen1,
'txtSen5'=> $rekodsen5,
'txtSen10'=> $rekodsen10,
'txtSen20'=> $rekodsen20,
'txtSen50'=> $rekodsen50,
'txtRing10'=> $rekodring10,
'txtRing20'=> $rekodring20,
'txtRing50'=> $rekodring50,
'txtRing100'=> $rekodring100,
'txtRing1000'=> "0",
'txtring1'=> $rekodring1,
'txtring5'=> $rekodring5,
'txtsen1'=> $rekodsen1,
'txtsen5'=> $rekodsen5,
'txtsen10'=> $rekodsen10,
'txtsen20'=> $rekodsen20,
'txtsen50'=> $rekodsen50,
'txtring10'=> $rekodring10,
'txtring20'=> $rekodring20,
'txtring50'=> $rekodring50,
'txtring100'=> $rekodring100,
'txtring1000'=> "0",
'jumlahbundle'=> "0",
'txtJumlah'=> "0",
'txtjumlah'=> "0",
'jumlahkeping' => "0"
]);
@@ -579,20 +594,20 @@ class KhazanahController extends Controller
'bd20'=> $rekodb20,
'bd50'=> $rekodb50,
'bd100'=> $rekodb100,
'txtRing1'=> $rekodring1,
'txtRing5'=> $rekodring5,
'txtSen1'=> $rekodsen1,
'txtSen5'=> $rekodsen5,
'txtSen10'=> $rekodsen10,
'txtSen20'=> $rekodsen20,
'txtSen50'=> $rekodsen50,
'txtRing10'=> $rekodring10,
'txtRing20'=> $rekodring20,
'txtRing50'=> $rekodring50,
'txtRing100'=> $rekodring100,
'txtRing1000'=> "0",
'txtring1'=> $rekodring1,
'txtring5'=> $rekodring5,
'txtsen1'=> $rekodsen1,
'txtsen5'=> $rekodsen5,
'txtsen10'=> $rekodsen10,
'txtsen20'=> $rekodsen20,
'txtsen50'=> $rekodsen50,
'txtring10'=> $rekodring10,
'txtring20'=> $rekodring20,
'txtring50'=> $rekodring50,
'txtring100'=> $rekodring100,
'txtring1000'=> "0",
'jumlahbundle'=> "0",
'txtJumlah'=> "0",
'txtjumlah'=> "0",
'jumlahkeping' => "0"
]);
@@ -703,11 +718,11 @@ class KhazanahController extends Controller
$latestVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$masukV=$latestVault[0]['Masuk'];
$keluarV=$latestVault[0]['Keluar'];
$masukV=$latestVault[0]['masuk'];
$keluarV=$latestVault[0]['keluar'];
$pendahuluanV=$latestVault[0]['pendahuluan'];
$serahanV=$latestVault[0]['serahan'];
$BakiAwalV=$latestVault[0]['BakiAwal'];
$BakiAwalV=$latestVault[0]['bakiawal'];
// dd($latestVault);
// return;
app/Http/Controllers/OperasiController.php
+5 -9
View File
@@ -4,8 +4,8 @@ namespace App\Http\Controllers;
//Events
use App\Events\OperasiNotice;
use App\Events\StatusLiked;
use App\Events\NotifikasiPembayaran;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
@@ -30,12 +30,6 @@ class OperasiController extends Controller
{
$kelulusan = $kelulusan[0];
}
else
{
}
return view('operasi.kelulusan',compact('cawangan_info','api_url','kelulusan'));
}
@@ -74,7 +68,9 @@ class OperasiController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan)->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1
])->json();
return response()->json($updatelulus,200);
}
@@ -104,7 +100,7 @@ class OperasiController extends Controller
// 'teller' => $request->teller
])->json();
event(new StatusLiked('Penghantaran kepada Operasi!'));
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
return response()->json($createlulus,201);
}