From 4991277855173b7daf8b316f42c24575653c24f9 Mon Sep 17 00:00:00 2001 From: afiq Date: Tue, 9 Mar 2021 10:53:26 +0800 Subject: [PATCH] ringkasan harian --- app/Http/Controllers/GadaiController.php | 26 ++++- app/Http/Controllers/KomuditiController.php | 5 +- app/Http/Controllers/LaporanController.php | 119 +++++++++++++++++++ app/Http/Controllers/TebusController.php | 122 +++++++++++++------- app/KomuditiTransaksi.php | 2 +- app/TransaksiKeuntungan.php | 2 +- routes/web.php | 2 + 7 files changed, 226 insertions(+), 52 deletions(-) create mode 100644 app/Http/Controllers/LaporanController.php diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index c95886f..fb56d56 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -304,7 +304,13 @@ class GadaiController extends Controller $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran; $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran; $baki_upah = 0; + $keuntungan_sebenar = $upahsemasa; }else{ + if($gadai['bakiupah'] > $request->bayaran){ + $keuntungan_sebenar = $request->bayaran; + }else{ + $keuntungan_sebenar = $gadai['bakiupah']; + } $baki_upah = $gadai['bakiupah'] - $request->bayaran; $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran; if($gadai['bakipjm'] == null){ @@ -334,7 +340,8 @@ class GadaiController extends Controller 'norujukan' => $norujukan, 'bayaran_keuntungan' => $upahsemasa, 'tarikh_bayaran'=> $current, - 'kodcaw'=> $kodcaw + 'kodcaw'=> $kodcaw, + 'keuntungan_sebenar' => $keuntungan_sebenar ]); $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( @@ -362,7 +369,13 @@ class GadaiController extends Controller $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran; $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran; $baki_upah = 0; + $keuntungan_sebenar = $upahsemasa; }else{ + if($gadai['bakiupah'] > $request->bayaran){ + $keuntungan_sebenar = $request->bayaran; + }else{ + $keuntungan_sebenar = $gadai['bakiupah']; + } $baki_upah = $gadai['bakiupah'] - $request->bayaran; $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran; if($gadai['bakipjm'] == null){ @@ -392,7 +405,8 @@ class GadaiController extends Controller 'norujukan' => $norujukan, 'bayaran_keuntungan' => $upahsemasa, 'tarikh_bayaran'=> $current, - 'kodcaw'=> $kodcaw + 'kodcaw'=> $kodcaw, + 'keuntungan_sebenar' => $keuntungan_sebenar ]); $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( @@ -1453,11 +1467,13 @@ class GadaiController extends Controller else { - if($gadai[0]['tagserah'] == 1 && $gadai[0]['cetak'] == 1) + if($gadai[0]['semakbarcode'] == 'Lulus') { $totalkeluar = $keluar - $gadai[0]['pinjaman']; - $bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan; + $bakiakhir = $baki; + + $bakiakhir += $gadai[0]['pinjaman']; $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array( @@ -1469,7 +1485,7 @@ class GadaiController extends Controller $bakiakhir = $baki; - $bakiakhir -= $gadai[0]['pinjaman']; + $bakiakhir += $gadai[0]['pinjaman']; $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array( diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index e299d42..7a2b395 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -125,6 +125,7 @@ class KomuditiController extends Controller $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->create([ 'unit_komuditi' => $request->unit_komuditi, + 'nosijil'=>$komuditi_current['no_sijil'], 'norujukan' => $request->norujukan, 'kodcaw' => $request->kodcaw , 'teller' => $request->teller , @@ -295,11 +296,11 @@ class KomuditiController extends Controller } public function rekodTransaksiKomoditi(Request $request){ - $rekod = KomuditiTransaksi::on('mysql7')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('kodcaw')->where('tarikh','=',$request->tarikh)->groupBy('kodcaw')->get(); + $rekod = KomuditiTransaksi::on('mysql7')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('kodcaw','nosijil')->where('tarikh','=',$request->tarikh)->groupBy('kodcaw','nosijil')->get(); $rekodkomoditi = []; foreach($rekod as $index=>$rekodtransaksi){ $cawangan =Cawangan::on('mysql7')->select('details_caw')->where('kodcaw','=',$rekodtransaksi['kodcaw'])->first(); - array_push($rekodkomoditi,['totalkomoditi'=>$rekodtransaksi['totalkomoditi'],'cawangan'=>$cawangan['details_caw']]); + array_push($rekodkomoditi,['totalkomoditi'=>$rekodtransaksi['totalkomoditi'],'cawangan'=>$cawangan['details_caw'],'nosijil'=>$rekodtransaksi['nosijil']]); } return response()->json($rekodkomoditi); diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php new file mode 100644 index 0000000..47c85a6 --- /dev/null +++ b/app/Http/Controllers/LaporanController.php @@ -0,0 +1,119 @@ +tarikh; + + $startDate = Carbon::parse($tarikh_request); + $firstDay = $startDate->firstOfMonth(); + $startDateYear = Carbon::parse($tarikh_request); + $firstDayYear = $startDateYear->firstOfYear(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $laporan_harian = []; + //a + $total_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->sum('pinjaman'); + $total_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('pinjaman'); + $total_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->sum('duit_masuk'); + $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereRaw('DATE(tarikh_bayaran) = ?',[$request->tarikh])->sum('keuntungan_sebenar'); + + //b + $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count(); + $bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count(); + $bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count(); + $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where('tarikhdaftar','=',$request->tarikh)->count(); + + //c + + //d + $panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran'); + $panjar_bulanan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDay]])->sum('bayaran'); + $panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran'); + + //e + + //f + $data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get(); + $bilangan_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->count(); + + $cas_lelong = 0; + $jumlah_lelong = 0; + $baki_lelong = 0; + $rugi_lelong = 0; + + foreach($data_lelong as $index=>$lelong){ + if($lelong['baki'] >= 0){ + $cas_lelong += $lelong['cajlelong']; + $jumlah_lelong += $lelong['hargajual']; + $baki_lelong += $lelong['baki']; + }elseif($lelong['baki'] < 0){ + $cas_lelong += $lelong['cajlelong']; + $jumlah_lelong += $lelong['hargajual']; + $rugi_lelong += abs($lelong['baki']); + } + } + + //g + $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah'); + + //h + $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman'); + $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman'); + $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman'); + + $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('nilaimarhun'); + $nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun'); + $nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun'); + + $bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->count(); + $bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->count(); + $bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->count(); + + array_push($laporan_harian,[ + 'total_gadai'=>$total_gadai, + 'total_tebus'=>$total_tebus, + 'total_ansuran'=>$total_ansuran, + 'bilangan_gadai'=>$bilangan_gadai, + 'bilangan_tebus'=>$bilangan_tebus, + 'bilangan_ansuran'=>$bilangan_ansuran, + 'bilangan_customer_baru'=>$bilangan_customer_baru, + 'bayar_baki_lelong'=>$bayar_baki_lelong, + 'gadai_70'=>$gadai_70, + 'gadai_75'=>$gadai_75, + 'gadai_80'=>$gadai_80, + 'nilaimarhun_70'=>$nilaimarhun_70, + 'nilaimarhun_75'=>$nilaimarhun_75, + 'nilaimarhun_80'=>$nilaimarhun_80, + 'bilangan_70'=>$bilangan_70, + 'bilangan_75'=>$bilangan_75, + 'bilangan_80'=>$bilangan_80, + 'panjar_harian'=>$panjar_harian, + 'panjar_bulanan'=>$panjar_bulanan, + 'panjar_tahunan'=>$panjar_tahunan, + 'bilangan_lelong'=>$bilangan_lelong, + 'cas_lelong'=>$cas_lelong, + 'jumlah_lelong'=>$jumlah_lelong, + 'baki_lelong'=>$baki_lelong, + 'rugi_lelong'=>$rugi_lelong, + 'total_keuntungan'=>$total_keuntungan + ]); + + return response()->json($laporan_harian); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 746276e..273ee4a 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -286,56 +286,92 @@ class TebusController extends Controller { $rebet = $this->rebet($kodcaw,$norujukan); } - else + else{ $rebet = 0; + } + + $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( + 'sttebus' => "T", + 't_update' => $current->toDateString(), + )); - $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( - 'sttebus' => "T", - 't_update' => $current->toDateString(), - )); - - $create_tebus = Tebus::on($cawangan['mysql'])->create([ - 'kodcaw'=> $kodcaw, - 'norujukan'=> $norujukan, - 'nopelanggan' => $request->nopelanggan, - 'jenisbyr' => "TN", - 'jenistebus' => $request->jenistebus, - 'glcode' => "0", - 't_tebus' => $current->toDateString(), - 'jbg' => $request->jbg, - 'kadarupah' => $request->kadarupah, - 'nilaimarhun' => $request->nilai_marhun, - 'pinjaman' => $request->pinjaman, - 'ansuran' => $request->ansuran, - 'addpinjaman' => $request->addpinjaman, - 'bakipjm' => $request->bakipinjaman, - 'bakiupah' => $request->bakiupah, - 'terima' => "*", - 'kodgl' => "0", - 'nowakil' => $request->nowakil, - 'rebate' => $rebet, - 'marhuntebus' => $request->marhun, - 'historygadaian' => $request->historygadaian, - 'tarikhbyrn' => $current->toDateString(), - 'teller' => $request->teller + $create_tebus = Tebus::on($cawangan['mysql'])->create([ + 'kodcaw'=> $kodcaw, + 'norujukan'=> $norujukan, + 'nopelanggan' => $request->nopelanggan, + 'jenisbyr' => "TN", + 'jenistebus' => $request->jenistebus, + 'glcode' => "0", + 't_tebus' => $current->toDateString(), + 'jbg' => $request->jbg, + 'kadarupah' => $request->kadarupah, + 'nilaimarhun' => $request->nilai_marhun, + 'pinjaman' => $request->pinjaman, + 'ansuran' => $request->ansuran, + 'addpinjaman' => $request->addpinjaman, + 'bakipjm' => $request->bakipinjaman, + 'bakiupah' => $request->bakiupah, + 'terima' => "*", + 'kodgl' => "0", + 'nowakil' => $request->nowakil, + 'rebate' => $rebet, + 'marhuntebus' => $request->marhun, + 'historygadaian' => $request->historygadaian, + 'tarikhbyrn' => $current->toDateString(), + 'teller' => $request->teller + ]); - ]); + $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([ + 'tarikh' => $current->toDateString(), + 'masa' => $current->toTimeString(), + 'norujukan' => $norujukan, + 'nm' => $request->nilai_marhun, + 'pkd' => $request->teller, + 'drp' => $request->teller, + 'bln' => $current->month, + 'thn' => $current->year, + 'tag' => 0, + 'jenistebus' => $request->jenistebus, + 'namateller' => $request->teller + ]); - $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([ - 'tarikh' => $current->toDateString(), - 'masa' => $current->toTimeString(), + $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ + 'norujukan' => $norujukan, + 'bayaran_keuntungan' => $request->bakiupah, + 'tarikh_bayaran'=> $current, + 'kodcaw'=> $kodcaw, + 'keuntungan_sebenar'=>$request->bakiupah + ]); + + + if($request->jenistebus == 'P'){ + $baki_hargajualan = $gadai['bakihargajualan'] - $request->bakiupah; + $transaction = Transaction::on('mysql7')->create([ + 'trans_type' => $request->jenistebus, 'norujukan' => $norujukan, - 'nm' => $request->nilai_marhun, - 'pkd' => $request->teller, - 'drp' => $request->teller, - 'bln' => $current->month, - 'thn' => $current->year, - 'tag' => 0, - 'jenistebus' => $request->jenistebus, - 'namateller' => $request->teller + 'nokp' => $gadai['nokp'], + 'teller' => $request->teller, + 'kodcaw' => $kodcaw, + 'duit_masuk' => $request->bakiupah, + 'created_at' => $current, + 'bakiharga' => $baki_hargajualan, ]); - + }else{ + $baki_hargajualan = $gadai['bakihargajualan'] - $request->bakipinjaman; + $transaction = Transaction::on('mysql7')->create([ + 'trans_type' => $request->jenistebus, + 'norujukan' => $norujukan, + 'nokp' => $gadai['nokp'], + 'teller' => $request->teller, + 'kodcaw' => $kodcaw, + 'duit_masuk' => $request->bakipinjaman, + 'created_at' => $current, + 'bakiharga' => $baki_hargajualan, + ]); + } + return response()->json($update_gadai, 201); } diff --git a/app/KomuditiTransaksi.php b/app/KomuditiTransaksi.php index 6e05b95..242c8e2 100644 --- a/app/KomuditiTransaksi.php +++ b/app/KomuditiTransaksi.php @@ -14,7 +14,7 @@ class KomuditiTransaksi extends Model * @var array */ protected $fillable = [ - 'unit_komuditi','kodcaw','teller','masa','tarikh','norujukan' + 'unit_komuditi','kodcaw','teller','masa','tarikh','norujukan','nosijil' ]; /** diff --git a/app/TransaksiKeuntungan.php b/app/TransaksiKeuntungan.php index f6d1664..963fd6b 100644 --- a/app/TransaksiKeuntungan.php +++ b/app/TransaksiKeuntungan.php @@ -14,7 +14,7 @@ class TransaksiKeuntungan extends Model * @var array */ protected $fillable = [ - 'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw' + 'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','keuntungan_sebenar' ]; /** diff --git a/routes/web.php b/routes/web.php index b25f012..cf86f00 100644 --- a/routes/web.php +++ b/routes/web.php @@ -289,6 +289,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('komuditi/rekodharian',['uses'=>'KomuditiController@rekodTransaksiHarian']); $router->get('komuditi/rekodkomuditi',['uses'=>'KomuditiController@rekodKomuditi']); $router->get('komoditi/rekod/transaksi',['uses'=>'KomuditiController@rekodTransaksiKomoditi']); + + $router->get('laporan/harian',['uses'=>'LaporanController@laporanHarian']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){