diff --git a/app/Denominasi.php b/app/Denominasi.php index 1358ce9..6865e6d 100644 --- a/app/Denominasi.php +++ b/app/Denominasi.php @@ -5,12 +5,60 @@ use Illuminate\Database\Eloquent\Model; class Denominasi extends Model { - - - - + protected $table = 'denominasi'; + public $timestamps = false; + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = [ + + 'tarikh', + 'bd1', + 'b1', + 'bd5', + 'b5', + 'bd10', + 'b10', + 'bd20', + 'b20', + 'bd50', + 'b50', + 'bd100', + 'b100', + 'txtRing1', + 'k1', + 'txtRing5', + 'k5', + 'txtSen1', + 'k01', + 'txtSen5', + 'k05', + 'txtSen10', + 'k010', + 'txtSen20', + 'k020', + 'txtSen50', + 'k050', + 'txtRing10', + 'k10', + 'txtRing20', + 'k20', + 'txtRing50', + 'k50', + 'txtRing100', + 'k100', + 'txtRing1000', + 'k1000', + 'jumlahbundle', + 'txtJumlah', + 'nota', + 'jumlahkeping' + + ]; } \ No newline at end of file diff --git a/app/Http/Controllers/DenominasiController.php b/app/Http/Controllers/DenominasiController.php index 2a451cf..8c3eb43 100644 --- a/app/Http/Controllers/DenominasiController.php +++ b/app/Http/Controllers/DenominasiController.php @@ -7,6 +7,8 @@ use App\Cawangan; use App\Denominasi; use Illuminate\Http\Request; +use Carbon\Carbon; + class DenominasiController extends Controller { @@ -19,4 +21,87 @@ class DenominasiController extends Controller return response()->json($data); } + + public function updatedenominasi($kodcaw, Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + //Wang Initialize + $bd1 = ($request->bd1 * 100); + $bd20 = ($request->bd20 * 1000); + $bd5 = ($request->bd5 * 500); + $bd50 = ($request->bd50 * 5000); + $bd10 = ($request->bd10 * 1000); + $bd100 = ($request->bd100 * 5000); + $k01 = ($request->txtSen1 * 0.01); + $k05 = ($request->txtSen5 * 0.05); + $k010 = ($request->txtSen10 * 0.10); + $k020 = ($request->txtSen20 * 0.20); + $k050 = ($request->txtSen50 * 0.50); + $k1 = ($request->txtRing1 * 1); + $k5 = ($request->txtRing5 * 5); + $k10 = ($request->txtRing10 * 10); + $k20 = ($request->txtRing20 * 20); + $k50 = ($request->txtRing50 * 50); + $k100 = ($request->txtRing100 * 100); + + //Total Wang + + $totalbundle = $bd1 + $bd20 + $bd5 + $bd50 + $bd10 + $bd100; + $totalkeping = $k01 + $k05 + $k010 + $k020 + $k050 + $k1 + $k5 + $k10 + $k20 + $k50 + $k100; + + $totaljumlah = $totalbundle + $totalkeping; + + + $denominasiupdate=Denominasi::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()]])->update(array( + + 'bd1' => $request->bd1, + 'b1'=> $bd1, + 'bd5'=> $request->bd5, + 'b5'=> $bd5, + 'bd10'=> $request->bd10, + 'b10'=> $bd10, + 'bd20'=> $request->bd20, + 'b20'=> $bd20, + 'bd50'=> $request->bd50, + 'b50'=> $bd50, + 'bd100'=> $request->bd100, + 'b100'=> $bd100, + 'txtRing1'=> $request->txtRing1, + 'k1'=> $k1, + 'txtRing5'=> $request->txtRing5, + 'k5'=> $k5, + 'txtSen1'=> $request->txtSen1, + 'k01'=> $k01, + 'txtSen5'=> $request->txtSen5, + 'k05'=> $k05, + 'txtSen10'=> $request->txtSen10, + 'k010'=> $k010, + 'txtSen20'=> $request->txtSen20, + 'k020'=> $k020, + 'txtSen50'=> $request->txtSen50, + 'k050'=> $k050, + 'txtRing10'=> $request->txtRing10, + 'k10'=> $k10, + 'txtRing20'=> $request->txtRing20, + 'k20'=> $k20, + 'txtRing50'=> $request->txtRing50, + 'k50'=> $k50, + 'txtRing100'=> $request->txtRing100, + 'k100'=> $k100, + 'txtRing1000'=> $request->txtRing1000, + 'k1000'=> $request->k1000, + 'jumlahbundle'=> $totalbundle, + 'txtJumlah'=> $totaljumlah, + 'jumlahkeping' => $totalkeping + + ) ); + + return response()->json($denominasiupdate,200); + + } } \ No newline at end of file diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php new file mode 100644 index 0000000..97d5b5c --- /dev/null +++ b/app/Http/Controllers/KelulusanController.php @@ -0,0 +1,108 @@ +where('kodcaw','=',$kodcaw)->first(); + + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('TARIKH','=',$harini->toDateString()) + ->where('pelulus','=','') + ->where('masalulus','=','') + ->get(); + + return response()->json($kelulusan); + } + + public function listdahlulus($kodcaw,$norujukan) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('TARIKH','=',$harini->toDateString()) + ->where('NORUJUKAN','=',$norujukan) + ->where('pelulus','<>','') + ->where('masalulus','<>','') + ->get(); + + return response()->json($kelulusan); + } + + + public function rekodlepas($kodcaw) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('TARIKH','<',$harini->toDateString()) + ->get(); + + return response()->json($kelulusan); + } + + public function update($kodcaw,$norujukan,Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + + + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('TARIKH','=',$harini->toDateString()) + ->where('NORUJUKAN','=',$norujukan) + ->update(array( + 'pelulus' => $request->pelulus, + 'masalulus'=> $harini->toTimeString() + + )); + + return response()->json($kelulusan,201); + } + + public function create(REQUEST $request,$kodcaw,$norujukan) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $kelulusan=Mohon::on($cawangan['mysql']) + ->create([ + + 'TARIKH'=> $harini->toDateString(), + 'NORUJUKAN'=> $norujukan, + 'SIRI' => "try", + 'KOMEN' => $request->komen, + 'lastdategadai' => $request->dategadai, + 'bilGad' => $request->bilgadai, + 'jumPinj' => $request->jumpinjam, + 'jenisTebus' => $request->jenistebus, + 'teller' => $request->teller + + ]); + + return response()->json($kelulusan); + } + + +} diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php new file mode 100644 index 0000000..787eafd --- /dev/null +++ b/app/Http/Controllers/PanjarController.php @@ -0,0 +1,89 @@ +where('kodcaw','=',$kodcaw)->first(); + + $panjar=Panjar::on($cawangan['mysql']) + ->where('tarikh','=',$harini->toDateString()) + ->get(); + + return response()->json($panjar); + } + + public function listmulaakhir($kodcaw,$mula,$akhir) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $panjar=Panjar::on($cawangan['mysql']) + ->where('tarikh','>=',$mula) + ->where('tarikh','<=',$akhir) + ->orderBy('tarikh','desc') + ->get(); + + return response()->json($panjar); + } + + public function update($kodcaw,$norujukan,Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + + + $kelulusan=Panjar::on($cawangan['mysql']) + ->where('TARIKH','=',$harini->toDateString()) + ->where('NORUJUKAN','=',$norujukan) + ->update(array( + 'pelulus' => $request->pelulus, + 'masalulus'=> $harini->toTimeString() + + )); + + return response()->json($kelulusan,201); + } + + public function create(REQUEST $request,$kodcaw,$norujukan) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $panjar=Panjar::on($cawangan['mysql']) + ->create([ + + 'tarikh'=> $harini->toDateString(), + 'deskripsi'=> $request->deskripsi, + 'bayaran' => $request->bayaran, + 'tag' => $request->tag, + 'kategori' => $request->kategori, + 'id' => $request->id, + 'bakiperubatan' => $request->bakiperubatan, + 'nobaucer' => $request->nobaucer, + 'nobil' => $request->nobil, + 'tuntutoleh' => $request->tuntutoleh + + ]); + + return response()->json($panjar); + } + + +} diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 92aaeca..8c2de03 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -10,6 +10,7 @@ use App\TransaksiKeuntungan; use App\Advansur; use App\Tebus; use App\InOutMar; +use App\Wakil; use Illuminate\Http\Request; @@ -268,7 +269,6 @@ class TebusController extends Controller return response()->json($tebus); } - //API FARIS public function listPenebusanBaru($kodcaw) { @@ -306,8 +306,48 @@ class TebusController extends Controller 'tagterima' => 1 )); } - - //END API FARIS - + public function AllWakil($kodcaw) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $wakil = Wakil::on($cawangan['mysql']) + ->orderBy('NOWAKIL','desc') + ->get(); + + return response()->json($wakil,200); + } + + public function getWakil($kodcaw,$icno) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $wakil = Wakil::on($cawangan['mysql']) + ->where('NOKP','=',$icno) + ->get(); + + return response()->json($wakil,200); + } + + public function createWakil($kodcaw,$icno,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $wakil_create = Wakil::on($cawangan['mysql'])->create([ + + 'kodcaw' => $kodcaw, + 'NOPELANGGAN' => $request->nopelanggan, + 'NOWAKIL' => $request->nowakil, + 'NAMA' => $request->nama, + 'NOKP' => $icno, + 'HUBUNGAN' => $request->hubungan, + 'ALAMAT1' => $request->alamat, + 'TELEFON' => $request->telefon, + 'NOTA' => $request->nota + + ]); + + return response()->json($wakil_create ,201); + } + } diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 75a31f8..60a0121 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -19,10 +19,8 @@ class TunaiController extends Controller $current = Carbon::now(); $current = new Carbon(); - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - - + $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()]])->get(); return response()->json($tunai); @@ -95,21 +93,20 @@ class TunaiController extends Controller } public function getCurrentTunai($kodcaw,$kodlaluan) - { + { - $current = Carbon::now(); - $current = new Carbon(); + $current = Carbon::now(); + $current = new Carbon(); - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $tunai=Tunai::on($cawangan['mysql']) - ->where([['kodcaw','=',$kodcaw],['tarikh','<=',$current->toDateString()],['kodlaluan','=',$kodlaluan]]) - ->orderBy('tarikh','desc') - ->first(); - return response()->json($tunai); - - } + $tunai=Tunai::on($cawangan['mysql']) + ->where([['kodcaw','=',$kodcaw],['tarikh','<=',$current->toDateString()],['kodlaluan','=',$kodlaluan]]) + ->orderBy('tarikh','desc') + ->first(); + return response()->json($tunai); + } ///API FARIS @@ -136,13 +133,14 @@ class TunaiController extends Controller } - public function getAddTunai($kodcaw,$tarikh) + public function getAddTunai($kodcaw) { $current = Carbon::now(); $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $addtunai=AddTunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$tarikh]])->get(); + $addtunai=AddTunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()]])->get(); return response()->json($addtunai); } @@ -156,6 +154,15 @@ class TunaiController extends Controller return response()->json($requestteller); } + public function updateRequestTeller($kodcaw,$kodlaluan,Request $request) + { + $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['KodLaluan','=',$kodlaluan],['update','=',0]])->update(array( + + 'update' => 1 + + ) ); + } + public function createRequestTeller($kodcaw,$kodlaluan,Request $request) { diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 80e4676..fc00f4d 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -34,6 +34,7 @@ class VaultController extends Controller 'Masuk'=>$request->masuk, 'Keluar'=>$request->keluar, + 'BakiAwal'=>$request->bakiawal, 'BakiAkhir'=>$request->bakiakhir, 'BakiEod'=>$request->bakieod diff --git a/app/Mohon.php b/app/Mohon.php new file mode 100644 index 0000000..3ceae75 --- /dev/null +++ b/app/Mohon.php @@ -0,0 +1,38 @@ +group(['prefix'=>'api'], function () use ($router){ $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan - //API FARIS + //API BARU $router->get('VaultController/{kodcaw}',['uses'=>'VaultController@list']); $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']); $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']); @@ -172,22 +172,39 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']); $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']); - $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']); $router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']); - $router->get('DenominasiController/{kodcaw}',['uses'=>'DenominasiController@listdenominasi']); - $router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']); + $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']); + + //API PANJAR KHAZANAH + $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']); + $router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']); + // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']); + $router->post('CreatePanjar/{kodcaw}/{norujukan}',['uses'=>'PanjarController@create']); + + + //API KELULUSAN + $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']); + $router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']); + $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']); + $router->post('CreateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@create']); + //API REQUEST TELLER $router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']); $router->get('requestTeller/get/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@getRequestTeller']); - // getRequestTeller + $router->put('requestTeller/update/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@updateRequestTeller']); + + //API WAKIL + $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']); + $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']); + $router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']); - //update tag inoutmar + //update tagterima Tebus $router->put('updatetagterima/{kodcaw}/{norujukan}',['uses'=>'TebusController@tagterimaupdate']); //pekerjaan @@ -196,6 +213,10 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Tujuan Gadai $router->get('tujuangadai',['uses'=>'TujuanGadaiController@showAllTujuanGadai']); + //DENOMINASI + $router->get('DenominasiController/{kodcaw}',['uses'=>'DenominasiController@listdenominasi']); + $router->put('DenominasiUpdate/{kodcaw}',['uses'=>'DenominasiController@updatedenominasi']); + }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){