log activity (audit)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user