diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 77fc20d..3b38bac 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -44,6 +44,8 @@ use App\StokAudit10; use App\StokAudit11; use App\StokAudit12; use App\AuditCustomer; +use App\imbangdugalama; +use App\HapusKira; use DB; use DateTime; @@ -81,7 +83,7 @@ class AdminPageController extends Controller ->where([['kodcaw','=',$kodcaw],['tarikh','<=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]]) ->orderBy('tarikh','desc') ->paginate(5); - + return response()->json($tunai); } @@ -105,7 +107,7 @@ class AdminPageController extends Controller public function getAddTunaiDateKodlaluan($kodcaw,Request $request) { - + $current = Carbon::now(); $current = new Carbon(); @@ -159,7 +161,7 @@ class AdminPageController extends Controller return response()->json($lelong,200); } - + public function PetiBesiPaginateforAdmin($kodcaw,Request $request) { @@ -172,16 +174,16 @@ class AdminPageController extends Controller ->where('kodcaw','=',$kodcaw) ->orderby('tarikh','desc') ->paginate(5); - + return response()->json($vault); } public function TahunanGadai(Request $request) { - + $current = Carbon::now(); $current = new Carbon(); - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $arrayGadai = []; @@ -189,42 +191,42 @@ class AdminPageController extends Controller ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Gadai') - ->whereYear('bajettahunan.tahun', '=', $current->year) + ->whereYear('bajettahunan.tahun', '=', $request->year) ->sum('nilaibajet'); $gadai = Gadai::on($cawangan['mysql']) ->selectRaw('SUM(pinjaman) AS totalpinjaman') - ->whereYear('t_gadai',$current->year) + ->whereYear('t_gadai',$request->year) ->sum('pinjaman'); - + array_push($arrayGadai,['bajet' => $bajetgroup,'total' => $gadai]); return response()->json($arrayGadai); } public function TahunanTebus(Request $request) - { + { $current = Carbon::now(); $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - + $arrayTebus = []; $bajetgroup = BajetTahunan::on('mysql7') ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Penebusan') - ->whereYear('bajettahunan.tahun', '=', $current->year) + ->whereYear('bajettahunan.tahun', '=', $request->year) ->sum('nilaibajet'); $tebus = Gadai::on($cawangan['mysql']) - ->whereYear('t_update',$current->year) + ->whereYear('t_update',$request->year) ->where('sttebus','!=','') ->sum('pinjaman'); - + array_push($arrayTebus,['bajet' => $bajetgroup,'total' => $tebus]); return response()->json($arrayTebus); @@ -232,12 +234,12 @@ class AdminPageController extends Controller public function TahunanKeuntungan(Request $request) { - + $current = Carbon::now(); $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - + $arrayKeuntungan = []; $monthly = Carbon::now(); @@ -249,8 +251,8 @@ class AdminPageController extends Controller ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Keuntungan') - ->whereYear('bajettahunan.tahun', '=', $current->year) - ->sum('nilaibajet'); + ->whereYear('bajettahunan.tahun', '=', $request->year) + ->sum('nilaibajet'); $tebus_arrahn = Tebus::on($cawangan['mysql']) ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan') @@ -259,7 +261,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_tebus,'%Y%m')")) - ->whereYear('t_tebus',$current->year) + ->whereYear('t_tebus',$request->year) ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()]]) ->orderBy('t_tebus','asc') ->get()->toArray(); @@ -270,7 +272,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(tarikh,'%Y%m')")) - ->whereYear('tarikh',$current->year) + ->whereYear('tarikh',$request->year) ->where([['tarikh','<=',$current->toDateString()]]) ->get()->toArray(); @@ -280,7 +282,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')")) - ->whereYear('transaction.created_at',$current->year) + ->whereYear('transaction.created_at',$request->year) ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -297,7 +299,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')")) - ->whereYear('transaction.created_at',$current->year) + ->whereYear('transaction.created_at',$request->year) ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -315,7 +317,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_jual,'%Y%m')")) - ->whereYear('t_jual',$current->year) + ->whereYear('t_jual',$request->year) ->orderBy('t_jual','asc') ->get()->toArray(); @@ -382,50 +384,50 @@ class AdminPageController extends Controller $array_totalup = []; for($i=0;$i<12;$i++){ - + switch($i+1){ case 1: $namabulan = 'Jan'; - $tarikh = $current->year . '-' . '01'; + $tarikh = $request->year . '-' . '01'; break; case 2: $namabulan = 'Feb'; - $tarikh = $current->year . '-' . '02'; + $tarikh = $request->year . '-' . '02'; break; case 3: $namabulan = 'Mac'; - $tarikh = $current->year . '-' . '03'; + $tarikh = $request->year . '-' . '03'; break; case 4: $namabulan = 'Apr'; - $tarikh = $current->year . '-' . '04'; + $tarikh = $request->year . '-' . '04'; break; case 5: $namabulan = 'Mei'; - $tarikh = $current->year . '-' . '05'; + $tarikh = $request->year . '-' . '05'; break; case 6: $namabulan = 'Jun'; - $tarikh = $current->year . '-' . '06'; + $tarikh = $request->year . '-' . '06'; break; case 7: $namabulan = 'Jul'; - $tarikh = $current->year . '-' . '07'; + $tarikh = $request->year . '-' . '07'; break; case 8: $namabulan = 'Aug'; - $tarikh = $current->year . '-' . '08'; + $tarikh = $request->year . '-' . '08'; break; case 9: $namabulan = 'Sep'; - $tarikh = $current->year . '-' . '09'; + $tarikh = $request->year . '-' . '09'; break; case 10: $namabulan = 'Okt'; - $tarikh = $current->year . '-' . '10'; + $tarikh = $request->year . '-' . '10'; break; case 11: $namabulan = 'Nov'; - $tarikh = $current->year . '-' . '11'; + $tarikh = $request->year . '-' . '11'; break; case 12: $namabulan = 'Dis'; - $tarikh = $current->year . '-' . '12'; + $tarikh = $request->year . '-' . '12'; break; - + } array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'pembiayaan'=>0,'bajetgadai'=> 0]); } @@ -438,7 +440,7 @@ class AdminPageController extends Controller ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Gadai') - ->whereYear('bajettahunan.tahun', '=', $current->year) + ->whereYear('bajettahunan.tahun', '=', $request->year) ->get(); foreach($bajetgroup as $index1=>$bj) @@ -449,14 +451,14 @@ class AdminPageController extends Controller $arrayPembiayaan = array(); $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']]; - + $gadai = Gadai::on($cawangan['mysql']) ->selectRaw('SUM(pinjaman) AS totalpinjaman') ->addSelect(DB::connection($cawangan['mysql']) ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_gadai,'%Y%m')")) - ->whereYear('t_gadai',$current->year) + ->whereYear('t_gadai',$request->year) ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]]) ->orderBy('t_gadai','asc') ->get(); @@ -472,9 +474,9 @@ class AdminPageController extends Controller $goals[0]['value'] = (sizeof($bajetgadai) > 0) ? $bajetgadai[$array_index] : 0; array_push($arrayPembiayaan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_gadai,'goals' => (array) $goals]); $total_gadai = 0; - + } - + return response()->json($arrayPembiayaan); } @@ -498,47 +500,47 @@ class AdminPageController extends Controller switch($i+1){ case 1: $namabulan = 'Jan'; - $tarikh = $current->year . '-' . '01'; + $tarikh = $request->year . '-' . '01'; break; case 2: $namabulan = 'Feb'; - $tarikh = $current->year . '-' . '02'; + $tarikh = $request->year . '-' . '02'; break; case 3: $namabulan = 'Mac'; - $tarikh = $current->year . '-' . '03'; + $tarikh = $request->year . '-' . '03'; break; case 4: $namabulan = 'Apr'; - $tarikh = $current->year . '-' . '04'; + $tarikh = $request->year . '-' . '04'; break; case 5: $namabulan = 'Mei'; - $tarikh = $current->year . '-' . '05'; + $tarikh = $request->year . '-' . '05'; break; case 6: $namabulan = 'Jun'; - $tarikh = $current->year . '-' . '06'; + $tarikh = $request->year . '-' . '06'; break; case 7: $namabulan = 'Jul'; - $tarikh = $current->year . '-' . '07'; + $tarikh = $request->year . '-' . '07'; break; case 8: $namabulan = 'Aug'; - $tarikh = $current->year . '-' . '08'; + $tarikh = $request->year . '-' . '08'; break; case 9: $namabulan = 'Sep'; - $tarikh = $current->year . '-' . '09'; + $tarikh = $request->year . '-' . '09'; break; case 10: $namabulan = 'Okt'; - $tarikh = $current->year . '-' . '10'; + $tarikh = $request->year . '-' . '10'; break; case 11: $namabulan = 'Nov'; - $tarikh = $current->year . '-' . '11'; + $tarikh = $request->year . '-' . '11'; break; case 12: $namabulan = 'Dis'; - $tarikh = $current->year . '-' . '12'; + $tarikh = $request->year . '-' . '12'; break; - + } array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'bilgadai'=>0,'bajetgadai'=> 0]); } @@ -551,7 +553,7 @@ class AdminPageController extends Controller ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Bilangan-Gadai') - ->whereYear('bajettahunan.tahun', '=', $current->year) + ->whereYear('bajettahunan.tahun', '=', $request->year) ->get(); foreach($bajetgroup as $index1=>$bj) @@ -562,14 +564,14 @@ class AdminPageController extends Controller $arrayPembiayaan = array(); $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']]; - + $gadai = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bilangangadai') ->addSelect(DB::connection($cawangan['mysql']) ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_gadai,'%Y%m')")) - ->whereYear('t_gadai',$current->year) + ->whereYear('t_gadai',$request->year) ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]]) ->orderBy('t_gadai','asc') ->get(); @@ -586,9 +588,9 @@ class AdminPageController extends Controller $goals[0]['value'] = (sizeof($bajetgadai) > 0) ? $bajetgadai[$array_index] : 0; array_push($arrayPembiayaan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_gadai,'goals' => (array) $goals]); $total_gadai = 0; - + } - + return response()->json($arrayPembiayaan); } @@ -609,50 +611,50 @@ class AdminPageController extends Controller $array_totalup = []; for($i=0;$i<12;$i++){ - + switch($i+1){ case 1: $namabulan = 'Jan'; - $tarikh = $current->year . '-' . '01'; + $tarikh = $request->year . '-' . '01'; break; case 2: $namabulan = 'Feb'; - $tarikh = $current->year . '-' . '02'; + $tarikh = $request->year . '-' . '02'; break; case 3: $namabulan = 'Mac'; - $tarikh = $current->year . '-' . '03'; + $tarikh = $request->year . '-' . '03'; break; case 4: $namabulan = 'Apr'; - $tarikh = $current->year . '-' . '04'; + $tarikh = $request->year . '-' . '04'; break; case 5: $namabulan = 'Mei'; - $tarikh = $current->year . '-' . '05'; + $tarikh = $request->year . '-' . '05'; break; case 6: $namabulan = 'Jun'; - $tarikh = $current->year . '-' . '06'; + $tarikh = $request->year . '-' . '06'; break; case 7: $namabulan = 'Jul'; - $tarikh = $current->year . '-' . '07'; + $tarikh = $request->year . '-' . '07'; break; case 8: $namabulan = 'Aug'; - $tarikh = $current->year . '-' . '08'; + $tarikh = $request->year . '-' . '08'; break; case 9: $namabulan = 'Sep'; - $tarikh = $current->year . '-' . '09'; + $tarikh = $request->year . '-' . '09'; break; case 10: $namabulan = 'Okt'; - $tarikh = $current->year . '-' . '10'; + $tarikh = $request->year . '-' . '10'; break; case 11: $namabulan = 'Nov'; - $tarikh = $current->year . '-' . '11'; + $tarikh = $request->year . '-' . '11'; break; case 12: $namabulan = 'Dis'; - $tarikh = $current->year . '-' . '12'; + $tarikh = $request->year . '-' . '12'; break; - + } array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'penebusan'=>0,'bajettebus' => 0]); } @@ -663,7 +665,7 @@ class AdminPageController extends Controller ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Penebusan') - ->whereYear('bajettahunan.tahun', '=', $current->year) + ->whereYear('bajettahunan.tahun', '=', $request->year) ->get(); foreach($bajetgroup as $index1=>$bj) @@ -683,7 +685,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_update,'%Y%m')")) - ->whereYear('t_update',$current->year) + ->whereYear('t_update',$request->year) ->where([['sttebus','!=',''],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]]) ->orderBy('t_update','asc') ->get()->toArray(); @@ -694,7 +696,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')")) - ->whereYear('transaction.created_at',$current->year) + ->whereYear('transaction.created_at',$request->year) ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -703,7 +705,7 @@ class AdminPageController extends Controller ->where('transaction.trans_type','=','A') ->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$current->toDateString() . ' 23:59:59']]) ->where('trans.kodcaw','=',$request->kodcaw) - ->get()->toArray(); + ->get()->toArray(); $total_tebus = 0; foreach($array_totalup as $array_index=>$totalup){ @@ -745,47 +747,47 @@ class AdminPageController extends Controller switch($i+1){ case 1: $namabulan = 'Jan'; - $tarikh = $current->year . '-' . '01'; + $tarikh = $request->year . '-' . '01'; break; case 2: $namabulan = 'Feb'; - $tarikh = $current->year . '-' . '02'; + $tarikh = $request->year . '-' . '02'; break; case 3: $namabulan = 'Mac'; - $tarikh = $current->year . '-' . '03'; + $tarikh = $request->year . '-' . '03'; break; case 4: $namabulan = 'Apr'; - $tarikh = $current->year . '-' . '04'; + $tarikh = $request->year . '-' . '04'; break; case 5: $namabulan = 'Mei'; - $tarikh = $current->year . '-' . '05'; + $tarikh = $request->year . '-' . '05'; break; case 6: $namabulan = 'Jun'; - $tarikh = $current->year . '-' . '06'; + $tarikh = $request->year . '-' . '06'; break; case 7: $namabulan = 'Jul'; - $tarikh = $current->year . '-' . '07'; + $tarikh = $request->year . '-' . '07'; break; case 8: $namabulan = 'Aug'; - $tarikh = $current->year . '-' . '08'; + $tarikh = $request->year . '-' . '08'; break; case 9: $namabulan = 'Sep'; - $tarikh = $current->year . '-' . '09'; + $tarikh = $request->year . '-' . '09'; break; case 10: $namabulan = 'Okt'; - $tarikh = $current->year . '-' . '10'; + $tarikh = $request->year . '-' . '10'; break; case 11: $namabulan = 'Nov'; - $tarikh = $current->year . '-' . '11'; + $tarikh = $request->year . '-' . '11'; break; case 12: $namabulan = 'Dis'; - $tarikh = $current->year . '-' . '12'; + $tarikh = $request->year . '-' . '12'; break; - + } array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'bilpenebusan'=>0,'bajettebus' => 0]); } @@ -798,7 +800,7 @@ class AdminPageController extends Controller ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Bilangan-Tebus') - ->whereYear('bajettahunan.tahun', '=', $current->year) + ->whereYear('bajettahunan.tahun', '=', $request->year) ->get(); foreach($bajetgroup as $index1=>$bj) @@ -818,7 +820,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_update,'%Y%m')")) - ->whereYear('t_update',$current->year) + ->whereYear('t_update',$request->year) ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]]) ->orderBy('t_update','asc') ->get(); @@ -859,51 +861,51 @@ class AdminPageController extends Controller $array_totalup = []; for($i=0;$i<12;$i++){ - + switch($i+1){ case 1: $namabulan = 'Jan'; - $tarikh = $current->year . '-' . '01'; + $tarikh = $request->year . '-' . '01'; break; case 2: $namabulan = 'Feb'; - $tarikh = $current->year . '-' . '02'; + $tarikh = $request->year . '-' . '02'; break; case 3: $namabulan = 'Mac'; - $tarikh = $current->year . '-' . '03'; + $tarikh = $request->year . '-' . '03'; break; case 4: $namabulan = 'Apr'; - $tarikh = $current->year . '-' . '04'; + $tarikh = $request->year . '-' . '04'; break; case 5: $namabulan = 'Mei'; - $tarikh = $current->year . '-' . '05'; + $tarikh = $request->year . '-' . '05'; break; case 6: $namabulan = 'Jun'; - $tarikh = $current->year . '-' . '06'; + $tarikh = $request->year . '-' . '06'; break; case 7: $namabulan = 'Jul'; - $tarikh = $current->year . '-' . '07'; + $tarikh = $request->year . '-' . '07'; break; case 8: $namabulan = 'Aug'; - $tarikh = $current->year . '-' . '08'; + $tarikh = $request->year . '-' . '08'; break; case 9: $namabulan = 'Sep'; - $tarikh = $current->year . '-' . '09'; + $tarikh = $request->year . '-' . '09'; break; case 10: $namabulan = 'Okt'; - $tarikh = $current->year . '-' . '10'; + $tarikh = $request->year . '-' . '10'; break; case 11: $namabulan = 'Nov'; - $tarikh = $current->year . '-' . '11'; + $tarikh = $request->year . '-' . '11'; break; case 12: $namabulan = 'Dis'; - $tarikh = $current->year . '-' . '12'; + $tarikh = $request->year . '-' . '12'; break; - + } array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'keuntungan'=>0,'bajetkeuntungan' => 0]); } @@ -912,12 +914,12 @@ class AdminPageController extends Controller // $bajetkeuntungan = array_reverse($bajetkeuntungan); $bajetkeuntungan = []; - + $bajetgroup = BajetTahunan::on('mysql7') ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid') ->where('bajettahunan.kodcaw','=', $request->kodcaw) ->where('jenisbajet','=','Keuntungan') - ->whereYear('bajettahunan.tahun', '=', $current->year) + ->whereYear('bajettahunan.tahun', '=', $request->year) ->get(); foreach($bajetgroup as $index1=>$bj) @@ -930,19 +932,19 @@ class AdminPageController extends Controller $goals = [['name' => 'Expected','value' => 0,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']]; - + $lelongupahsimpan = Lelong::on($cawangan['mysql']) ->selectRaw('SUM(bakiupah) AS total') ->addSelect(DB::connection($cawangan['mysql']) ->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_jual,'%Y%m')")) - ->whereYear('t_jual',$current->year) + ->whereYear('t_jual',$request->year) ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]]) ->orderBy('t_jual','asc') ->get()->toArray(); - + $tebus_arrahn = Tebus::on($cawangan['mysql']) ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan') @@ -951,7 +953,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_tebus,'%Y%m')")) - ->whereYear('t_tebus',$current->year) + ->whereYear('t_tebus',$request->year) ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]]) ->orderBy('t_tebus','asc') ->get()->toArray(); @@ -962,7 +964,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(tarikh,'%Y%m')")) - ->whereYear('tarikh',$current->year) + ->whereYear('tarikh',$request->year) ->where([['tarikh','<=',$current->toDateString()],['tarikh','>=',$monthly_date]]) ->get()->toArray(); @@ -972,7 +974,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')")) - ->whereYear('transaction.created_at',$current->year) + ->whereYear('transaction.created_at',$request->year) ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -989,7 +991,7 @@ class AdminPageController extends Controller ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh')) ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')")) - ->whereYear('transaction.created_at',$current->year) + ->whereYear('transaction.created_at',$request->year) ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -1042,7 +1044,7 @@ class AdminPageController extends Controller } public function showAllGadaiToday(Request $request){ - + $cawangan_all = Cawangan::on('mysql7')->get(); $current = Carbon::now(); $current = new Carbon(); @@ -1054,7 +1056,7 @@ class AdminPageController extends Controller $monthly = Carbon::now(); $monthly = new Carbon(); - + $monthly_date = $monthly->startOfMonth()->toDateString(); $gadailatest = Gadai::on($cawangan['mysql']) @@ -1065,7 +1067,7 @@ class AdminPageController extends Controller switch($current->month){ case 1: $bulan = 'Januari'; - break; + break; case 2: $bulan = 'Februari'; break; case 3: $bulan = 'Mac'; @@ -1110,14 +1112,14 @@ class AdminPageController extends Controller $cummulativegadaian = 0; $percentcum = 0; } - + $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$harini)->sum('pinjaman'); // $gadai_last_week = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$lastweek)->sum('pinjaman'); // $gadaiLastweek += $gadai_last_week; $gadaiToday += $gadai; - + $diffGadaiPercent = 0; if($bajetcollection) @@ -1140,12 +1142,12 @@ class AdminPageController extends Controller $harini = $current->toDateString(); $tebusToday = 0; $tebusLastWeek = 0; - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $monthly = Carbon::now(); $monthly = new Carbon(); - + $monthly_date = $monthly->startOfMonth()->toDateString(); @@ -1158,7 +1160,7 @@ class AdminPageController extends Controller switch($current->month){ case 1: $bulan = 'Januari'; - break; + break; case 2: $bulan = 'Februari'; break; case 3: $bulan = 'Mac'; @@ -1207,16 +1209,16 @@ class AdminPageController extends Controller $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('pinjaman'); $lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$harini)->sum('pinjaman'); - + $tebusToday = $tebus + $lelong; - + $diffTebusPercent = 0; - + if($bajetcollection) $diffTebusPercent = (($tebusToday - $bajetharian)/$bajetharian)*100; else $diffTebusPercent = 0; - + $dataTebus = []; array_push($dataTebus,['tebusToday'=>$tebusToday,'percentDiff'=>$diffTebusPercent,'bajetharian' => $bajetharian,'bulan' => $bulan,'percentcum' => abs(round($percentcum)),'remaining' => $cummulativepenebusan]); return response()->json($dataTebus); @@ -1236,7 +1238,7 @@ class AdminPageController extends Controller $monthly = Carbon::now(); $monthly = new Carbon(); $monthly_date = $monthly->startOfMonth()->toDateString(); - + $lelongupahsimpan = Lelong::on($cawangan['mysql']) ->selectRaw('SUM(bakiupah) AS totalupahlelong') ->whereYear('t_jual',$current->year) @@ -1285,13 +1287,13 @@ class AdminPageController extends Controller ->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']]) ->where('trans.kodcaw','=',$request->kodcaw) ->sum('trans.keuntungan_rebet'); - + $upahlatest = $lelongupahsimpan + $tebus + $ansuran + $advansur + $tebus_upah_tawarruq; switch($current->month){ case 1: $bulan = 'Januari'; - break; + break; case 2: $bulan = 'Februari'; break; case 3: $bulan = 'Mac'; @@ -1336,13 +1338,13 @@ class AdminPageController extends Controller $cummulativekeuntungan = 0; $percentcum = 0; } - - + + $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah'); $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar'); - + $upahToday += $upah_today; - + $ansuran_today = Transaction::on('mysql7') ->leftJoin('transaksi_keuntungan as trans', function($join) { @@ -1382,28 +1384,28 @@ class AdminPageController extends Controller public function getpetibesiSebelumbyTarikh($kodcaw,Request $request) { $current = Carbon::now(); - $current = new Carbon(); - + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $vault=Vault::on($cawangan['mysql']) ->where('kodcaw','=',$kodcaw) ->where('tarikh','<',$request->tarikh) ->orderby('tarikh','desc')->limit(1)->get(); - + return response()->json($vault); - + } public function getGldetailbyTarikh($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - + $gldetail=GlDetail::on($cawangan['mysql']) ->where('kodcaw','=',$kodcaw) ->where('tarikh','=',$request->tarikh) ->where('descpt','NOT LIKE','SERAHAN BAYAR ONLINE%') ->orderby('tarikh','desc')->get(); - + return response()->json($gldetail,200); } @@ -1412,24 +1414,24 @@ class AdminPageController extends Controller { $harini = Carbon::now(); $harini = new Carbon; - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - + $panjar=Panjar::on($cawangan['mysql']) ->where('tarikh','=',$request->tarikh) ->get(); - + return response()->json($panjar); } public function updatePetiBesiAdmin(Request $request) { $current = Carbon::now(); - $current = new Carbon(); - + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first(); $updateVault=Vault::on($cawangan['mysql'])->where('tarikh', '=', $request->tarikh)->update(array( - + 'bakiawal' => $request->bakiawal, 'keluar' => $request->keluar, 'masuk' => $request->masuk, @@ -1438,9 +1440,9 @@ class AdminPageController extends Controller 'totpanjar' => $request->panjar, 'bakiakhir' => $request->bakiakhir, 'bakieod' => $request->bakiakhir - + ) ); - + return response()->json($updateVault, 200); } @@ -1519,7 +1521,7 @@ class AdminPageController extends Controller { $current = Carbon::now(); - $current = new Carbon(); + $current = new Carbon(); $bajettahunan = new BajetTahunan(); @@ -1554,7 +1556,7 @@ class AdminPageController extends Controller public function KemaskiniBajet(Request $request) { - + $bajetjanuari = Bajet::on('mysql7') ->where('bajetid','=',$request->bajetid) ->where('bulan','=','Januari') @@ -1569,12 +1571,12 @@ class AdminPageController extends Controller ->where('bajetid','=',$request->bajetid) ->where('bulan','=','Mac') ->update(['nilaibajet' => $request->bajetmarch]); - + $bajetapril = Bajet::on('mysql7') ->where('bajetid','=',$request->bajetid) ->where('bulan','=','April') ->update(['nilaibajet' => $request->bajetapril]); - + $bajetmei = Bajet::on('mysql7') ->where('bajetid','=',$request->bajetid) ->where('bulan','=','Mei') @@ -1632,14 +1634,14 @@ class AdminPageController extends Controller ->orderBy('tarikhdaftar','desc') ->paginate(5); } - + return response()->json($blacklist); } public function AddSenaraiHitam(Request $request) { - + $customer = Customer::on('mysql7') ->where('kpbaru','=', $request->nokp) ->orWhere('kplama','=', $request->nokp) @@ -1674,19 +1676,20 @@ class AdminPageController extends Controller return response()->json($blacklist, 201); } - + public function UpdateTunaiByTarikh($kodcaw, Request $request) { $current = Carbon::now(); $current = new Carbon(); - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $request->tarikh],['kodlaluan','=', $request->kodlaluan] ])-> update(array( - 'keluar'=>$request->keluar, - 'masuk'=>$request->masuk, - 'baki'=>$request->bakiakhir + 'bakiawal'=>$request->bakiawal, + 'keluar'=>$request->keluar, + 'masuk'=>$request->masuk, + 'baki'=>$request->bakiakhir )); return response()->json($updatetunai, 200); @@ -1732,17 +1735,17 @@ class AdminPageController extends Controller { $harini = Carbon::now(); $harini = new Carbon; - + $cawangan_all = Cawangan::on('mysql7')->get(); $arraykelulusan = []; - - foreach($cawangan_all as $index=>$cawangan){ + + foreach($cawangan_all as $index=>$cawangan){ $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('masalulus','=','') ->where('pelulus','=','operasi') ->get()->toArray(); - + if(sizeof($kelulusan) != 0){ foreach($kelulusan as $index=>$kel) { @@ -1758,29 +1761,29 @@ class AdminPageController extends Controller } $data = $this->paginate($arraykelulusan,3); - + return response()->json($data,200); } - + public function listoperasikelulusan() { $harini = Carbon::now(); $harini = new Carbon; - + $cawangan_all = Cawangan::on('mysql7')->get(); $arraykelulusan = []; - + foreach($cawangan_all as $index=>$cawangan){ $kelulusan=Mohon::on($cawangan['mysql']) ->where('peloperasi','=','operasi') ->where('operasi','!=','') ->get(); - + if(sizeof($kelulusan) != 0){ array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); } - } - + } + return response()->json($arraykelulusan,200); } @@ -1800,7 +1803,7 @@ class AdminPageController extends Controller { foreach($cawangan_all as $index=>$cawangan){ if($status == 'belum_tebus' || $status == 'sudah_tebus'){ - + if($status == 'sudah_tebus') { $gadai = Gadai::on($cawangan['mysql']) @@ -1814,7 +1817,7 @@ class AdminPageController extends Controller ->orderBy('t_gadai','desc') ->get()->toArray(); } - + if(sizeof($gadai) != 0){ $gadai_all += $gadai; } @@ -1832,7 +1835,7 @@ class AdminPageController extends Controller }else{ foreach($cawangan_all as $index=>$cawangan){ if($status == 'belum_tebus' || $status == 'sudah_tebus'){ - + if($status == 'sudah_tebus') { $gadai = Gadai::on($cawangan['mysql']) @@ -1846,7 +1849,7 @@ class AdminPageController extends Controller ->orderBy('t_gadai','desc') ->get()->toArray(); } - + if(sizeof($gadai) != 0){ $gadai_all += $gadai; } @@ -1861,7 +1864,7 @@ class AdminPageController extends Controller } } } - + $data = $this->paginate($gadai_all); return response()->json($data); @@ -1895,7 +1898,7 @@ class AdminPageController extends Controller $status = new Status; $nopermohonan = 'AR' . strtoupper($kodcaw) . $curent_year . $curent_month . $current_day . '-' . $transbaru; - + $permohonan->mohonid = $mohonid; $permohonan->kodcaw = $kodcaw; $permohonan->jenismohon = $request->jenismohon; @@ -1907,11 +1910,11 @@ class AdminPageController extends Controller $permohonan->outstandingsemasa = $request->outstanding; $permohonan->nopermohonan = $nopermohonan; $permohonan->save(); - + $pengesahan->nopermohonan = $permohonan->nopermohonan; $pengesahan->kodcaw = $kodcaw; $pengesahan->save(); - + $status->nopermohonan = $permohonan->nopermohonan; $status->statusid = 1; $status->tarikhmasa = $timeloni->toDateTimeString(); @@ -1957,7 +1960,7 @@ class AdminPageController extends Controller public function GetPermohonanCawangan($kodcaw,Request $request) { - + if($kodcaw === 'admin') { $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan') @@ -1999,7 +2002,7 @@ class AdminPageController extends Controller $permohonanstatus = []; $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan') ->where([['permohonan.kodcaw', $kodcaw],['permohonan.nopermohonan',$mohonid]])->first()->toArray(); - + $status = Status::where('nopermohonan',$mohonid)->get()->toArray(); array_push($listpermohonan,(["status" => $status])); @@ -2039,7 +2042,7 @@ class AdminPageController extends Controller case 8: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['bank_cit'],'invoicefiles' => $stat['invoicefiles_id'],'resitfiles' => $stat['resitfiles_id']]); break; } - + array_push($statusarray,$status_lookup); } @@ -2099,7 +2102,7 @@ class AdminPageController extends Controller } - + public function KelulusanPermohonanByAkaun(Request $request) { $timeloni = Carbon::now(); @@ -2146,7 +2149,7 @@ class AdminPageController extends Controller } return response()->json($pengesahan); - + }catch (\Throwable $e){ return response($e); @@ -2191,7 +2194,7 @@ class AdminPageController extends Controller $ar_files->filename = $request->imagename; $ar_files->tarikhmasa = $timeloni->toDateTimeString(); $ar_files->save(); - + $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]]) ->update(array( 'tagpb' => 1, @@ -2217,7 +2220,7 @@ class AdminPageController extends Controller } return response()->json(1); - + }catch (\Throwable $e){ return response($e); @@ -2261,7 +2264,7 @@ class AdminPageController extends Controller } return response()->json(1); - + }catch (\Throwable $e){ return response($e); @@ -2288,7 +2291,7 @@ class AdminPageController extends Controller )); return response()->json(1); - + }catch (\Throwable $e){ return response($e); @@ -2331,7 +2334,7 @@ class AdminPageController extends Controller )); return response()->json(1); - + }catch (\Throwable $e){ return response($e); @@ -2341,7 +2344,7 @@ class AdminPageController extends Controller public function downloadFile(Request $request) { $kp = ARFiles::where('files_id',$request->files_id) ->first(); - + return response($kp,200); } @@ -2355,7 +2358,7 @@ class AdminPageController extends Controller $batch_old_noruj = WTDDraft::on('mysql7')->where('batchno_serah',0)->where('kodcaw',$request->kodcaw)->pluck('norujukan'); $lelong_data = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$batch_old_noruj)->get(); - + foreach($batch_old as $index=>$bo) { array_push($latestbatch,['recno' => 0,'norujukan' => 'lama','batchno' => 0,'baki' => $lelong_data->sum('baki'),'aktif' => 1]); @@ -2374,7 +2377,7 @@ class AdminPageController extends Controller $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->where('kodcaw','=',$request->kodcaw)->pluck('norujukan'); $lelong = Lelong::on($cawangan['mysql']) - ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki') + ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki','lelong.t_jual') ->whereIn('lelong.norujukan',$wtdnorujukan) ->join('gadai','lelong.norujukan','=','gadai.norujukan') ->get(); @@ -2390,18 +2393,18 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - - + + $mula = explode('-', $request->mula); $hingga = explode('-', $request->hingga); $lelong = Lelong::on($cawangan['mysql']) ->where([['baki','>',0],['trkhtuntut',null]]) - ->whereMonth('t_lelong','>=',$mula[0]) - ->whereMonth('t_lelong','<=',$hingga[0]) - ->whereYear('t_lelong','>=',$mula[1]) - ->whereYear('t_lelong','<=',$hingga[1]); + ->whereMonth('t_jual','>=',$mula[0]) + ->whereMonth('t_jual','<=',$hingga[0]) + ->whereYear('t_jual','>=',$mula[1]) + ->whereYear('t_jual','<=',$hingga[1]); $lelongdetails = $lelong->get()->toArray(); $lelongcount = $lelong->count(); @@ -2410,10 +2413,10 @@ class AdminPageController extends Controller $draft = WTDDraft::on('mysql7') ->whereIn('norujukan',$lelongpluck) ->where('kodcaw',$kodcaw) - ->whereMonth('t_lelong','>=',$mula[0]) - ->whereMonth('t_lelong','<=',$hingga[0]) - ->whereYear('t_lelong','>=',$mula[1]) - ->whereYear('t_lelong','<=',$hingga[1]); + ->whereMonth('t_jual','>=',$mula[0]) + ->whereMonth('t_jual','<=',$hingga[0]) + ->whereYear('t_jual','>=',$mula[1]) + ->whereYear('t_jual','<=',$hingga[1]); $draftcount = $draft->count(); $draftpluck = $draft->pluck('norujukan'); @@ -2424,7 +2427,7 @@ class AdminPageController extends Controller return response()->json($dummy,200); }else{ $dif = array_diff($lelongpluck->toArray(),$draftpluck->toArray()); - + $lelongbaru = Lelong::on($cawangan['mysql']) ->whereIn('norujukan',$dif) ->get()->toArray(); @@ -2456,7 +2459,7 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $norujukan = $request->norujukan; - + try{ $lelong = Lelong::on($cawangan['mysql']) @@ -2484,7 +2487,7 @@ class AdminPageController extends Controller } - $serahbaki = SerahBaki::on($cawangan['mysql'])->create([ + $serahbaki = SerahBaki::on($cawangan['mysql'])->create([ 'batchno' => $latestbatch + 1, 'norujukan' => 'baru', 'hargajual' => 0.00, @@ -2505,8 +2508,8 @@ class AdminPageController extends Controller }catch (\Throwable $e){ return response($e); } - - + + } public function RemoveDraftWTD(Request $request){ @@ -2529,7 +2532,7 @@ class AdminPageController extends Controller DB::connection($cawangan['mysql'])->rollback(); return response()->json($e->getMessage(),400); - } + } } @@ -2545,7 +2548,7 @@ class AdminPageController extends Controller $selectnorujukan = $lelong = WTDDraft::on('mysql7') ->where('batchno_serah',$batchno) ->pluck('norujukan'); - + $lelong = Lelong::on($cawangan['mysql']) ->select('lelong.batchno','lelong.kodcaw','gadai.nokp','lelong.t_jual','gadai.pinjaman','gadai.nopelanggan','lelong.norujukan','gadai.bakipjm','gadai.bakiupah','lelong.cajlain','lelong.cajlelong','lelong.baki','lelong.hargajual','lelong.gst_cl') @@ -2555,7 +2558,7 @@ class AdminPageController extends Controller try{ foreach($lelong as $lel) { - $tuntutbaki = TuntutBaki::on($cawangan['mysql'])->create([ + $tuntutbaki = TuntutBaki::on($cawangan['mysql'])->create([ 'batchno' => $lel['batchno'], 'jenis' => "T", 'kodcaw' => $lel['kodcaw'], @@ -2593,7 +2596,7 @@ class AdminPageController extends Controller 'rugi' => 0.00, 'ansrugi' => 0.00, 'wtd' => $lel['baki'], - + ]); $lelong=Lelong::on($cawangan['mysql']) @@ -2610,9 +2613,9 @@ class AdminPageController extends Controller }catch (\Throwable $e){ return response($e); } - - + + } public function PenjanaanPC(Request $request){ @@ -2636,20 +2639,20 @@ class AdminPageController extends Controller $ar_files->tarikhmasa = $timeloni->toDateTimeString(); $ar_files->save(); - + $pengesahan = Permohonan::where('nopermohonan',$request->mohonid) ->update(array( 'tagjanapc' => 2, 'files_permohonan_id' => $ar_files->id )); } - + return response()->json($pengesahan); }catch (\Throwable $e){ return response($e); } - + } public function KeuntunganSebenarExport(Request $request){ @@ -2714,7 +2717,7 @@ class AdminPageController extends Controller ->whereYear('t_lelong','=',$year) ->get(); - return response()->json($upahlelong,200); + return response()->json($upahlelong,200); } } @@ -2769,7 +2772,7 @@ class AdminPageController extends Controller $arraysum = []; $arrayall = []; - for ($i = 1; $i <= 13; $i++) + for ($i = 1; $i <= 13; $i++) { ${"tempoh".$i} = clone $audit; if($i == 13) @@ -2800,7 +2803,7 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - + $current = Carbon::now(); $current = new Carbon(); @@ -2812,8 +2815,8 @@ class AdminPageController extends Controller { $audit = Gadai::on($cawangan['mysql']) ->where(function ($query) use ($harini) { - $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=','']]) - ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini]]); + $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini]]); }); }elseif($jenislaporan === 'datalelong') @@ -2822,15 +2825,15 @@ class AdminPageController extends Controller // ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) // ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]); ->where(function ($query) use ($harini) { - $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) - ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]); + $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]); }); }else{ $audit = Gadai::on($cawangan['mysql']) ->where(function ($query) use ($harini) { - $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',0]]) - ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',0]]); + $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',0]]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',0]]); }); } @@ -2841,7 +2844,7 @@ class AdminPageController extends Controller $arraycount = []; $arraysum = []; - for ($i = 1; $i <= 13; $i++) + for ($i = 1; $i <= 13; $i++) { ${"tempoh".$i} = clone $audit; if($i == 13) @@ -2865,9 +2868,9 @@ class AdminPageController extends Controller return response()->json($arrayall,200); } - + public function Laporan_SerahPetiBesiGadai(Request $request){ - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $current = Carbon::now(); @@ -2944,7 +2947,7 @@ class AdminPageController extends Controller ['semakbarcode','<>','Lulus'], ]) ->paginate(5); - + return response()->json($gadai,200); } @@ -2956,7 +2959,7 @@ class AdminPageController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where('norujukan',$request->norujukan) ->update(['semakbarcode'=>'Lulus']); - + return response()->json($gadai); } @@ -2976,7 +2979,7 @@ class AdminPageController extends Controller ->where('sttebus','<>','') ->whereYear('t_gadai',$current->year()) ->pluck('norujukan'); - + $get_norujukan = Gadai::on($cawangan['mysql']) ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result") ->whereNotNull('hargajualan') @@ -3007,7 +3010,7 @@ class AdminPageController extends Controller ->sum('bayaran_keuntungan'); $total = $sum_keun_tebus + $sum_keun_ansuran; - + return response()->json($total); } @@ -3016,23 +3019,23 @@ class AdminPageController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $arraygadai = []; - + foreach($cawangan_all as $index=>$cawangan){ - - + + // gadaian $gadai=Gadai::on($cawangan['mysql']) ->where([['t_gadai','>=',$request->mula_date],['t_gadai','<=',$request->hingga_date]]); $jumlah_gadai = $gadai->sum('pinjaman'); - + $data_gadai = $gadai->get(); - + $nokp_gadai = $gadai->distinct('nokp') ; $jum_org_gadai = $nokp_gadai->count('nokp'); - + $jum_surat_gadai = $data_gadai->count('norujukan'); - + //penebusan (Tebus + Lelong + Ansuran) $myDateTime = DateTime::createFromFormat('Y-m-d', $request->hingga_date); @@ -3043,7 +3046,7 @@ class AdminPageController extends Controller ->where('sttebus','!=','') ->where([['t_update','>=',$request->mula_date],['t_update','<=',$request->hingga_date]]); - $jum_tebus = $tebus->sum('bakipjm'); + $jum_tebus = $tebus->sum('bakipjm'); // dd($jum_tebus) ; $orgtebus = Gadai::on($cawangan['mysql']) @@ -3051,11 +3054,11 @@ class AdminPageController extends Controller ->where([['t_update','>=',$request->mula_date],['t_update','<=',$request->hingga_date]]); $jum_surat_t = $orgtebus->count('norujukan'); - + $nokp_tebus = $orgtebus->distinct('nokp') ; $jum_org_tebus = $nokp_tebus->count('nokp'); - - + + $ansuran = Transaction::on('mysql7') ->leftJoin('transaksi_keuntungan', function($join) { @@ -3065,39 +3068,39 @@ class AdminPageController extends Controller ->where('trans_type','=','A') ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw']) ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=', $datez]]); - - $jum_ansuran = $ansuran->sum('transaksi_keuntungan.bayaran_pembiayaan'); - - $jum_penebusan = $jum_tebus + $jum_ansuran ; - + $jum_ansuran = $ansuran->sum('transaksi_keuntungan.bayaran_pembiayaan'); + + $jum_penebusan = $jum_tebus + $jum_ansuran ; + + //Upah tebus (KEUNTUNGAN) - + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->hingga_date); $datez = $myDateTime->modify('+1 day')->format('Y-m-d'); - + $lelongupahsimpan = Lelong::on($cawangan['mysql']) - + ->where([['t_jual','>=',$request->mula_date],['t_jual','<=',$request->hingga_date]]); $jum_lelongupahsimpan = $lelongupahsimpan->sum('bakiupah'); - - + + $upahtebus = Tebus::on($cawangan['mysql']) ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan') ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',NULL]]) ->where([['t_tebus','>=',$request->mula_date],['t_tebus','<=',$request->hingga_date]]); - + $jum_upahtebus = $upahtebus->sum('tebus.bakiupah'); $advansur = Advansur::on($cawangan['mysql']) ->where([['tarikh','>=',$request->mula_date],['tarikh','<=',$request->hingga_date]]); - + $jum_advansur = $advansur->sum('upahDibayar'); @@ -3111,10 +3114,10 @@ class AdminPageController extends Controller ->where('trans_type','=','A') ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw']) ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=',$datez]]); - + $jum_ansuranupah = $ansuranupah->sum('transaksi_keuntungan.bayaran_keuntungan'); - + $upahtawarruq = Transaction::on('mysql7') ->leftJoin('transaksi_keuntungan', function($join) { @@ -3124,26 +3127,26 @@ class AdminPageController extends Controller ->where('trans_type','!=','A') ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw']) ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=',$datez]]); - + $jum_upahtawarruq = $upahtawarruq->sum('transaksi_keuntungan.keuntungan_rebet'); - + $jumlah_upah = $jum_lelongupahsimpan + $jum_upahtebus + $jum_advansur + $jum_upahtawarruq; $jum_keseluruhan_upah = $jumlah_upah + $jum_ansuranupah; $jum_pinjaman_semasa = $jumlah_gadai - $jum_penebusan; - + //baki awal dan baki akhir $myDateMonth = DateTime::createFromFormat('Y-m-d', $request->mula_date); $month = $myDateMonth->modify('-1 day')->format('m'); // dd($month); - + $myDateYear = DateTime::createFromFormat('Y-m-d', $request->mula_date); $year = $myDateYear->format('Y'); // dd($year); - + if($month == 1){ $audit = StokAudit1::on($cawangan['mysql'])->where('tahun',$year); }elseif($month == 2){ @@ -3169,7 +3172,7 @@ class AdminPageController extends Controller }elseif($month == 12){ $audit = StokAudit12::on($cawangan['mysql'])->where('tahun',$year); } - + $rekodaudit = $audit->get(); $bakiawal = $audit->sum('bakipjm'); $bakiakhir = $bakiawal + $jumlah_gadai - $jum_penebusan; @@ -3180,7 +3183,7 @@ class AdminPageController extends Controller ->where([['tarikhdaftar','>=',$request->mula_date],['tarikhdaftar','<=',$request->hingga_date]]); $bil_pelanggan_baru = $pelanggan_baru->count('id'); - + array_push($arraygadai,[ "data_gadai" => $data_gadai, @@ -3191,7 +3194,7 @@ class AdminPageController extends Controller "jum_surat_gadai"=>$jum_surat_gadai, "jum_surat_t" => $jum_surat_t, "jum_org_tebus" => $jum_org_tebus, - "jum_penebusan" => $jum_penebusan, + "jum_penebusan" => $jum_penebusan, "jum_pinjaman_semasa" => $jum_pinjaman_semasa, "bil_pelanggan_baru" => $bil_pelanggan_baru, "jumlah_upah" => $jumlah_upah, @@ -3200,10 +3203,10 @@ class AdminPageController extends Controller "bakiawal" => $bakiawal, "bakiakhir" => $bakiakhir ]); - - } + + } // dd($jum_lelongupahsimpan, $jum_upahtebus, $jum_advansur, $jum_ansuranupah, $jum_upahtawarruq ); - + return response()->json($arraygadai,200); @@ -3211,7 +3214,7 @@ class AdminPageController extends Controller } public function getLaporanAkruBulan(Request $request){ - + $array_akru = []; $cawangan = Cawangan::on('mysql7')->get(); @@ -3223,4 +3226,338 @@ class AdminPageController extends Controller return response()->json($array_akru,200); } + + public function LaporanOnline(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + if($request->jenis == 'portal') + { + $online=GlDetail::on($cawangan['mysql']) + ->where('kodcaw','=',$request->kodcaw) + ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]]) + ->where('descpt','LIKE','SERAHAN BAYAR ONLINE%') + ->where('serahan','>',0) + ->orderby('tarikh','desc') + ->get(); + }else if($request->jenis == 'mobile'){ + + $online=GlDetail::on($cawangan['mysql']) + ->where('kodcaw','=',$request->kodcaw) + ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]]) + ->where('descpt','LIKE','Serahan Mobile Payment%') + ->where('serahan','>',0) + ->orderby('tarikh','desc') + ->get(); + }else{ + $online=GlDetail::on($cawangan['mysql']) + ->where('kodcaw','=',$request->kodcaw) + ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]]) + ->where('descpt','LIKE','SERAHAN LELONG ONLINE%') + ->where('teller','=','LELONG ONLINE') + ->where('serahan','>',0) + ->orderby('tarikh','desc') + ->get(); + } + + + return response()->json($online,200); + } + + public function calculationUntungTerkumpulAkru($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $current = new Carbon($request->tarikh); + + $daterequest = new Carbon($request->tarikh); + $daterequest->addDays(1); + + $total = 0; + + //Untung Rugi Terkumpul Sebelum 01.12.2013 + $utgrugilama = imbangdugalama::on($cawangan['mysql']) //--masuk + ->sum('untung_t'); + + //Yuran Ahli + $yuranTlama = imbangdugalama::on($cawangan['mysql']) + ->sum('yuran_t'); + + $yuranbaru = Customer::on('mysql7') + ->where('tarikhdaftar','>','2013-12-31') + ->whereYear('tarikhdaftar','<',$current->year) + ->sum('yuranahli'); + + //Caj Lelong + $lelong = Lelong::on($cawangan['mysql']) //--masuk + ->whereNotNull('t_jual') + ->where('t_jual','>','2013-12-31') + ->whereYear('t_jual','<',$current->year) + ->sum('cajlelong'); + + $cajlelonglama = imbangdugalama::on($cawangan['mysql']) + ->sum('cajlelong_t'); + + + //Upah Simpan Tebus + $upahsimpantebus = Tebus::on($cawangan['mysql']) //--masuk + ->where('t_tebus','>','2013-12-31') + ->whereYear('t_tebus','<',$current->year) + ->sum('upahdibayar'); + + //Upah Simpan Lelong + $upahsimpanlelong = Lelong::on($cawangan['mysql']) //--masuk + ->where('t_jual','>','2013-12-31') + ->whereYear('t_jual','<','2022') + ->sum('bakiupah'); + + //Upah Simpan Advansur + $upahsimpanansur = Advansur::on($cawangan['mysql']) //--masuk + ->whereYear('tarikh','<',$current->year) + ->sum('upahdibayar'); + + //Upah Tawarruq + + $keuntungan_data = TransaksiKeuntungan::on('mysql7') + ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022') + ->where('kodcaw',$kodcaw) + ->pluck('norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan'); + + $upahsimpankeuntungansebelumtawarruq = TransaksiKeuntungan::on('mysql7') + ->where('tarikh_bayaran' ,'<=', $daterequest) + ->whereYear('tarikh_bayaran','<','2022') + ->whereIn('norujukan',$gadaiData) + ->sum('bayaran_keuntungan'); + + $upahsimpanlama = imbangdugalama::on($cawangan['mysql']) + ->sum('upah_t'); + + //GST Caj Lelong + $gstcajlelong = Lelong::on($cawangan['mysql']) //--masuk + ->where('t_jual','<=',$request->tarikh) + ->whereYear('t_jual','<',$current->year) + ->sum('gst_cl'); + + //Upah Hapus Kira + $upahhapuskira = HapusKira::on($cawangan['mysql']) + ->where('tarikh','>','2013-12-31') + ->whereYear('tarikh','<',$current->year) + ->sum('bakiupah'); + + $panjar1 = Panjar::on($cawangan['mysql']) + ->whereYear('tarikh','<',$current->year) + ->where('tag','=','1') + ->sum('bayaran'); + + $panjar2 = Panjar::on($cawangan['mysql']) + ->whereYear('tarikh','<',$current->year) + ->where('tag','=','2') + ->sum('bayaran'); + + $panjar3 = Panjar::on($cawangan['mysql']) + ->whereYear('tarikh','<',$current->year) + ->where('tag','=','3') + ->sum('bayaran'); + + $parameter = ($panjar1*-1) + ($panjar2*-1) + ($panjar3*-1); + + // $parameter = Parameter::on($cawangan['mysql']) //--masuk + // ->sum('sumpanjarlama'); + + //Keuntungan Tawarruq Sebenar + $keuntungansebenar = 0; + $dateSM = '2021-04-24'; + + $keuntungan_data = TransaksiKeuntungan::on('mysql7') + ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) + ->whereYear('tarikh_bayaran','<','2022') + ->where('kodcaw',$kodcaw) + ->pluck('norujukan'); + + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan'); + + $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09') + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','<','2022') + ->where('kodcaw',$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' ,'<', '2021-06-09') + ->whereDate('tarikh_bayaran','>=', $dateSM) + ->sum('keuntungan_rebet'); + + $bukanansuran_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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + ->whereYear('tarikh_bayaran','<','2022') + ->where('trans.kodcaw',$kodcaw) + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql']) + ->whereIn('norujukan',$bukanansuran_data) + ->whereNotNull('hargajualan') + ->pluck('norujukan'); + + $bukanansuran = TransaksiKeuntungan::on('mysql7') + ->whereIn('transaksi_keuntungan.norujukan',$gadaiData) + ->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' ,'>=', '2021-06-09') + ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022') + ->sum('transaksi_keuntungan.keuntungan_rebet'); + + $ansuran_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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + ->whereYear('tarikh_bayaran','<','2022') + ->where('trans.kodcaw',$kodcaw) + ->pluck('transaksi_keuntungan.norujukan'); + + + $gadaiData = Gadai::on($cawangan['mysql']) + ->whereIn('norujukan',$ansuran_data) + ->whereNotNull('hargajualan') + ->pluck('norujukan'); + + $ansuran = TransaksiKeuntungan::on('mysql7') + ->whereIn('transaksi_keuntungan.norujukan',$gadaiData) + ->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' ,'>=', '2021-06-09') + ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022') + ->sum('transaksi_keuntungan.bayaran_keuntungan'); + + $keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); + + $get_norujukan = Gadai::on($cawangan['mysql']) + ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result") + ->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','=','2022')->where('sttebus','<>','')->pluck('norujukan'); + + $sum_keun = Transaction::on('mysql7') + ->selectRaw("trans.norujukan,SUM(CASE WHEN (transaction.trans_type) = 'T' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran") + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->whereIn('trans.norujukan',$get_norujukan)->get()->toArray(); + + $sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0; + $sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0; + + $total_keuntungan_sebenar = $sum_keuntungan + $sum_bayaran; + + $previousYear = Carbon::now()->subYears(1); + $available_akru = AkruNet::on($cawangan['mysql']) + ->where('tahun',$previousYear->year) + ->sum('jumlah'); + + $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru + $total_keuntungan_sebenar) + $parameter; + + if($kodcaw == '011229') + $total -= 45390.37; + + + return response()->json($total,200); + } + + public function getTarikhTunaiSebelum($kodcaw,Request $request){ + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $tunai = Tunai::on($cawangan['mysql']) + ->where([['kodcaw','=',$kodcaw],['tarikh','<',$request->tarikh],['kodlaluan','=',$request->kodlaluan]]) + ->orderby('tarikh','desc')->limit(1)->first(); + + return response()->json($tunai); + } + + public function LaporanTuntutBaki(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + if($request->sort == 'tuntut'){ + $sortBy = '>'; + }else if($request->sort == 'rugi'){ + $sortBy = '<'; + }else{ + $sortBy = null; + } + + if($request->jenistuntut == 'belumtuntut'){ + $batchleltuntutbaki = Lelong::on($cawangan['mysql']) + ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki') + ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan') + ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]]) + ->whereNotNull('gad.upah12') + ->whereNotNull('lelong.hargajual') + ->whereNull('lelong.trkhtuntut') + ->when($sortBy, function ($query) use ($sortBy) { + return $query->where('baki',$sortBy,'0'); + }, function ($query) { + return $query->where('baki','!=','0'); + }) + ->get()->toArray(); + }else if($request->jenistuntut == 'sudahtuntut'){ + $batchleltuntutbaki = Lelong::on($cawangan['mysql']) + ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki') + ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan') + ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]]) + ->whereNotNull('gad.upah12') + ->whereNotNull('lelong.hargajual') + ->whereNotNull('lelong.trkhtuntut') + ->when($sortBy, function ($query) use ($sortBy) { + return $query->where('baki',$sortBy,'0'); + }, function ($query) { + return $query->where('baki','!=','0'); + }) + ->get()->toArray(); + }else{ + $batchleltuntutbaki = Lelong::on($cawangan['mysql']) + ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki') + ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan') + ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]]) + ->whereNotNull('gad.upah12') + ->whereNotNull('lelong.hargajual') + ->when($sortBy, function ($query) use ($sortBy) { + return $query->where('baki',$sortBy,'0'); + }, function ($query) { + return $query->where('baki','!=','0'); + }) + ->get()->toArray(); + } + + return response()->json($batchleltuntutbaki); + } } diff --git a/app/Http/Controllers/BackupStokAuditController.php b/app/Http/Controllers/BackupStokAuditController.php index f06b218..2f72087 100644 --- a/app/Http/Controllers/BackupStokAuditController.php +++ b/app/Http/Controllers/BackupStokAuditController.php @@ -172,10 +172,164 @@ class BackupStokAuditController extends Controller return 'success'; } + public function backupStokAuditProblem(Request $request){ + // if($request->zone == 'all'){ + // $cawangan = Cawangan::on('mysql7')->get(); + // }else{ + // $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get(); + // } + $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first(); + // $tarikh = Carbon::now(); + // $tarikh = $tarikh->subDay(1); + $tarikh = Carbon::parse($request->dateProblem . ' 00:00:00'); + $month = $tarikh->month; + $year = $tarikh->year; + + $all_gadai = Gadai::on($cawangan['mysql']) + ->where([['tagpalsu','=',0],['sttebus','=','']]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC')->get(); + $data = []; + foreach($all_gadai as $gadai){ + $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00'); + // $current = Carbon::now(); + // $current = $current->subDay(1); + $current = Carbon::parse($request->dateProblem . ' 00:00:00'); + + $tahun_gadai = $tarikh_gadai->year; + $bulan_gadai = $tarikh_gadai->month; + $hari_gadai = $tarikh_gadai->day; + + $tahun_semasa = $current->year; + $bulan_semasa = $current->month; + $hari_semasa = $current->day; + + if($hari_semasa >= $hari_gadai){ + $beza_hari = $hari_semasa - $hari_gadai + 1; + }else if($hari_semasa < $hari_gadai){ + $bulan_semasa = $bulan_semasa - 1; + $beza_hari = ($hari_semasa + 30) - $hari_gadai + 1; + } + + $extensivemonth_gadai = 0; + + if($beza_hari >= 1 && $beza_hari <= 15){ + $extensivemonth_gadai = 0.5; + }else if($beza_hari >= 16){ + $extensivemonth_gadai = 1; + }else{ + $extensivemonth_gadai = 0; + } + + $beza_tahun = $tahun_semasa - $tahun_gadai; + + $beza_bulan = ($bulan_semasa + ($beza_tahun * 12)) - $bulan_gadai; + + $tempoh_gadai = $beza_bulan + $extensivemonth_gadai; + + $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']); + + Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array( + 'jbg' => $tempoh_gadai, + 'tempoh' => $tempoh_gadai, + 'tunggakan' => $upah_semasa + )); + + $data_gadai = [ + 'tahun' => $year, + 'bulan' => $month, + 'norujukan' => $gadai['norujukan'], + 'tempoh' => $tempoh_gadai, + 'nokp' => $gadai['nokp'], + 'berat' => $gadai['berat'], + 'nilaimarhun' => $gadai['nilaimarhun'], + 'pinjaman' => $gadai['pinjaman'], + 'bakipjm' => $gadai['bakipjm'], + 'kadarupah' => $gadai['kadarupah'], + 'tempohblmbyar' => $gadai['tempoh'] - $gadai['tempohbayar'], + 'upahblmbyar' => $upah_semasa, + 'lanjutan' => $gadai['lelong_tawarruq'] + ]; + + array_push($data,$data_gadai); + } + + if($month == 1){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit1::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 2){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit2::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 3){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit3::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 4){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit4::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 5){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit5::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 6){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit6::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 7){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit7::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 8){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit8::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 9){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit9::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 10){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit10::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 11){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit11::on($cawangan['mysql'])->insert($t); + } + }elseif($month == 12){ + foreach (array_chunk($data,1000) as $t) + { + StokAudit12::on($cawangan['mysql'])->insert($t); + } + } + // foreach($cawangan as $cawangan_mysql){ + + // } + + return 'success'; + } + public function kiraupahTawarruqStokAudit($tempoh,$tempohbayar,$kadarupah,$bakipinjaman){ $bilang_bln = $tempoh - $tempohbayar; + if($bilang_bln > 12){ + $bilang_bln = 12; + } + $upahsemasa_raw = $bilang_bln * (($kadarupah/100 )* $bakipinjaman); $upah_semasa_round = number_format($upahsemasa_raw,2); diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index bd4e250..bea74e4 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -459,6 +459,7 @@ class GadaiController extends Controller 'duit_masuk' => $request->bayaran, 'created_at' => $current, 'bakiharga' => $baki_hargajualan, + 'nowakil' => (int)$request->nowakil ]); $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index a088cab..71531b0 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -1244,6 +1244,9 @@ class LaporanController extends Controller $current = Carbon::now(); $current = new Carbon(); + $mulaCarbon = new Carbon($request->mula); + $hinggaCarbon = new Carbon($request->hingga); + /* Start Keuntungan Sebenar Calculation */ $get_norujukan = Gadai::on($cawangan['mysql']) ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result") @@ -1278,13 +1281,13 @@ class LaporanController extends Controller ->whereIn('trans.norujukan',$get_norujukan) ->whereDate('trans.tarikh_bayaran' ,'>=', $request->mula) ->whereDate('trans.tarikh_bayaran' ,'<=', $request->hingga) - ->whereYear('tarikh_bayaran','=',$current->year) + ->whereYear('tarikh_bayaran','=',$mulaCarbon->year) ->where('trans.kodcaw',$request->kodcaw) ->get()->toArray(); $upahlelong = Lelong::on($cawangan['mysql']) ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2022-07-24']]) - ->whereYear('t_jual','=',$current->year) + ->whereYear('t_jual','=',$mulaCarbon->year) ->sum('bakiupah'); $sum_keuntungan = ($summation) ? $summation[0]['sum_keun'] : 0; @@ -1386,10 +1389,15 @@ class LaporanController extends Controller public function GenerateMonthlyAkrual(Request $request){ - $firstmonth_behind = Carbon::now()->startOfMonth()->subMonthsNoOverflow(1); - $secondmonth_behind = Carbon::now()->startOfMonth()->subMonthsNoOverflow(2); + $tarikh = $request->tahun . '-' . $request->bulan . '-01'; + $month_request = $current = new Carbon($tarikh); + $firstmonth_behind = clone $month_request; + $secondmonth_behind = clone $month_request; + $firstmonth_behind_end = clone $month_request; - $firstmonth_behind_end = Carbon::now()->endOfMonth()->subMonthsNoOverflow(1); + $firstmonth_behind->startOfMonth(); + $secondmonth_behind->startOfMonth()->subMonthsNoOverflow(1); + $firstmonth_behind_end->endOfMonth(); $firstmonth_behind_month = $firstmonth_behind->format('m'); $secondmonth_behind_month = $secondmonth_behind->format('m'); @@ -1408,7 +1416,9 @@ class LaporanController extends Controller if($secondmonth_behind_year == 2022 && (int)$secondmonth_behind_month > 4){ $audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year); - } + }else if($secondmonth_behind_year > 2022){ + $audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year); + } $result_audit_stated = $tebuscontroller->StokAuditGenerateTerakru($firstmonth_behind_month,$caw,$firstmonth_behind_year); @@ -1431,13 +1441,16 @@ class LaporanController extends Controller $available_akru = AkruNet::on($caw['mysql']) ->where('bulan',(int)$firstmonth_behind_month) + ->where('tahun',(int)$firstmonth_behind_year) ->first(); try{ if($available_akru){ if($available_akru['jumlah'] !== $accrual_net){ - AkruNet::on($caw['mysql'])->where('bulan','=',(int)$firstmonth_behind_month) - ->update(['jumlah' => $accrual_net]); + AkruNet::on($caw['mysql']) + ->where('bulan','=',(int)$firstmonth_behind_month) + ->where('tahun','=',(int)$firstmonth_behind_year) + ->update(['jumlah' => $accrual_net]); } }else{ $akrunet = new AkruNet(); @@ -1525,4 +1538,91 @@ class LaporanController extends Controller return response('notfound'); } } + + public function UpdateDailyImbangDuga(Request $request){ + + // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->get(); + $tarikh = new Carbon($request->tarikh); + $firstmonth_behind = clone $tarikh; + $secondmonth_behind = clone $tarikh; + $firstmonth_behind_end = clone $tarikh; + + $firstmonth_behind->startOfMonth(); + $secondmonth_behind->startOfMonth()->subMonthsNoOverflow(1); + $firstmonth_behind_end->endOfMonth(); + + $firstmonth_behind_month = $firstmonth_behind->format('m'); + $secondmonth_behind_month = $secondmonth_behind->format('m'); + $firstmonth_behind_year = $firstmonth_behind->format('Y'); + $secondmonth_behind_year = $secondmonth_behind->format('Y'); + + $firstmonth_behind_extension = $firstmonth_behind->toDateString(); + $firstmonth_behind_extension_end = $firstmonth_behind_end->toDateString(); + + $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get(); + + $tebuscontroller = new TebusController(); + + foreach($cawangan as $index=>$caw){ + DB::connection($caw['mysql'])->beginTransaction(); + + if($secondmonth_behind_year == 2022 && (int)$secondmonth_behind_month > 4){ + $audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year); + }else if($secondmonth_behind_year > 2022){ + $audit_backdate = $tebuscontroller->StokAuditGenerateTerakru($secondmonth_behind_month,$caw,$secondmonth_behind_year); + } + + $result_audit_stated = $tebuscontroller->StokAuditGenerateTerakru($firstmonth_behind_month,$caw,$firstmonth_behind_year); + + $totaltunggakan_now = $result_audit_stated->sum('upahblmbyar'); + $totaltunggakan_past = $audit_backdate->sum('upahblmbyar'); + + $request_generate = new \Illuminate\Http\Request([ + 'mula' => $firstmonth_behind_extension, + 'hingga' => $firstmonth_behind_extension_end, + 'kodcaw' => $caw['kodcaw'], + ]); + + $keuntungan = $this->SemakanKeuntunganLejer($caw['kodcaw'],$request_generate); + + $data_keuntungan = $keuntungan->getContent(); + $data = json_decode($data_keuntungan, true); + + $calculation = $totaltunggakan_past - $data['keuntungan_semasa']; + $accrual_net = $totaltunggakan_now - $calculation; + + $ab = imbangdugabackup::on($caw['mysql']) + ->where('tarikh',$request->tarikh) + ->first(); + + $total_akru = AkruNet::on($caw['mysql']) + ->where('bulan','<',(int)$firstmonth_behind_month) + ->where('tahun',(int)$firstmonth_behind_year) + ->sum('jumlah'); + + $totalpend_terakru = ($total_akru + $accrual_net); + $totalharta = $ab['tunaiditangan'] + $ab['pembiayaantawarruq'] + $ab['bayaranpendahuluan'] + $ab['pinjamankoop'] + $ab['emaspalsu'] + $ab['pindahkekpkb'] + $ab['penghutangkaki'] + $ab['phapuskira'] + $ab['belian1stop'] + $totaltunggakan_now + $ab['serahan']; + $totaltanggungan = $totalpend_terakru + $ab['bds'] + $ab['perubatan'] + $ab['keraian'] + $ab['rugilelong'] + $ab['bakilelong'] + $ab['wtd'] + $ab['untungrugiterkumpul'] + $ab['keun_sebenar'] + $ab['pendahuluan'] + $ab['cajlelong'] + $ab['cajperkhidmatan'] + $ab['cajlelongxtra'] + $ab['upahsimpanxtra'] + $ab['bakilelongxtra'] + $ab['rugilelongxtra'] + $ab['utgterkumpulxtra'] + $ab['jualan1stop'] + $ab['hapuskira']; + $tally = (round($totalharta,2) == round($totaltanggungan,2)) ? 1 : 0; + + try{ + if($ab){ + imbangdugabackup::on($caw['mysql'])->where('tarikh',$request->tarikh)->update([ + 'tagtally' => $tally, + 'totalharta' => $totalharta, + 'totaltanggungan' => $totaltanggungan, + 'keun_penggadai' => $totaltunggakan_now, + 'pend_terakru' => ($total_akru + $accrual_net) + ]); + } + + DB::connection($caw['mysql'])->commit(); + }catch (\Throwable $e){ + DB::connection($caw['mysql'])->rollBack(); + return response($e); + } + } + + return response('succesfully generated!'); + } } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index a8c2401..cdead92 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -27,7 +27,9 @@ use App\Audit; use App\GlDetail; use App\Pembeli; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Http; +use Log; use DB; use Carbon\Carbon; @@ -560,15 +562,22 @@ class LelongController extends Controller $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($cawangan['tagarrahnbid'] == 1){ + $lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',[ + 'norujukan' => $request->norujukan + ])->json(); + $lelong = ($lelong != null) ? $lelong['lelong'] : []; + }else{ + $lelong = Lelong::on($cawangan['mysql']) + ->where('norujukan', '=', $request->norujukan) + //->where('t_lelong', '<=', $current->toDateString()) + ->first(); + } if($lelong) { $date_lelong = new Carbon($lelong['t_lelong']); - + if($lelong['t_lelong'] >= $current->toDateString()) { $diff = $date_lelong->diffInDays($current); @@ -577,7 +586,7 @@ class LelongController extends Controller $diff = -$diff; } - if($diff <= 0) + if($diff <= 1) { return response(1); }else{ @@ -636,7 +645,13 @@ class LelongController extends Controller public function searchBlockLelong(Request $request){ $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first(); - $lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first(); + if($cawangan['tagarrahnbid'] == 1) + { + $lelong = Http::withOptions(['verify' => true])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $request->norujukan])->json(); + $lelong = ($lelong != null) ? $lelong['lelong'] : []; + }else{ + $lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first(); + } return response()->json($lelong); } @@ -780,9 +795,12 @@ class LelongController extends Controller ->where('poskod','=',$customer['poskod']) ->first(); + if($poskod) $daerah = Daerah::on('mysql7') ->where('koddaerah','=',$poskod['koddaerah']) ->first(); + else + Log::debug('poskod tiada' . $lel['nokp']); $negeri = Negeri::on('mysql7') ->where('kodnegeri','=',$poskod['kodnegeri']) @@ -1016,7 +1034,7 @@ class LelongController extends Controller $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$index['norujukan'])->update(array( 'sttebus' => "L", - 't_update' => $currentDate + 't_update' => $request->tarikh )); $lelong_to_be_inserted = new Lelong(); @@ -1096,6 +1114,19 @@ class LelongController extends Controller ]); } + if ($request->gldetailcdm != null) { + GlDetail::on($cawangan['mysql'])->create([ + 'kodcaw' => $request->kodcaw, + 'tarikh' => $request->tarikh, + 'dtacct' => "1000/010", + 'ktacct' => "1000/020", + 'descpt' => "SERAHAN LELONG CDM, " . $request->tarikh, + 'amaun' => $request->gldetailcdm, + 'teller' => "LELONG ONLINE", + 'serahan' => $request->gldetailcdm, + ]); + } + return response()->json("success"); } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 70e88f6..ba04abe 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -543,6 +543,7 @@ class TebusController extends Controller 'duit_masuk' => $harga_tebus, 'created_at' => $current, 'bakiharga' => $baki_hargajualan, + 'nowakil' => (int)$request->nowakil ]); } @@ -1731,7 +1732,7 @@ class TebusController extends Controller $upahlelong = Lelong::on($cawangan['mysql']) ->where([['t_jual','<=',$request->tarikh],['t_jual','>','2022-07-24']]) - ->whereYear('t_jual','=',$current->year) + ->whereYear('t_jual','=',$tarikhyear->year) ->sum('bakiupah'); @@ -2026,6 +2027,11 @@ class TebusController extends Controller if($year_generate == 2022 && $intmonth_sebelum > 4) { $result_audit_backdate = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate); + }else if($year_generate > 2022 && $intmonth_sekarang == 1){ + $previousYear = Carbon::now()->subYears(1); + $result_audit_backdate = $this->StokAuditGenerateTerakru('12',$cawangan,$previousYear->year); + }else{ + $result_audit_backdate = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate); } $get_norujukan = Gadai::on($cawangan['mysql']) @@ -2060,26 +2066,36 @@ class TebusController extends Controller $total = $sum_keun_tebus + $sum_keun_ansuran; - $calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan; + if(!$determine_past->isToday()){ + $calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan; - if($calculate_month > 1){ - return 'ERR_MONTH_SEBELUM'; - }else if($calculate_month == 1){ - $jumlahakru = AkruNet::on($cawangan['mysql']) - ->sum('jumlah'); - }else if($calculate_month < 0){ - $jumlahakru = AkruNet::on($cawangan['mysql']) - ->where('bulan','<=',$intmonth_sekarang) - ->sum('jumlah'); + if($calculate_month > 1){ + return 'ERR_MONTH_SEBELUM'; + }else if($calculate_month == 1){ + $jumlahakru = AkruNet::on($cawangan['mysql']) + ->sum('jumlah'); + }else if($calculate_month < 0){ + $jumlahakru = AkruNet::on($cawangan['mysql']) + ->where('bulan','<=',$intmonth_sekarang) + ->sum('jumlah'); + + return response()->json($jumlahakru); + }else if($calculate_month == 0) + { + $jumlahakru = AkruNet::on($cawangan['mysql']) + ->where('bulan','<',$intmonth_sekarang) + ->sum('jumlah'); + } + }else{ + $calculate_month = 0; - return response()->json($jumlahakru); - }else if($calculate_month == 0) - { $jumlahakru = AkruNet::on($cawangan['mysql']) ->where('bulan','<',$intmonth_sekarang) + ->where('tahun', $current->year) ->sum('jumlah'); } + if($determine_past->isToday()) { $audit_now = Gadai::on($cawangan['mysql']) @@ -2105,6 +2121,7 @@ class TebusController extends Controller if($calculate_month <= 1){ $available_akru = AkruNet::on($cawangan['mysql']) ->where('bulan', (int)$month_sekarang) + ->where('tahun', $current->year) ->get()->toArray(); if(sizeof($available_akru) == 0) @@ -2118,7 +2135,7 @@ class TebusController extends Controller }else{ if($available_akru[0]['jumlah'] !== ($accrual_net - $total)) { - AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang) + AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)->where('tahun',$current->year) ->update(['jumlah' => ($accrual_net - $total)]); } diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index d7e2d94..c999ef5 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -292,10 +292,17 @@ class TransactionOnlineController extends Controller } } - $akanlelong = Gadai::on($cawangan['mysql']) - ->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic],['hargajual','=', 0]]) - ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') - ->get()->toArray(); + if($cawangan['tagarrahnbid'] == 1){ + $akanlelong = Gadai::on($cawangan['mysql']) + ->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic]]) + ->get()->toArray(); + } + else{ + $akanlelong = Gadai::on($cawangan['mysql']) + ->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic]]) + ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') + ->get()->toArray(); + } if(sizeof($akanlelong) != 0){ foreach($akanlelong as $lelong) diff --git a/app/Transaction.php b/app/Transaction.php index cbb58a8..0dfd13e 100644 --- a/app/Transaction.php +++ b/app/Transaction.php @@ -14,7 +14,7 @@ class Transaction extends Model * @var array */ protected $fillable = [ - 'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at','bakiharga' + 'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at','bakiharga','nowakil' ]; /** diff --git a/routes/web.php b/routes/web.php index f1027cc..8584c80 100644 --- a/routes/web.php +++ b/routes/web.php @@ -567,6 +567,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('keluar/lelong/tawarruq',['uses'=>'LelongController@keluarLelongTawarruq']); $router->get('backup/stok/audit',['uses'=>'BackupStokAuditController@backupStokAudit']); + $router->get('backup/stok/audit/problem',['uses'=>'BackupStokAuditController@backupStokAuditProblem']); $router->get('stokaudit/backdate',['uses'=>'BackupStokAuditController@LaporanAuditBackdate']); }); @@ -654,6 +655,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('getTunaiPaginate/{kodcaw}',['uses' => 'AdminPageController@TunaiPaginateforAdmin']); $router->get('getPetiBesiPaginate/{kodcaw}',['uses' => 'AdminPageController@PetiBesiPaginateforAdmin']); $router->get('GetTunaiByTarikh/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunai']); + $router->get('GetTunaiByTarikhSebelum/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunaiSebelum']); $router->get('getAddTunaiDateKodlaluan/{kodcaw}/',['uses' =>'AdminPageController@getAddTunaiDateKodlaluan']); $router->get('AdvansurSearchByTarikh/{kodcaw}',['uses'=>'AdminPageController@SenaraiAdvansurTarikh']); $router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']); @@ -745,6 +747,12 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('laporan/akrual/generateDaily',['uses'=>'LaporanController@GenerateDailyAkrual']); $router->get('laporan/akrual/generateMonthly',['uses'=>'LaporanController@GenerateMonthlyAkrual']); $router->get('laporan/akrual/insertImbangDuga',['uses'=>'LaporanController@InsertDailyImbangDuga']); + $router->get('laporan/akrual/UntungRugiTerkumpul/{kodcaw}',['uses' => 'AdminPageController@calculationUntungTerkumpulAkru']); + $router->get('laporan/akrual/updateImbangDuga',['uses'=>'LaporanController@UpdateDailyImbangDuga']); + + $router->get('laporan/online',['uses'=>'AdminPageController@LaporanOnline']); + $router->get('laporan/tuntutbaki',['uses'=>'AdminPageController@LaporanTuntutBaki']); + }); $router->group(['prefix'=>'lelong'], function () use ($router){