From 7ae83966f72403c03d6781505a2462f1c2964c78 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 12 Jan 2021 11:46:12 +0800 Subject: [PATCH] change recent --- app/HargaEmas.php | 18 ++++++-- app/Http/Controllers/GadaiController.php | 3 ++ app/Http/Controllers/HargaEmasController.php | 41 +++++++++++++++++ app/Http/Controllers/KelulusanController.php | 24 ++++++++++ app/Http/Controllers/MarhunController.php | 25 ++++++++++ app/Http/Controllers/PanjarController.php | 16 ++++++- app/Http/Controllers/TebusController.php | 48 +++++++++++++++++++- app/Mohonid.php | 35 ++++++++++++++ routes/web.php | 10 +++- 9 files changed, 213 insertions(+), 7 deletions(-) create mode 100644 app/Mohonid.php diff --git a/app/HargaEmas.php b/app/HargaEmas.php index af4cef0..ce02f60 100644 --- a/app/HargaEmas.php +++ b/app/HargaEmas.php @@ -13,14 +13,24 @@ class HargaEmas extends Model * * @var array */ - // protected $fillable = [ - - // ]; + + protected $fillable = [ + 'recno', + 'karat', + 'keterangan', + 'harga', + 'harga2', + 'tarikhupdate' +]; + + /** * The attributes excluded from the model's JSON form. * * @var array */ - // protected $hidden = []; + + public $timestamps = false; + } \ No newline at end of file diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 3ca48fb..5ef4758 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1122,12 +1122,15 @@ class GadaiController extends Controller Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete(); + + Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); return response('Deleted Successfully', 200); } else { Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); return response('Deleted Successfully', 200); } diff --git a/app/Http/Controllers/HargaEmasController.php b/app/Http/Controllers/HargaEmasController.php index 91d382b..d495faa 100644 --- a/app/Http/Controllers/HargaEmasController.php +++ b/app/Http/Controllers/HargaEmasController.php @@ -3,8 +3,11 @@ namespace App\Http\Controllers; use App\HargaEmas; + use Illuminate\Http\Request; +use Carbon\Carbon; + class HargaEmasController extends Controller { public function showAllHargaEmas() @@ -29,6 +32,44 @@ class HargaEmasController extends Controller return response()->json($harga_emas, 200); } + public function updatehargaemas(Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $hargaemas=HargaEmas::on('mysql7') + ->where('recno','=',$request->recno) + ->update(array( + 'harga'=> $request->harga, + 'tarikhupdate' => $harini->toDateString() + )); + + return response()->json($hargaemas, 200); + } + + public function createhargaemas(Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $hargaemas=HargaEmas::on('mysql7') + ->create([ + 'karat' => $request->karat, + 'keterangan'=> $request->keterangan, + 'harga' => $request->harga, + 'harga2' => $request->harga2, + 'tarikhupdate' => $harini->toDateString() + ]); + + return response()->json($hargaemas, 201); + } + + public function deletehargaemas($id) + { + $jemas = HargaEmas::on('mysql7')->where('recno','=',$id)->delete(); + + return response('Deleted Successfully', 200); + } public function showAllHargaEmasMobile(){ diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 1c2acfa..43611c4 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Mohon; use App\Cawangan; +use App\Mohonid; use Carbon\Carbon; @@ -124,5 +125,28 @@ class KelulusanController extends Controller return response()->json($kelulusan); } + //KEPOHONAN EDIT DAN HAPUS + + public function kepohonanubahdanhapus(REQUEST $request,$kodcaw,$norujukan) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $mohonid=Mohonid::on($cawangan['mysql']) + ->create([ + 'tarikh'=> $harini->toDateString(), + 'onlineid'=> $onlineid, + 'mohon' => $request->mohon, + 'norujukan' => $request->norujukan, + 'id' => $request->dategadai, + 'katalaluan' => $request->bilgadai, + 'benar' => $request->jumpinjam, + 'teler' => $request->jenistebus + ]); + + return response()->json($mohonid); + } } diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 5377e27..40fbcd1 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -79,6 +79,31 @@ class MarhunController extends Controller return response('Deleted Successfully', 200); } + public function deletemarhun($kodcaw,$norujukan,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->delete(); + + return response('Deleted Successfully', 200); + } + + public function editmarhun($kodcaw,$norujukan,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->update( + [ + 'karat' => $request->karat, + 'berat' => $request->berat, + 'harga' => $request->harga, + 'n_marhun' => $request->n_marhun + ]); + + + return response('Edit Successfully', 200); + } + public function getLaporanMarhunHarian($kodcaw,$tarikh){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php index f0d982d..d078b2d 100644 --- a/app/Http/Controllers/PanjarController.php +++ b/app/Http/Controllers/PanjarController.php @@ -24,6 +24,20 @@ class PanjarController extends Controller return response()->json($panjar); } + public function listpanjar($kodcaw) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $panjar=Panjar::on($cawangan['mysql']) + ->orderBy('recno','desc') + ->first(); + + return response()->json($panjar); + } + public function listmulaakhir($kodcaw,$mula,$akhir) { @@ -59,7 +73,7 @@ class PanjarController extends Controller return response()->json($kelulusan,201); } - public function create(REQUEST $request,$kodcaw,$norujukan) + public function create(REQUEST $request,$kodcaw) { $harini = Carbon::now(); $harini = new Carbon; diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 7e6da90..88f8f14 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -204,6 +204,44 @@ class TebusController extends Controller return floatval(number_format($rebet,2)); } + function rebetselepastawarruq($kodcaw,$norujukan) + { + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw','=',$kodcaw) + ->first(); + + $gadai_data = Gadai::on($cawangan['mysql']) + ->where('norujukan','=',$norujukan) + ->first(); + + $upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); + + $transaction = Transaction::on('mysql7') + ->where('norujukan','=',$norujukan) + ->get(); + + $transaction_keuntungan = TransaksiKeuntungan::on('mysql7') + ->where('norujukan','=',$norujukan) + ->get(); + + $totalBayaranKeuntungan = 0; + $totalBayaran = 0; + + foreach($transaction as $index=>$trans){ + $totalBayaran += $trans['duit_masuk']; + } + + foreach($transaction_keuntungan as $index=>$untung){ + $totalBayaranKeuntungan += $untung['bayaran_keuntungan']; + } + + $rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upahsemasa; + + return floatval(number_format($rebet,2)); + } + + + public function tebusUpdate($kodcaw,$norujukan,Request $request) { $current = Carbon::now(); @@ -211,7 +249,15 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $rebet = $this->rebet($kodcaw,$norujukan); + if($request->jenisbayarantebus == "tawarruq") + { + $rebet = $this->rebetselepastawarruq($kodcaw,$norujukan); + } + else if($request->jenisbayarantebus == "nottawarruq") + { + $rebet = $this->rebet($kodcaw,$norujukan); + } + $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( 'sttebus' => "T", diff --git a/app/Mohonid.php b/app/Mohonid.php new file mode 100644 index 0000000..75a5f61 --- /dev/null +++ b/app/Mohonid.php @@ -0,0 +1,35 @@ +group(['prefix'=>'api'], function () use ($router){ $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']); $router->get('listpenebusanhistory/{kodcaw}',['uses'=>'TebusController@listhistorypenebusan']); + //API FARIS $router->put('tebus/serah_marhun_teller/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodescanTebus']); // $router->get('tebus_serahan/{kodcaw}',['uses'=>'TebusController@SerahMarhunTeller']); @@ -115,6 +116,10 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmas']); $router->get('harga_emas/{karat}',['uses'=>'HargaEmasController@getOneHargaEmas']); $router->put('harga_emas',['uses'=>'HargaEmasController@update']); + $router->put('harga_emas/update',['uses'=>'HargaEmasController@updatehargaemas']); + $router->post('harga_emas/create',['uses'=>'HargaEmasController@createhargaemas']); + $router->put('harga_emas/delete/{id}', ['uses' => 'HargaEmasController@deletehargaemas']); + //Cawangan API $router->get('cawangan',['uses'=>'CawanganController@showAllCawangans']); @@ -182,12 +187,15 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']); $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']); $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']); + $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit + $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit //API PANJAR KHAZANAH $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']); + $router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']); $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']); + $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']); //API KELULUSAN