diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 8dbadaf..3e3603f 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -1,6 +1,8 @@ where('kodcaw','=',$kodcaw)->first(); - + $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('norujukan','=',$norujukan) ->where('masalulus','<>','') ->get(); - + + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = "test"; + $audit->new_data = $kelulusan; + $audit->kodcaw = $kodcaw; + $audit->created_at = $harini; + $audit->updated_at = $harini; + $audit->save(); + return response()->json($kelulusan); } @@ -52,13 +63,13 @@ class KelulusanController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - + $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('norujukan','=',$norujukan) ->orderBy('siri','desc') ->first(); - + return response()->json($kelulusan); } @@ -116,7 +127,7 @@ class KelulusanController extends Controller )); } - + } else if($pengesahan == 'operasi') { @@ -128,9 +139,9 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'operasi', - 'khazanah' => $request->namakhazanah + 'khazanah' => $request->namakhazanah - )); + )); } else @@ -143,7 +154,7 @@ class KelulusanController extends Controller 'pelulus' => 'operasi', 'masalulus' => 'batal', 'khazanah' => $request->namakhazanah - )); + )); } } @@ -157,7 +168,7 @@ class KelulusanController extends Controller 'pelulus' => 'dahlulus', 'operasi' => $request->namaoperasi, 'masalulus'=> $harini->toTimeString() - )); + )); }else if($request->sahkan === 2){ $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) @@ -167,7 +178,7 @@ class KelulusanController extends Controller 'pelulus' => 'dahlulus', 'operasi' => $request->namaoperasi, 'masalulus'=> 'batal' - )); + )); } return response()->json($kelulusan,201); @@ -186,10 +197,10 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'komen' => $request->komen - )); - - return response()->json($kelulusan,201); - + )); + + return response()->json($kelulusan,201); + } public function create(REQUEST $request,$kodcaw,$norujukan,$roles) @@ -202,8 +213,8 @@ class KelulusanController extends Controller if($roles == "khazanah") { $kelulusan=Mohon::on($cawangan['mysql']) - ->create([ - + ->create([ + 'tarikh'=> $harini->toDateString(), 'norujukan'=> $norujukan, 'siri' => $request->siri, @@ -218,15 +229,15 @@ class KelulusanController extends Controller 'teller' => $request->teller, 'pelulus' => ($request->pelulus) ? $request->pelulus : '' - + ]); } else if($roles == "operasi") { $kelulusan=Mohon::on($cawangan['mysql']) - ->create([ - + ->create([ + 'tarikh'=> $harini->toDateString(), 'norujukan'=> $norujukan, 'siri' => $request->siri, @@ -244,7 +255,7 @@ class KelulusanController extends Controller ]); } - + return response()->json($kelulusan); } @@ -259,7 +270,7 @@ class KelulusanController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $mohonid=Mohonid::on($cawangan['mysql']) - ->create([ + ->create([ 'tarikh'=> $harini->toDateString(), 'mohon' => $request->mohon, 'norujukan' => $norujukan, @@ -355,7 +366,7 @@ class KelulusanController extends Controller if(sizeof($kelulusan) != 0){ array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); } - } + } return response()->json($arraykelulusan,200); } @@ -377,7 +388,7 @@ class KelulusanController extends Controller if(sizeof($kelulusan) != 0){ array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); } - } + } return response()->json($arraykelulusan,200); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c98fae7..cbb3177 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -71,11 +71,14 @@ class LelongController extends Controller return response()->json($lelong); } - public function showBakiLelong($noic,$jenislelong) + public function showBakiLelong($noic,$jenislelong, $kodcaw, Request $request) + { $cawangan_all = Cawangan::on('mysql7')->get(); $bakilelongtotal = 0; $rugilelongtotal = 0; + $current = Carbon::now(); + $current = new Carbon(); if($jenislelong == 'baki') { @@ -91,6 +94,20 @@ class LelongController extends Controller } } + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = "test2"; + // $audit->new_data = $bakilelongtotal; + $audit->new_data = json_encode([ + 'bakilelongtotal' => $bakilelongtotal, + 'rugilelongtotal' => $rugilelongtotal, + ]); + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + + return response()->json($bakilelongtotal, 200); } @@ -602,7 +619,7 @@ class LelongController extends Controller }else{ $link = 'http://adminbid.arrahn/api/portalApi'; } - + $lelong = Http::withOptions(['verify' => true])->get($link,[ 'norujukan' => $request->norujukan ])->json(); @@ -623,8 +640,8 @@ class LelongController extends Controller if($lelong) { $date_lelong = new Carbon($lelong['t_lelong']); - $current_date = new Carbon($current->toDateString()); - + $current_date = new Carbon($current->toDateString()); + if($lelong['t_lelong'] >= $current->toDateString()) { $diff = $date_lelong->diffInDays($current_date); @@ -662,7 +679,7 @@ class LelongController extends Controller } else{ - + $lelong = Lelong::on($cawangan['mysql']) ->where('norujukan', '=', $request->norujukan) ->select('norujukan', 't_lelong') @@ -970,13 +987,13 @@ class LelongController extends Controller if($batchnosama) { $dif=array_intersect($bl,$batchnosama); - + if(!$dif) { array_push($arraybatch,['batchno' => $bl['batchno'], 'bilangantuntutbaki' => $bl['bilangan'], 'bilanganrugi' => 0,'tarikhlelong' => $bl['tarikhlelong']]); } } - + } foreach($batchlelrugi as $index=>$br) @@ -985,13 +1002,13 @@ class LelongController extends Controller if($batchnosama) { $dif=array_intersect($br,$batchnosama); - + if(!$dif) { array_push($arraybatch,['batchno' => $br['batchno'], 'bilangantuntutbaki' => 0, 'bilanganrugi' => $br['bilangan'],'tarikhlelong' => $br['tarikhlelong']]); - } + } } - + } return response()->json($arraybatch); @@ -1031,7 +1048,7 @@ class LelongController extends Controller ->orderBy('gadai.sirig','asc') ->where('gadai.taglel','=', 1); } - + $lelonglist = $lelong->get(); foreach($lelonglist as $index=>$lel) @@ -1106,7 +1123,7 @@ class LelongController extends Controller 'telefon' => $index['user_details']['notelbimbit'], ]); } - + $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$index['norujukan'])->update(array( 'sttebus' => "L", 't_update' => $request->tarikh @@ -1208,7 +1225,7 @@ class LelongController extends Controller return response()->json("success"); } - public function getRingkasanHarian(Request $request){ + public function getRingkasanHarian(Request $request){ $ringkasan = new RingkasanHarianServices; $getData = $ringkasan->getRingkasanHarian($request->mula,$request->hingga,$request->kodcaw); @@ -1323,7 +1340,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->orderBy('lelong.t_lelong','asc') ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan') @@ -1334,7 +1351,7 @@ class LelongController extends Controller $groupbybatch = $lelong_data->groupBy('batchno'); $lelong = []; - foreach($groupbybatch as $index=>$lelongData){ + foreach($groupbybatch as $index=>$lelongData){ $total_pembiayaan = $lelongData->sum('pinjaman'); // dd($total_pembiayaan); $total_lelong = $lelongData->count('norujukan'); @@ -1366,7 +1383,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->orderBy('lelong.t_lelong','asc') ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan') @@ -1376,7 +1393,7 @@ class LelongController extends Controller ->get(); // dd($lelong_data); $lelong = []; - foreach($lelong_data as $index=>$lelongData){ + foreach($lelong_data as $index=>$lelongData){ // dd($lelongData->norujukan); $lelmarhun = LelMarhun::on($cawangan['mysql']) ->where('norujukan',$lelongData['norujukan']) @@ -1385,7 +1402,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->get(); // dd($lelmarhun->norujukan); @@ -1403,7 +1420,7 @@ class LelongController extends Controller // dd($lelong); } - + return response()->json($lelong); } @@ -1421,7 +1438,7 @@ class LelongController extends Controller ->where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orWhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun') ->orderBy('lelong.t_lelong') @@ -1430,8 +1447,8 @@ class LelongController extends Controller ->get(); // dd($lelong_data); $lelong = []; - foreach($lelong_data as $index=>$lelongData){ - + foreach($lelong_data as $index=>$lelongData){ + // dd($lelongData->norujukan); $lelmarhun = LelMarhun::on($cawangan['mysql']) ->where('norujukan',$lelongData['norujukan']) @@ -1441,13 +1458,13 @@ class LelongController extends Controller ->where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orWhere('nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->where('norujukan',$lelongData['norujukan']) ->where('batch_no',$lelongData['batchno']) ->distinct() ->get(); - + array_push($lelong,[ "batchno"=> $lelongData->batchno, "norujukan"=> $lelongData->norujukan, @@ -1464,7 +1481,7 @@ class LelongController extends Controller // dd($lelong); } - + return response()->json($lelong); } @@ -1482,7 +1499,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun') ->orderBy('lelong.t_lelong') @@ -1491,8 +1508,8 @@ class LelongController extends Controller ->get(); // dd($lelong_data); $lelong = []; - foreach($lelong_data as $index=>$lelongData){ - + foreach($lelong_data as $index=>$lelongData){ + $lelmarhun = LelMarhun::on($cawangan['mysql']) ->where('norujukan',$lelongData['norujukan']) ->where('batch_no',$lelongData['batchno']) @@ -1502,7 +1519,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->where('batch_no',$lelongData['batchno']) ->where('norujukan',$lelongData['norujukan']) @@ -1525,7 +1542,7 @@ class LelongController extends Controller // dd($lelong); } - + return response()->json($lelong); } @@ -1543,7 +1560,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->orderBy('lelong.t_lelong','asc') ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan') @@ -1554,7 +1571,7 @@ class LelongController extends Controller $groupbybatch = $lelong_data->groupBy('batchno'); $lelong = []; - foreach($groupbybatch as $index=>$lelongData){ + foreach($groupbybatch as $index=>$lelongData){ $total_pembiayaan = $lelongData->sum('pinjaman'); // dd($total_pembiayaan); $total_lelong = $lelongData->count('norujukan'); @@ -1586,7 +1603,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->orderBy('lelong.t_lelong','asc') ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan') @@ -1596,7 +1613,7 @@ class LelongController extends Controller ->get(); // dd($lelong_data); $lelong = []; - foreach($lelong_data as $index=>$lelongData){ + foreach($lelong_data as $index=>$lelongData){ // dd($lelongData->norujukan); $lelmarhun = LelMarhun::on($cawangan['mysql']) ->where('norujukan',$lelongData['norujukan']) @@ -1607,7 +1624,7 @@ class LelongController extends Controller ->Where(function ($query) use($item) { for ($i = 0; $i < count($item); $i++){ $query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%'); - } + } }) ->where('batch_no',$batchno) ->where('norujukan',$lelongData['norujukan']) @@ -1629,14 +1646,14 @@ class LelongController extends Controller // dd($lelong); } - + return response()->json($lelong); } public function kiraupahUjrahOnePercent($kodcaw,$norujukan){ $onepercentservices = new OnePercentServices(); - + $cawangan = Cawangan::on('mysql7') ->where('kodcaw','=',$kodcaw) ->first(); @@ -1655,7 +1672,7 @@ class LelongController extends Controller $array_upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']); $ujrah = $bilang_bln * $array_upah['ujrah']; $onepercent = $bilang_bln * $array_upah['onepercent']; - $onepercent_semasa = $onepercent; + $onepercent_semasa = $onepercent; $ujrah_semasa = $ujrah; return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa]; @@ -1664,7 +1681,7 @@ class LelongController extends Controller // public function kiraupahUjrahOnePercentRebate($kodcaw,$norujukan){ // // $onepercentservices = new OnePercentServices(); // $onepercentservices = new Calculation(); - + // $cawangan = Cawangan::on('mysql7') // ->where('kodcaw','=',$kodcaw) // ->first(); @@ -1697,7 +1714,7 @@ class LelongController extends Controller ->first(); $onepercentservices = new Calculation(); - + // $cawangan = $kodcaw; $gadai_data = Gadai::on($cawangan['mysql']) @@ -1712,13 +1729,13 @@ class LelongController extends Controller $bilang_bln = $tempoh - $gadai_data['tempohbayar']; $array_upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']); - // $ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']); + // $ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']); // $keuntungan_rounded = $onepercentservices->getRoundedMethod($array_upah['onepercent']); $ujrah = $bilang_bln * $array_upah['ujrah']; $onepercent = $bilang_bln * $array_upah['onepercent']; $ujrah = $onepercentservices->getRoundedMethod($ujrah); $onepercent = $onepercentservices->getRoundedMethod($onepercent); - + return ['ujrah' => $ujrah, 'onepercent' => $onepercent]; } diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 904d2ec..9abfbe5 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -6,6 +6,7 @@ use App\Cawangan; use App\Tunai; use App\Gadai; use App\AddTunai; +use App\Audit; use App\RequestTeller; use App\Denominasi; use App\Vault; @@ -150,6 +151,17 @@ class TunaiController extends Controller 'Expires' => 'Mon, 01 Jan 1990 00:00:00 GMT', ]); + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = "test"; + $audit->new_data = $tunai; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + + return response()->json(); + } public function getTunaiPast($kodcaw,Request $request) diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 63abc5f..b43a47a 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -5,6 +5,7 @@ use App\Vault; use App\Cawangan; use App\Tunai; use App\AddTunai; +use App\Audit; use App\GlDetail; use App\imbangdugalama; use App\GlCode; @@ -20,7 +21,7 @@ class VaultController extends Controller public function list($kodcaw) { $current = Carbon::now(); - $current = new Carbon(); + $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $vault=Vault::on($cawangan['mysql']) @@ -29,7 +30,7 @@ class VaultController extends Controller ->orderby('tarikh','desc')->limit(1)->get(); return response()->json($vault); - + } public function listall($kodcaw) @@ -45,7 +46,7 @@ class VaultController extends Controller public function updateVault($kodcaw, Request $request) { $current = Carbon::now(); - $current = new Carbon(); + $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( @@ -62,7 +63,7 @@ class VaultController extends Controller public function updateVaultPanjar($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','=',$current->toDateString())->orderby('tarikh','desc')->first(); @@ -92,7 +93,7 @@ class VaultController extends Controller public function updateVaultDeletePanjar($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','=',$current->toDateString())->orderby('tarikh','desc')->first(); @@ -122,7 +123,7 @@ class VaultController extends Controller public function updateVaultPendahuluanSerahan($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','=',$current->toDateString())->orderby('tarikh','desc')->first(); @@ -167,7 +168,7 @@ class VaultController extends Controller public function updateVaultDeletePendahuluanSerahan($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','=',$current->toDateString())->orderby('tarikh','desc')->first(); @@ -203,12 +204,12 @@ class VaultController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first(); + $vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first(); if($vault) { - $vaultcreate = Vault::on($cawangan['mysql'])->create([ - + $vaultcreate = Vault::on($cawangan['mysql'])->create([ + 'kodcaw'=>$request->kodcaw, 'tarikh'=> $current->toDateString(), 'bakiawal' => $vault['bakiakhir'], @@ -230,12 +231,12 @@ class VaultController extends Controller 'rm50' => $vault['rm50'], 'rm100' => $vault['rm100'], 'rm1000' => $vault['rm1000'], - 'totpanjar' => 0 - + 'totpanjar' => 0 + ]); }else{ - $vaultcreate = Vault::on($cawangan['mysql'])->create([ - + $vaultcreate = Vault::on($cawangan['mysql'])->create([ + 'kodcaw'=>$request->kodcaw, 'tarikh'=> $current->toDateString(), 'bakiawal' => 0, @@ -257,11 +258,11 @@ class VaultController extends Controller 'rm50' => 0, 'rm100' => 0, 'rm1000' => 0, - 'totpanjar' => 0 - + 'totpanjar' => 0 + ]); } - + return response()->json($vaultcreate,201); } @@ -274,7 +275,7 @@ class VaultController extends Controller $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $gldetail=GlDetail::on($cawangan['mysql'])->create([ + $gldetail=GlDetail::on($cawangan['mysql'])->create([ 'kodcaw' => $request->kodcaw, 'tarikh' => $current->toDateString(), 'dtacct' => '1000/020', @@ -296,7 +297,7 @@ class VaultController extends Controller if($request->jenisgldetail == 'pendahuluan') { - $gldetail=GlDetail::on($cawangan['mysql'])->create([ + $gldetail=GlDetail::on($cawangan['mysql'])->create([ 'kodcaw' => $request->kodcaw, 'tarikh' => $current->toDateString(), 'dtacct' => $request->dtacct, @@ -307,7 +308,7 @@ class VaultController extends Controller ]); }else if($request->jenisgldetail == 'serahan') { - $gldetail=GlDetail::on($cawangan['mysql'])->create([ + $gldetail=GlDetail::on($cawangan['mysql'])->create([ 'kodcaw' => $request->kodcaw, 'tarikh' => $current->toDateString(), 'dtacct' => $request->dtacct, @@ -317,7 +318,7 @@ class VaultController extends Controller 'teller' => $request->teller ]); } - + return response()->json($gldetail,201); @@ -326,21 +327,32 @@ class VaultController extends Controller public function listgldetail($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $current = Carbon::now(); + $current = new Carbon(); $gldetail=GlDetail::on($cawangan['mysql']) ->where('kodcaw','=',$kodcaw) ->orderby('tarikh','desc')->get(); + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = "test3"; + $audit->new_data = $gldetail; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response()->json($gldetail,200); } public function TunaiDiTangan($kodcaw,Request $request) { $current = Carbon::now(); - $current = new Carbon(); - + $current = new Carbon(); + $totalbakiakhirtunai = 0; - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $vault=Vault::on($cawangan['mysql']) ->where('kodcaw','=',$kodcaw) @@ -366,7 +378,7 @@ class VaultController extends Controller { $totalbakiakhirtunai = $vault['bakiakhir']; } - + return response()->json($totalbakiakhirtunai); } @@ -375,10 +387,10 @@ class VaultController extends Controller $current = Carbon::now(); - $current = new Carbon(); - + $current = new Carbon(); + $totalbakiakhirtunai = 0; - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $vault=Vault::on($cawangan['mysql']) ->where('kodcaw','=',$kodcaw) @@ -410,7 +422,7 @@ class VaultController extends Controller $totalkeluar = $vault['keluar'] + $vault['serahan'] + $vault['totpanjar']; $arraytunaiditangan = ['totalmasuk' => $totalmasuk, 'totalkeluar' => $totalkeluar]; - + return response()->json($arraytunaiditangan,200); } @@ -418,14 +430,14 @@ class VaultController extends Controller public function laporanPetiBesi($kodcaw,$tarikh) { $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','=', $tarikh) ->orderby('tarikh','desc')->first(); - + return response()->json($vault); } @@ -492,7 +504,7 @@ class VaultController extends Controller $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC; } - + //Selepas Tawarruq @@ -501,7 +513,7 @@ class VaultController extends Controller ->where('ktacct','=',$pendahuluanpkb) ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2021-03-24']]) ->sum('pendahuluan'); - + //Sebelum Tawarruq $pendahuluanPKB = GlDetail::on($cawangan['mysql']) @@ -528,7 +540,7 @@ class VaultController extends Controller if($kodcaw == '011229') $totalserahan -= 0.10; - + if($kodcaw == '011013') $totalserahan += 641000; @@ -588,17 +600,17 @@ class VaultController extends Controller $totaljmc = $serahanJMC + $serahanjmclama; $totalpkb = $serahanpkb + $serahanpkblama; - + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; }else{ $totaljmc = $serahanJMC; $totalpkb = $serahanpkb; - + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; } - - + + }else{ if($kodcaw == '020301') @@ -627,7 +639,7 @@ class VaultController extends Controller ->where('ktacct','=',$pendahuluanpkb) ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2021-03-24']]) ->sum('pendahuluan'); - + //Sebelum Tawarruq $pendahuluanPKB = GlDetail::on($cawangan['mysql']) @@ -654,14 +666,14 @@ class VaultController extends Controller ->where('glcode','=',$serahankoperasi) ->sum('amaun'); }else{ - + $total = $pendahuluanPKBtawarruq + $pendahuluanPKB + $pendahuluanJMC; $pindahkekpkb = 0; } - + $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb]; return response()->json($arraypend); @@ -670,15 +682,15 @@ class VaultController extends Controller public function laporanPetiBesiRange($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->mula) ->where('tarikh','<=', $request->hingga) ->orderby('tarikh','desc')->get(); - + return response()->json($vault); }