KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix migrations and added function

Browse Source
This commit is contained in:
hafifierahman
2025-03-02 09:02:16 +08:00
committed by Hafifie PKB
parent aecb147d9c
commit 07954b9b5e
4 changed files with 113 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ApprovalWithdrawal.php
+4 -1
View File
@@ -22,8 +22,11 @@ class ApprovalWithdrawal extends Model
'approval_status', 'approval_status',
'updated_serahan_v2', 'updated_serahan_v2',
'updated_pendahuluan_v3', 'updated_pendahuluan_v3',
'denopendser_id_v2',
'gldetail_id_v2',
'denopendser_id_v3',
'gldetail_id_v3',
'approval_timestamp', 'approval_timestamp',
'gldetail_id'
]; ];
} }
app/GlDetail.php
+2 -1
View File
@@ -23,7 +23,8 @@ class GlDetail extends Model
'amaun', 'amaun',
'pendahuluan', 'pendahuluan',
'serahan', 'serahan',
'teller' 'teller',
'date_created'
]; ];
/** /**
app/Http/Controllers/AutoSerahanController.php
+102 -83
View File
@@ -12,13 +12,14 @@ use App\Vault;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class AutoSerahanController extends Controller class AutoSerahanController extends Controller
{ {
public function getAutoSerahan(Request $request){ public function getAutoSerahan(Request $request){
$query = ApprovalWithdrawal::on('mysql7')->where('approval_status', 'PENDING'); $query = ApprovalWithdrawal::on('mysql7')->where('approval_status', 'PENDING');
if (isset($request->kodcaw)) $query->where('kodcaw', '=', $request->kodcaw); if (isset($request->kodcaw)) $query->where('kodcaw', '=', $request->kodcaw);
$listapproval = $query->get(); $listapproval = $query->paginate(5);
return response()->json($listapproval,200); return response()->json($listapproval,200);
} }
@@ -37,56 +38,66 @@ class AutoSerahanController extends Controller
'kodcaw' => $request->kodcaw, 'kodcaw' => $request->kodcaw,
'kodlaluan' => $request->teller, 'kodlaluan' => $request->teller,
'amaun' => $request->amaun, 'amaun' => $request->amaun,
'bd1' => $request->bd1, 'bd1' => 0,
'bd5' => $request->bd5, 'bd5' => 0,
'bd10' => $request->bd10, 'bd10' => 0,
'bd20' => $request->bd20, 'bd20' => 0,
'bd50' => $request->bd50, 'bd50' => 0,
'bd100' => $request->bd100, 'bd100' => 0,
'txtring1' => $request->txtring1, 'txtring1' => isset($request->txtring1) ? $request->txtring1 : 0,
'txtring5' => $request->txtring5, 'txtring5' => isset($request->txtring5) ? $request->txtring5 : 0,
'txtring10' => $request->txtring10, 'txtring10' => isset($request->txtring10) ? $request->txtring10 : 0,
'txtring20' => $request->txtring20, 'txtring20' => isset($request->txtring20) ? $request->txtring20 : 0,
'txtring50' => $request->txtring50, 'txtring50' => isset($request->txtring50) ? $request->txtring50 : 0,
'txtring100' => $request->txtring100, 'txtring100' => isset($request->txtring100) ? $request->txtring100 : 0,
'txtring1000' => $request->txtring1000, 'txtring1000' => isset($request->txtring1000) ? $request->txtring1000 : 0,
'txtsen1' => $request->txtsen1, 'txtsen1' => isset($request->txtsen1) ? $request->txtsen1 : 0,
'txtsen5' => $request->txtsen5, 'txtsen5' => isset($request->txtsen5) ? $request->txtsen5 : 0,
'txtsen10' => $request->txtsen10, 'txtsen10' => isset($request->txtsen10) ? $request->txtsen10 : 0,
'txtsen20' => $request->txtsen20, 'txtsen20' => isset($request->txtsen20) ? $request->txtsen20 : 0,
'txtsen50' => $request->txtsen50, 'txtsen50' => isset($request->txtsen50) ? $request->txtsen50 : 0,
'jenis' =>$request->jenis, 'jenis' =>$request->jenis,
'recno' =>$request->recno, 'recno' => 0,
'update' => '0' 'update' => 0
]); ]);
ApprovalWithdrawal::on('mysql7')->create([ if($request->version == 'v3'){
'kodcaw' => $request->kodcaw, $approval = ApprovalWithdrawal::on('mysql7')->create([
'pc_name' => $request->username, 'kodcaw' => $request->kodcaw,
'operasi_name' => null, 'pc_name' => $request->teller,
'amount' => $request->amount, 'operasi_name' => null,
'approval_status' => 'PENDING', 'amount' => $request->amaun,
'approval_timestamp' => null, 'approval_status' => 'PENDING',
'gldetail_id' => 0, 'approval_timestamp' => null,
'denopendser_id' => $deno_pendser->id, 'gldetail_id_v3' => 0,
'updated_serahan_v2' => 0, 'gldetail_id_v2' => 0,
'updated_pendahuluan_v3' => 0, 'denopendser_id_v3' => $deno_pendser->id,
'created_at' => $current, 'denopendser_id_v2' => 0,
'updated_at' => $current, 'updated_serahan_v2' => 0,
]); 'updated_pendahuluan_v3' => 0,
'created_at' => $current,
'updated_at' => $current,
]);
DB::connection('mysql7')->commit();
return response()->json(['status' => 'success','id' => $approval->id]);
}else{
ApprovalWithdrawal::on('mysql7')->where('id', $request->id)->update([
'denopendser_id_v2' => $deno_pendser->id,
]);
DB::connection('mysql7')->commit();
return response()->json(['status' => 'success']);
}
DB::connection('mysql7')->commit();
return response()->json('success');
}catch(\Exception $e){ }catch(\Exception $e){
DB::connection('mysql7')->rollBack(); DB::connection('mysql7')->rollBack();
return response()->json($e->getMessage()); return response()->json(['status' => 'failed','message' => $e->getMessage()]);
} }
} }
private function autoSerahanEngine($jenis, $request){ private function autoSerahanEngine($jenis, $kodcaw,$teller,$amaun,$id){
$current = Carbon::now(); $current = Carbon::now();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault = Vault::on($cawangan['mysql'])->where('kodcaw','=',$request->kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first(); $vault = Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first();
$bakiawal = $vault['bakiawal']; $bakiawal = $vault['bakiawal'];
$keluar = $vault['keluar']; $keluar = $vault['keluar'];
@@ -100,70 +111,80 @@ class AutoSerahanController extends Controller
DB::connection('mysql7')->beginTransaction(); DB::connection('mysql7')->beginTransaction();
try{ try{
$approval = ApprovalWithdrawal::on('mysql7')->where('id',$request->id)->first(); $approval = ApprovalWithdrawal::on('mysql7')->where('id',$id)->first();
if($jenis == 'pendahuluan'){ if($jenis == 'pendahuluan'){
$totalpendahuluan = $request->amaun + $pendahuluan; $totalpendahuluan = $amaun + $pendahuluan;
$bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran; $bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
$denopendser = DenoPendSer::on('mysql7')->where('id',$approval['denopendser_id'])->first(); $denopendser = DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v3'])->first();
$this->updateDenominasi($request->kodcaw,$denopendser); $this->updateDenominasi($kodcaw,$denopendser);
$gldetail = GlDetail::on($cawangan['mysql'])->create([ $gldetail = GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $request->kodcaw, 'kodcaw' => $kodcaw,
'tarikh' => $current->toDateString(), 'tarikh' => $current->toDateString(),
'dtacct' => $request->dtacct, 'dtacct' => '1000/010',
'ktacct' => $request->ktacct, 'ktacct' => '7000/102',
'descpt' => $request->keterangan, 'descpt' => 'Auto Pendahuluan Daripada V2',
'pendahuluan' => $request->amaun, 'pendahuluan' => $amaun,
'teller' => $request->teller . ' (AUTO V3)', 'teller' => $teller . ' (AUTO V2)',
'date_created' => $current 'date_created' => $current
]); ]);
DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v3'])->update(array(
'recno' => $gldetail->id,
'update' => 1
));
Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
'pendahuluan' => $totalpendahuluan, 'pendahuluan' => $totalpendahuluan,
'bakiakhir' => $bakiakhir, 'bakiakhir' => $bakiakhir,
'bakieod' => $bakiakhir 'bakieod' => $bakiakhir
)); ));
ApprovalWithdrawal::on('mysql7')->where('id',$request->id)->update(array( ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
'updated_pendahuluan_v3' => 1, 'updated_pendahuluan_v3' => 1,
'gldetail_id' => $gldetail->id 'gldetail_id_v3' => $gldetail->id
)); ));
}else if($jenis == 'serahan'){ }else if($jenis == 'serahan'){
$totalserahan = $request->amaun + $serahan; $totalserahan = $amaun + $serahan;
$bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran; $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran;
$denopendser = DenoPendSer::on('mysql7')->where('id',$approval['denopendser_id'])->first(); $denopendser = DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v2'])->first();
$this->updateDenominasi($request->kodcaw,$denopendser); $this->updateDenominasi($kodcaw,$denopendser);
$gldetail = GlDetail::on($cawangan['mysql'])->create([ $gldetail = GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $request->kodcaw, 'kodcaw' => $kodcaw,
'tarikh' => $current->toDateString(), 'tarikh' => $current->toDateString(),
'dtacct' => $request->dtacct, 'dtacct' => '1000/010',
'ktacct' => $request->ktacct, 'ktacct' => '1000/020',
'descpt' => $request->keterangan, 'descpt' => 'Auto Serahan Kepada V3',
'serahan' => $request->amaun, 'serahan' => $amaun,
'teller' => $request->teller . ' (AUTO V3)', 'teller' => $teller . ' (AUTO V3)',
'date_created' => $current 'date_created' => $current
]); ]);
DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v2'])->update(array(
'recno' => $gldetail->id,
'update' => 1
));
Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
'serahan' => $totalserahan, 'serahan' => $totalserahan,
'bakiakhir' => $bakiakhir, 'bakiakhir' => $bakiakhir,
'bakieod' => $bakiakhir 'bakieod' => $bakiakhir
)); ));
ApprovalWithdrawal::on('mysql7')->where('id',$request->id)->update(array( ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
'updated_serahan_v2' => 1, 'updated_serahan_v2' => 1,
'gldetail_id' => $gldetail->id 'gldetail_id_v2' => $gldetail->id
)); ));
} }
@@ -193,11 +214,11 @@ class AutoSerahanController extends Controller
$approval->approval_timestamp = $current; $approval->approval_timestamp = $current;
$approval->save(); $approval->save();
$updated_serahan = $this->autoSerahanEngine('serahan',$request); $updated_serahan = $this->autoSerahanEngine('serahan',$request->kodcaw,$request->teller,$request->amaun,$request->id);
$updated_pendahuluan = $this->autoSerahanEngine('pendahuluan',$request); $updated_pendahuluan = $this->autoSerahanEngine('pendahuluan',$request->kodcaw,$request->teller,$request->amaun,$request->id);
DB::connection('mysql7')->commit(); DB::connection('mysql7')->commit();
return response()->json('success',200); return response()->json(['status' => 'success'],200);
}else{ }else{
$approval->operasi_name = $request->operasi_name; $approval->operasi_name = $request->operasi_name;
$approval->approval_status = 'REJECTED'; $approval->approval_status = 'REJECTED';
@@ -205,19 +226,19 @@ class AutoSerahanController extends Controller
$approval->save(); $approval->save();
DB::connection('mysql7')->commit(); DB::connection('mysql7')->commit();
return response()->json('rejected',200); return response()->json(['status' => 'success'],200);
} }
}catch(\Exception $e){ }catch(\Exception $e){
DB::connection('mysql7')->rollBack(); DB::connection('mysql7')->rollBack();
return response()->json($e->getMessage()); return response()->json(['status' => 'error','message' =>$e->getMessage(), 'line' => $e->getLine()]);
} }
} }
private function updateDenominasi($kodcaw,$denopendser){ private function updateDenominasi($kodcaw,$denopendser){
$current = Carbon::now(); $current = Carbon::now();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
Log::debug($denopendser);
$k1 = $denopendser['k1']; $k1 = $denopendser['k1'];
$txtring1 = $denopendser['k1'] * 1; $txtring1 = $denopendser['k1'] * 1;
$k5 = $denopendser['k5']; $k5 = $denopendser['k5'];
@@ -256,30 +277,28 @@ class AutoSerahanController extends Controller
'b50'=> 0, 'b50'=> 0,
'bd100'=> 0, 'bd100'=> 0,
'b100'=> 0, 'b100'=> 0,
'txtring1'=> $request->txtring1, 'txtring1'=> $txtring1,
'k1'=> $k1, 'k1'=> $k1,
'txtring5'=> $request->txtring5, 'txtring5'=> $txtring5,
'k5'=> $k5, 'k5'=> $k5,
'txtsen1'=> $request->txtsen1, 'txtsen1'=> $txtsen1,
'k01'=> $k01, 'k01'=> $k01,
'txtsen5'=> $request->txtsen5, 'txtsen5'=> $txtsen5,
'k05'=> $k05, 'k05'=> $k05,
'txtsen10'=> $request->txtsen10, 'txtsen10'=> $txtsen10,
'k010'=> $k010, 'k010'=> $k010,
'txtsen20'=> $request->txtsen20, 'txtsen20'=> $txtsen20,
'k020'=> $k020, 'k020'=> $k020,
'txtsen50'=> $request->txtsen50, 'txtsen50'=> $txtsen50,
'k050'=> $k050, 'k050'=> $k050,
'txtring10'=> $request->txtring10, 'txtring10'=> $txtring10,
'k10'=> $k10, 'k10'=> $k10,
'txtring20'=> $request->txtring20, 'txtring20'=> $txtring20,
'k20'=> $k20, 'k20'=> $k20,
'txtring50'=> $request->txtring50, 'txtring50'=> $txtring50,
'k50'=> $k50, 'k50'=> $k50,
'txtring100'=> $request->txtring100, 'txtring100'=> $txtring100,
'k100'=> $k100, 'k100'=> $k100,
'txtring1000'=> $request->txtring1000,
'k1000'=> $request->k1000,
'jumlahbundle'=> 0, 'jumlahbundle'=> 0,
'txtjumlah'=> $totalkeping, 'txtjumlah'=> $totalkeping,
'jumlahkeping' => $totalkeping 'jumlahkeping' => $totalkeping
database/migrations/2025_02_23_154307_create_approval_withdrawal.php
+5 -3
View File
@@ -20,11 +20,13 @@ class CreateApprovalWithdrawal extends Migration
$table->string('operasi_name', 100)->nullable(); $table->string('operasi_name', 100)->nullable();
$table->decimal('amount', 10, 2)->default(0); $table->decimal('amount', 10, 2)->default(0);
$table->string('approval_status',20); $table->string('approval_status',20);
$table->timestamp('approval_timestamp')->nullable();
$table->integer('gldetail_id_v3')->nullable()->default(0);
$table->integer('denopendser_id_v3')->nullable()->default(0);
$table->integer('gldetail_id_v2')->nullable()->default(0);
$table->integer('denopendser_id_v2')->nullable()->default(0);
$table->boolean('updated_serahan_v2')->default(false); $table->boolean('updated_serahan_v2')->default(false);
$table->boolean('updated_pendahuluan_v3')->default(false); $table->boolean('updated_pendahuluan_v3')->default(false);
$table->timestamp('approval_timestamp')->nullable();
$table->integer('gldetail_id');
$table->integer('denopendser_id');
$table->timestamps(); $table->timestamps();
}); });
} }