diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 201aa50..477ccce 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -921,6 +921,7 @@ class GadaiController extends Controller $dateans = new Carbon($request->tarikh); $ansuran = Transaction::on('mysql7') + ->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller') ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -2524,7 +2525,7 @@ class GadaiController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']]) + ->where([['t_gadai','<=',$tarikhtawarruq]]) ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]]) ->sum('pinjaman'); @@ -2564,7 +2565,7 @@ class GadaiController extends Controller // ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) // ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) // ->sum('pinjaman'); - $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman'); + $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman'); $Tebus = Gadai::on($cawangan['mysql']) ->join('tebus as teb','teb.norujukan','=','gadai.norujukan') @@ -2692,55 +2693,7 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $datetawarruq = new Carbon('2021-04-14'); - $datemula = new Carbon($request->mula); - $datemula->addDays(1); - - $datehingga = new Carbon($request->hingga); - $datehingga->addDays(1); - - $current = Carbon::now(); - $current = new Carbon(); - - $transaksi = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - ->sum('bayaran_pembiayaan'); - - return response($transaksi); - } - - public function LaporanAuditAktif($kodcaw,Request $request) - { - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - - // $rekodaudit = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',0) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->get(); - - // $totalrekod = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',0) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->sum('pinjaman'); - - // $totalberat = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',0) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->sum('berat'); - - // $totalnilaimarhun = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',0) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->sum('nilaimarhun'); - $audit = Gadai::on($cawangan['mysql']) - //->where('tagpalsu','=',0) ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); @@ -2758,32 +2711,7 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - // $rekodaudit = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',1) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->get(); - - // $totalrekod = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',1) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->sum('pinjaman'); - - // $totalberat = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',1) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->sum('berat'); - - // $totalnilaimarhun = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',1) - // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - // ->sum('nilaimarhun'); - $audit = Gadai::on($cawangan['mysql']) - //->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 0ebd9d6..6f35d4a 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -99,7 +99,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'masalulus' => $harini->toTimeString(), - 'pelulus' => 'khazanah' + 'pelulus' => 'khazanah', + 'khazanah' => $request->namakhazanah )); }else{ @@ -110,7 +111,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'masalulus'=> 'batal', - 'pelulus'=> 'khazanah' + 'pelulus'=> 'khazanah', + 'khazanah' => $request->namakhazanah )); } @@ -125,7 +127,9 @@ class KelulusanController extends Controller ->where('norujukan','=',$norujukan) ->where('siri','=',$request->siri) ->update(array( - 'pelulus' => 'operasi' + 'pelulus' => 'operasi', + 'khazanah' => $request->namakhazanah + )); } @@ -137,7 +141,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'operasi', - 'masalulus' => 'batal' + 'masalulus' => 'batal', + 'khazanah' => $request->namakhazanah )); } } @@ -150,6 +155,7 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'dahlulus', + 'operasi' => $request->namaoperasi, 'masalulus'=> $harini->toTimeString() )); }else if($request->sahkan === 2){ @@ -159,6 +165,7 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'dahlulus', + 'operasi' => $request->namaoperasi, 'masalulus'=> 'batal' )); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index d98c88c..6bedf89 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -496,4 +496,19 @@ class LelongController extends Controller return response()->json($cajperkhidmatan,200); } + public function LelonganHarini($kodcaw) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $lelong = Lelong::on($cawangan['mysql']) + ->whereNotNull('t_jual') + ->where('t_jual','=', $current->toDateString()) + ->sum('hargajual'); + + return response()->json($lelong,200); + } + } diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php index 5f92ddb..17d5228 100644 --- a/app/Http/Controllers/PolisController.php +++ b/app/Http/Controllers/PolisController.php @@ -54,4 +54,23 @@ class PolisController extends Controller return response()->json($polis); } + + public function editPolis(Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $polis = Polis::on($cawangan['mysql']) + ->where('norujukan','=',$request->norujukan) + ->update([ + 'komen1' => $request->komen1, + 'komen2' => $request->komen2, + 'teller' => $request->teller + ]); + + return response()->json($polis); + + } } \ No newline at end of file diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 0475a88..08e1499 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -515,7 +515,7 @@ class TebusController extends Controller }) ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') ->where('tebus.t_tebus','=',$tarikh) - ->groupBy('tebus.norujukan') + ->groupBy('tebus.norujukan') ->orderBy('tebus.teller') ->orderBy('tebus.sirit') ->get(); @@ -1051,29 +1051,24 @@ class TebusController extends Controller $current = Carbon::now(); $current = new Carbon(); - if($request->tarikh < '2021-06-09') { $keuntungan = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); - $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - - // dd($keuntungan,$keuntunganreducing); - $total = ($keuntungan + $keuntunganreducing); diff --git a/routes/web.php b/routes/web.php index a0cae3a..8ab5013 100644 --- a/routes/web.php +++ b/routes/web.php @@ -116,7 +116,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']); $router->get('bakilelong/cawangan/{kodcaw}/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelongEachCawangan']); $router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']); - $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanLelong']); //laporan lelong + $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); //laporan lelong + $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); //laporan lelong + //Marhun API @@ -214,6 +216,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('polis/get/',['uses'=>'PolisController@getPolis']); $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); $router->post('polis/create/',['uses'=>'PolisController@createPolis']); + $router->put('polis/edit/',['uses'=>'PolisController@editPolis']); //LAPORAN API