diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index de49b27..cc84c98 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -625,51 +625,39 @@ class GadaiController extends Controller //Gadai Terkumpul $gadai = Gadai::on($cawangan['mysql']) - ->where('sttebus','=','') + // ->where('sttebus','=','') ->whereNull('hargajualan') ->whereYear('t_gadai','=',$current->year) ->sum('pinjaman'); $gadaitawarruq = Gadai::on($cawangan['mysql']) - ->where('sttebus','=','') + // ->where('sttebus','=','') ->whereNotNull('hargajualan') ->whereYear('t_gadai','=',$current->year) ->sum('pinjaman'); - // //Tebus Terkumpul - // $tebus = Tebus::on($cawangan['mysql']) - // ->where('jenistebus','=','T') - // ->whereNull('hargajualan') - // ->whereYear('t_tebus','=',$current->year) - // ->sum('pinjaman'); + $tebus = Tebus::on($cawangan['mysql']) + ->leftJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan') + ->whereNull('gadai.hargajualan') + ->whereYear('tebus.t_tebus','=',$current->year) + ->sum('tebus.pinjaman'); - // $tebustawarruq = Tebus::on($cawangan['mysql']) - // ->where('jenistebus','=','T') - // ->whereNotNull('hargajualan') - // ->whereYear('t_tebus','=',$current->year) - // ->sum('pinjaman'); - - $tebus = Gadai::on($cawangan['mysql']) - ->where('sttebus','=','T') - ->whereNull('hargajualan') - ->whereYear('t_gadai','=',$current->year) - ->sum('pinjaman'); - - $tebustawarruq = Gadai::on($cawangan['mysql']) - ->where('sttebus','=','T') - ->whereNotNull('hargajualan') - ->whereYear('t_gadai','=',$current->year) - ->sum('pinjaman'); + $tebustawarruq = Tebus::on($cawangan['mysql']) + ->leftJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan') + ->whereNotNull('gadai.hargajualan') + ->whereYear('tebus.t_tebus','=',$current->year) + ->sum('tebus.pinjaman'); + $gadvar = $gadai + $gadaitawarruq; + $tebvar = $tebus + $tebustawarruq; //Variasi - $variasi = $gadai - $tebus; + $variasi = $gadvar - $tebvar; //Outstanding $outstanding = Gadai::on($cawangan['mysql']) ->where('sttebus','=','') - ->orderBy('t_gadai','desc') ->sum('pinjaman'); array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]); @@ -853,7 +841,6 @@ class GadaiController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->where('t_gadai','=',$request->tarikh) - ->where('sttebus','=','') ->orderBy('t_gadai') ->get(); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1882476..7fb3641 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -517,4 +517,29 @@ class LelongController extends Controller return response()->json($lelong,200); } + public function checkSerahLelong(Request $request) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $lelong = Lelong::on($cawangan['mysql']) + ->where('norujukan', '=', $request->norujukan) + ->where('t_lelong', '=', $current->toDateString()) + ->first(); + + if($lelong) + { + if($lelong['lel1stop'] == 1) + { + return response(1); + }else{ + return response(0); + } + }else{ + return response(0); + } + } + } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 12c0f76..8d0c166 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -506,7 +506,7 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tebus = Tebus::on($cawangan['mysql']) - ->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg') + ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg') ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') ->join('online_arrahn.customer as cust', function($join) { @@ -541,7 +541,13 @@ class TebusController extends Controller ->where('t_tebus','=',$request->tarikh) ->whereNotNull('hargajualan'); - $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman'); + $tebustawarruqansuran = Tebus::on($cawangan['mysql']) + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') + ->where('t_tebus','=',$request->tarikh) + ->whereNotNull('hargajualan') + ->where('hargajualan','<>','bakihargajualan'); + + $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); $bilpenebusantawarruq = $tebustawarruq->count(); $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); @@ -615,6 +621,20 @@ class TebusController extends Controller return response()->json($wakil,200); } + public function FirstWakil($kodcaw) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $wakil = Wakil::on($cawangan['mysql']) + ->orderBy('nowakil','desc') + ->first(); + + if($wakil['nowakil']) + return response($wakil['nowakil']); + else + return response(0); + } + public function getWakil($kodcaw,$icno){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); @@ -1041,7 +1061,6 @@ class TebusController extends Controller $penghutangkaki = imbangdugalama::on($cawangan['mysql']) ->sum('penghutang'); - return response()->json($penghutangkaki,200); } @@ -1211,4 +1230,35 @@ class TebusController extends Controller return response($rebet); } + public function getUpahLamaToday($kodcaw,$norujukan) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $listadvansur = Advansur::on($cawangan['mysql']) + ->where('norujukan','=',$norujukan) + ->where('tarikh','=',$current->toDateString()) + ->orderBy('tarikh','desc') + ->get(); + + if(sizeof($listadvansur) > 0) + return response(1); + else + return response(0); + } + + public function removeUpahLamaToday($kodcaw,$norujukan) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $removed = Advansur::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + + if($removed) + return response(1); + else + return response(0); + } + } diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index ecd4283..d29f2dc 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -96,4 +96,11 @@ class TransactionController extends Controller return response()->json($transaction); } + + public function getTransactionByRujukanAll($norujukan){ + + $transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->get(); + + return response()->json($transaction); + } } \ No newline at end of file diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index b4f9725..ded94ed 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -272,6 +272,20 @@ class TunaiController extends Controller return response()->json($requestteller); } + public function getRequestTellerLaporanSerahanBerkala($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + $requestteller=RequestTeller::on('mysql7') + ->where([['kodcaw','=',$kodcaw],['update','=',1],['serahan','>',0],['kodlaluan','=',$request->teller],['tarikh','=',$current->toDateString()]]) + ->orderBy('recno','desc') + ->first(); + + return response()->json($requestteller); + } + public function getRequestTellerByDate($kodcaw,Request $request) { diff --git a/config/database.php b/config/database.php index da7a044..eebc494 100644 --- a/config/database.php +++ b/config/database.php @@ -16,6 +16,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql2' => [ 'driver' => 'mysql', @@ -28,6 +29,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql3' => [ 'driver' => 'mysql', @@ -40,6 +42,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql4' => [ 'driver' => 'mysql', @@ -52,6 +55,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql5' => [ 'driver' => 'mysql', @@ -64,6 +68,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], @@ -78,6 +83,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], @@ -92,6 +98,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql8' => [ 'driver' => 'mysql', @@ -104,6 +111,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql9' => [ diff --git a/routes/web.php b/routes/web.php index da3801b..86b43f6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -65,6 +65,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('check/serah/gadai',['uses'=>'GadaiController@checkSerahGadaian']); $router->get('check/serah/tebus',['uses'=>'TebusController@checkSerahTebus']); + $router->get('check/serah/lelong',['uses'=>'LelongController@checkSerahLelong']); $router->get('gadai/serah_marhun/khazanah/{kodcaw}',['uses'=>'GadaiController@serahMarhunKhazanah']); $router->get('gadai/serah_marhun/khazanah/petibesi/{kodcaw}',['uses'=>'GadaiController@serahPetiBesi']); @@ -175,7 +176,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('transaction/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan']); $router->get('transaction/one/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanOne']); $router->get('transaction/id/{id}',['uses'=>'TransactionController@getTransactionByid']); + $router->get('transaction/norujukan/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanAll']); + $router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']); $router->get('transaksi_keuntungan/{norujukan}',['uses'=>'TransaksiKeuntunganController@getTransaksiKeuntunganByRujukan']); @@ -214,6 +217,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('advansurdetailsrange/{kodcaw}',['uses'=>'TebusController@advansurdetailsRange']); $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']); $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']); + $router->get('upahlamatoday/{kodcaw}/{norujukan}',['uses'=>'TebusController@getUpahLamaToday']); + $router->post('removeupahlamatoday/{kodcaw}/{norujukan}',['uses'=>'TebusController@removeUpahLamaToday']); //POLIS API $router->get('polis/get/',['uses'=>'PolisController@getPolis']); @@ -294,6 +299,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']); $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']); $router->get('requestTeller/getlaporan/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahan']); + $router->get('requestTeller/getlaporanberkala/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahanBerkala']); $router->get('requestTeller/get/{kodcaw}/date',['uses' => 'TunaiController@getRequestTellerByDate']); $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']); $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']); @@ -308,6 +314,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API WAKIL $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']); + $router->get('firstwakil/{kodcaw}',['uses' => 'TebusController@FirstWakil']); $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']); $router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']); $router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);