From db2968682896094f969b15daafbca1b8b6e41158 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 20 Apr 2021 14:13:59 +0800 Subject: [PATCH 1/4] add ansuran lejer am --- app/Http/Controllers/TransactionController.php | 14 ++++++++++++++ routes/web.php | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index b333220..ecd4283 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -9,6 +9,7 @@ use App\Cawangan; use Illuminate\Http\Request; use Carbon\Carbon; +use DB; class TransactionController extends Controller { @@ -82,4 +83,17 @@ class TransactionController extends Controller return response()->json($pengguna); } + + public function getSumBayaran_Ansuran($kodcaw,$norujukan) + { + + $current = Carbon::now(); + $current = new Carbon(); + $tarikh = $current->toDateString(); + + $transaction=DB::connection('mysql7')->select("SELECT SUM(duit_masuk) AS cash_in FROM transaction WHERE DATE(created_at)='".$tarikh."' AND kodcaw='".$kodcaw."' AND norujukan ='".$norujukan."'" ); + + return response()->json($transaction); + + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 387344a..081e3ae 100644 --- a/routes/web.php +++ b/routes/web.php @@ -355,6 +355,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //-- Untung Rugi --// $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar + + //END IMBANG DUGA// @@ -363,6 +365,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413 $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); // new added 20210413 + + //-- Ansuran GLEJER --// + $router->get('ansuranByrKaunter/{kodcaw}/{norujukan}',['uses'=>'TransactionController@getSumBayaran_Ansuran']); //Komuditi Pukal From cbf21fca233a33b7d851e55f20a2e9773fcbc8a2 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Tue, 20 Apr 2021 21:43:57 +0800 Subject: [PATCH 2/4] fix dashboard --- app/Http/Controllers/GadaiController.php | 38 +++++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index c385231..70285d0 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -581,18 +581,40 @@ class GadaiController extends Controller //Gadai Terkumpul $gadai = Gadai::on($cawangan['mysql']) ->where('sttebus','=','') + ->whereNull('hargajualan') ->whereYear('t_gadai','=',$current->year) - ->orderBy('t_gadai','desc') ->sum('pinjaman'); - //Tebus Terkumpul - $tebus = Tebus::on($cawangan['mysql']) - ->where('jenistebus','=','T') - ->whereYear('t_tebus','=',$current->year) - ->orderBy('t_tebus','desc') + $gadaitawarruq = Gadai::on($cawangan['mysql']) + ->where('sttebus','=','') + ->whereNotNull('hargajualan') + ->whereYear('t_gadai','=',$current->year) ->sum('pinjaman'); - //Upah Terkumpul + // //Tebus Terkumpul + // $tebus = Tebus::on($cawangan['mysql']) + // ->where('jenistebus','=','T') + // ->whereNull('hargajualan') + // ->whereYear('t_tebus','=',$current->year) + // ->sum('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'); //Variasi @@ -605,7 +627,7 @@ class GadaiController extends Controller ->orderBy('t_gadai','desc') ->sum('pinjaman'); - array_push($array_dashboard,["gadai" => $gadai,"tebus" => $tebus, "variasi" => $variasi, "outstanding" => $outstanding]); + array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]); return response()->json($array_dashboard); } From 173932f599a96f04d6273107d8d40c62fed8d5eb Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 21 Apr 2021 01:32:33 +0800 Subject: [PATCH 3/4] gadai dlu --- app/Http/Controllers/GadaiController.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 70285d0..1735b3d 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1439,7 +1439,8 @@ class GadaiController extends Controller $totalkeluar = $keluar - $tebus['addpinjaman']; $totalmasuk = $masuk - $tebus['bakiupah']; - $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan; + // $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan; + $bakiakhir = $baki - $totalkeluar + $totalmasuk; $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array( @@ -1453,7 +1454,8 @@ class GadaiController extends Controller $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']); $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']); - $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan; + // $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan; + $bakiakhir = ($baki - $totalmasuk) + $totalkeluar; // dd($totalmasuk,$totalkeluar,$bakiakhir); @@ -1483,7 +1485,10 @@ class GadaiController extends Controller }else{ - $bakiakhir = $bakiakhir - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']); + $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']); + $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']); + + $bakiakhir = ($bakiakhir - $totalmasuk) + $totalkeluar; $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array( @@ -1581,7 +1586,8 @@ class GadaiController extends Controller { $totalmasuk = $masuk - $tebus[0]['bakipjm']; - $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; + // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; + $bakiakhir = $baki - $totalmasuk; $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array( From 4e5e06a753837a1cd2377ed35367622f94629626 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 21 Apr 2021 11:44:12 +0800 Subject: [PATCH 4/4] fix batal --- app/Http/Controllers/GadaiController.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 1735b3d..3bb56ad 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1436,11 +1436,11 @@ class GadaiController extends Controller if($tebus['jenistebus'] == 'P') { - $totalkeluar = $keluar - $tebus['addpinjaman']; - $totalmasuk = $masuk - $tebus['bakiupah']; + $totalkeluar = $keluar - ($tebus['addpinjaman'] + $tebus['pinjaman']); + $totalmasuk = $masuk - ($tebus['bakiupah'] + $tebus['pinjaman']); // $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan; - $bakiakhir = $baki - $totalkeluar + $totalmasuk; + $bakiakhir = $baki - $tebus['bakiupah'] + $tebus['addpinjaman']; $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array( @@ -1455,7 +1455,9 @@ class GadaiController extends Controller $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']); $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']); // $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan; - $bakiakhir = ($baki - $totalmasuk) + $totalkeluar; + + if($tebus['jenistebus'] == 'S') + $bakiakhir = $baki - $tebus['bakipjm']; // dd($totalmasuk,$totalkeluar,$bakiakhir); @@ -1486,9 +1488,10 @@ class GadaiController extends Controller }else{ $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']); - $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']); + $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']); - $bakiakhir = ($bakiakhir - $totalmasuk) + $totalkeluar; + if($tebus['jenistebus'] == 'S') + $bakiakhir = ($bakiakhir - $tebus['bakipjm']); $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array( @@ -1587,7 +1590,7 @@ class GadaiController extends Controller $totalmasuk = $masuk - $tebus[0]['bakipjm']; // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; - $bakiakhir = $baki - $totalmasuk; + $bakiakhir = $baki - $tebus[0]['bakipjm']; $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> update(array(