From efcff2e4a1878ec1adf439ef450fc441a8a745a4 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Thu, 8 Jul 2021 12:22:25 +0800 Subject: [PATCH] server --- app/Http/Controllers/GadaiController.php | 62 +++++++++++++++++++--- app/Http/Controllers/LaporanController.php | 11 +++- app/Http/Controllers/LelongController.php | 13 ++++- app/Http/Controllers/TebusController.php | 39 ++++++++++---- app/Http/Controllers/VaultController.php | 8 ++- storage/app/.gitignore | 0 storage/framework/cache/.gitignore | 0 storage/framework/cache/data/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 10 files changed, 113 insertions(+), 20 deletions(-) mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/cache/data/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2c4d88d..54437f2 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -554,14 +554,15 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $gadai = Gadai::on($cawangan['mysql']) - ->select('Gadai.t_gadai','Gadai.norujukan','cust.nama','Gadai.nokp','Gadai.semakbarcode','Gadai.masa','Gadai.berat','Gadai.nilaimarhun','Gadai.pinjaman','Gadai.upah12','Gadai.percentpinj','cust.alamat1','Gadai.teller') - ->join('Customer as cust', function($join) + ->select('gadai.t_gadai','gadai.norujukan','cust.nama','gadai.nokp','gadai.semakbarcode','gadai.masa','gadai.berat','gadai.nilaimarhun','gadai.pinjaman','gadai.upah12','gadai.percentpinj','cust.alamat1','gadai.teller') + ->join('online_arrahn.customer as cust', function($join) { - $join->on('Gadai.nokp', '=', 'cust.kpbaru'); - $join->orOn('Gadai.nokp', '=', 'cust.kplama'); + $join->on('gadai.nokp', '=', 'cust.kpbaru'); + $join->orOn('gadai.nokp', '=', 'cust.kplama'); }) - ->where('Gadai.t_gadai','=',$tarikh) - ->orderBy('Gadai.teller') + ->where('gadai.t_gadai','=',$tarikh) + ->orderBy('gadai.teller') + ->orderBy('gadai.sirig') ->get(); return response()->json($gadai); @@ -2298,6 +2299,55 @@ class GadaiController extends Controller case 'ARP': $tarikhtawarruq = '2021-06-15'; break; + case '010621': + $tarikhtawarruq = '2021-06-21'; + break; + case '010136': + $tarikhtawarruq = '2021-06-20'; + break; + case '011235': + $tarikhtawarruq = '2021-06-21'; + break; + case '011227': + $tarikhtawarruq = '2021-06-21'; + break; + case '010620': + $tarikhtawarruq = '2021-06-21'; + break; + case '010617': + $tarikhtawarruq = '2021-06-21'; + break; + case '010915': + $tarikhtawarruq = '2021-06-22'; + break; + case '011228': + $tarikhtawarruq = '2021-06-22'; + break; + case '010219': + $tarikhtawarruq = '2021-06-22'; + break; + case '011229': + $tarikhtawarruq = '2021-06-22'; + break; + break; + case '011230': + $tarikhtawarruq = '2021-06-23'; + break; + case '011013': + $tarikhtawarruq = '2021-06-23'; + break; + case '011412': + $tarikhtawarruq = '2021-06-23'; + break; + case '011234': + $tarikhtawarruq = '2021-06-22'; + break; + case '020303': + $tarikhtawarruq = '2021-06-23'; + break; + case '010618': + $tarikhtawarruq = '2021-06-23'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index cf17956..8b58e61 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -379,7 +379,16 @@ class LaporanController extends Controller ->where('glcode','=','3000/120') ->sum('amaun'); - $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; + if($kodcaw == '011229') + { + $peruntukanhapuskira = GlCode::on($cawangan['mysql']) + ->where('glcode','=','1000/015') + ->sum('amaun'); + }else{ + $peruntukanhapuskira = 0; + } + + $arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; return response()->json($arrayxtra); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index f5b61c5..32bd2b6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -201,6 +201,17 @@ class LelongController extends Controller if($kodcaw == 'APM') $bakilelong += 4498.1; + if($kodcaw == '010617') + $rugitotal -= 6.1; + + if($kodcaw == '011229'){ + $rugitotal -= 919.7; + $bakilelong -= 144; + } + + if($kodcaw == '011412') + $rugitotal -= 7248.4; + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; return response()->json($arraylelong,200); @@ -421,4 +432,4 @@ class LelongController extends Controller return response()->json($cajperkhidmatan,200); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 57f43c7..ec38315 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -61,7 +61,13 @@ class TebusController extends Controller $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']); $upah_semasa_round = number_format($upahsemasa_raw,2); + if(strpos($upah_semasa_round,',')){ + $upah_semasa_round = str_replace(',','',$upah_semasa_round); + } $upah_semasa = (float)substr($upah_semasa_round, 0, -1); + if(strpos($upah_semasa,',')){ + $upah_semasa = str_replace(',','',$upah_semasa); + } return $upah_semasa; } @@ -80,7 +86,13 @@ class TebusController extends Controller $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); $upah_rebet_round = number_format($upahrebet_raw,2); + if(strpos($upah_rebet_round,',')){ + $upah_rebet_round = str_replace(',','',$upah_rebet_round); + } $upah_rebet = (float)substr($upah_rebet_round, 0, -1); + if(strpos($upah_rebet,',')){ + $upah_rebet = str_replace(',','',$upah_rebet); + } return $upah_rebet; } @@ -494,15 +506,16 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tebus = Tebus::on($cawangan['mysql']) - ->select('tebus.t_tebus', 'gad.t_gadai','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('Customer as cust', function($join) + ->select('tebus.t_tebus', 'gad.t_gadai','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) { $join->on('gad.nokp', '=', 'cust.kpbaru'); $join->orOn('gad.nokp', '=', 'cust.kplama'); }) - ->where('Tebus.t_tebus','=',$tarikh) - ->orderBy('Tebus.teller') + ->where('tebus.t_tebus','=',$tarikh) + ->orderBy('tebus.teller') + ->orderBy('tebus.sirit') ->get(); return response()->json($tebus); @@ -954,7 +967,9 @@ class TebusController extends Controller $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter; - + + if($kodcaw == '011229') + $total -= 45390.37; return response()->json($total,200); } @@ -994,7 +1009,7 @@ class TebusController extends Controller $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' ,'<', '2021-06-09') ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') @@ -1008,8 +1023,9 @@ class TebusController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','!=','A') - ->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','>=', '2021-06-09') + //->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); @@ -1022,8 +1038,9 @@ class TebusController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','=','A') - ->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','>=', '2021-06-09') + //->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 4625997..a45d321 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -321,7 +321,7 @@ class VaultController extends Controller //Sebelum Tawarruq - if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621') + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915') { $serahanpkb = GlDetail::on($cawangan['mysql']) ->where('dtacct','=',$serahanpkb) @@ -398,6 +398,12 @@ class VaultController extends Controller ->where('glcode','=',$serahankoperasi) ->sum('amaun'); + if($kodcaw == '011229') + $totalserahan -= 0.10; + + if($kodcaw == '011013') + $totalserahan += 641000; + $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb]; return response()->json($arraypend); diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755