From 73ffd64ae16dfbab83bbefbe7ebf9a4c1d054443 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Wed, 15 Dec 2021 10:27:41 +0800 Subject: [PATCH] server --- app/Http/Controllers/GadaiController.php | 55 ++++++++++++++++++++---- app/Http/Controllers/TebusController.php | 42 ++++++++++++++++++ 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 734b23a..e39c44c 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -24,7 +24,6 @@ use App\Moratorium; use App\Audit; use App\Customer; use App\KomuditiPurchase; -use App\Advansur; use App\KomuditiTransaksi; use App\Advansur; use App\HistoryEmasSandaran; @@ -2895,7 +2894,7 @@ class GadaiController extends Controller ->join('tebus as teb','teb.norujukan','=','gadai.norujukan') ->where('gadai.tagpalsu','=',0) ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gadai.sttebus','=','T'],['gadai.hargajualan','<>','NULL']]) - ->sum('teb.pinjaman'); + ->sum('gadai.pinjaman'); $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; @@ -2920,9 +2919,20 @@ class GadaiController extends Controller ->whereNotNull('upah12') ->sum('upah12'); + //$transaksi_data = TransaksiKeuntungan::on('mysql7') + //->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + //->whereYear('tarikh_bayaran','=',$current->year) + //->get(); + $transaksi_data = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','=','A') ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) - ->whereYear('tarikh_bayaran','=',$current->year) + ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) ->get(); $transaksi = 0; @@ -2955,9 +2965,37 @@ class GadaiController extends Controller ->whereNotNull('upah12') ->sum('upah12'); - $totalkeuntungan = $keuntungan; + $ansuran_data = TransaksiKeuntungan::on('mysql7') + // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','=','A') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('tarikh_bayaran','=',$current->year) + ->where('trans.kodcaw',$request->kodcaw) + // ->whereNotNull('db2.hargajualan') + // ->sum('bayaran_keuntungan'); + ->get(); - return response()->json($totalkeuntungan,200); + $ansuran = 0; + if($ansuran_data){ + foreach($ansuran_data as $index=>$ansuranData){ + $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first(); + if($gadaiData){ + $ansuran += $ansuranData['bayaran_keuntungan']; + } + } + } + + $arraykeuntungan = ["totalkeuntungan" => $keuntungan,"ansuran" => floatval($ansuran)]; + + //$totalkeuntungan = $keuntungan; + + return response()->json($arraykeuntungan,200); } public function CalculationBayaranPendahuluan($kodcaw,Request $request) @@ -3324,12 +3362,13 @@ class GadaiController extends Controller $current = new Carbon(); $harini = $current->toDateString(); $totalKomoditi = Komuditi::on('mysql7')->where([['date_purchase',$harini],['transaction_type','Beli Komoditi']])->sum('unit_komuditi'); - $totalUse = KomuditiTransaksi::on('mysql7')->where('tarikh',$harini)->sum('unit_komuditi'); + $totalKomoditiJual = Komuditi::on('mysql7')->where([['date_purchase',$harini],['transaction_type','Jual Komoditi']])->sum('unit_komuditi'); + $totalUse = KomuditiTransaksi::on('mysql7')->where('tarikh',$harini)->sum('unit_komuditi'); - $bakiKomoditi = $totalKomoditi - $totalUse; + $bakiKomoditi = $totalKomoditi - $totalKomoditiJual - $totalUse; $percentUse = 0; if($totalKomoditi != 0){ - $percentUse = ($totalUse/$totalKomoditi)*100; + $percentUse = ($totalUse/($totalKomoditi-$totalKomoditiJual))*100; } $dataKomoditi = []; diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index cc20d97..047949a 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1497,6 +1497,47 @@ class TebusController extends Controller $current = Carbon::now(); $current = new Carbon(); + + if($request->hingga < '2021-06-01') + { + + $keuntungan_data = TransaksiKeuntungan::on('mysql7') + ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->hingga) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->where('kodcaw',$request->kodcaw) + ->pluck('norujukan'); + + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->whereDate('tarikh_bayaran', '<=', $request->hingga) + ->whereDate('tarikh_bayaran', '>=', $request->mula) + ->whereDate('tarikh_bayaran' ,'<', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->sum('bayaran_keuntungan'); + + $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $request->mula) + ->whereYear('tarikh_bayaran','=',$current->year) + ->where('kodcaw',$request->kodcaw) + ->pluck('norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntunganreducing = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->whereDate('tarikh_bayaran' ,'<=', $request->hingga) + ->whereDate('tarikh_bayaran','>=', $request->mula) + ->whereYear('tarikh_bayaran','=',$current->year) + ->sum('keuntungan_rebet'); + + $total = ($keuntungan + $keuntunganreducing); + + }else{ $bukanansuran_data = TransaksiKeuntungan::on('mysql7') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->leftJoin('transaction as trans', function($join) @@ -1550,6 +1591,7 @@ class TebusController extends Controller } $total = ($ansuran + $bukanansuran); + } return response($total); }