fix added migration
This commit is contained in:
@@ -719,157 +719,4 @@ class VaultController extends Controller
|
||||
return response()->json($vault);
|
||||
}
|
||||
|
||||
public function createAutoSerahan($kodcaw,Request $request){
|
||||
$current = Carbon::now();
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
ApprovalWithdrawal::on('mysql7')->create([
|
||||
'kodcaw' => $request->kodcaw,
|
||||
'pc_name' => $request->teller,
|
||||
'operasi_name' => null,
|
||||
'amount' => $request->amaun,
|
||||
'approval_status' => 'PENDING',
|
||||
'approval_timestamp' => null,
|
||||
'gldetail_id' => 0,
|
||||
'updated_serahan_v2' => 0,
|
||||
'updated_pendahuluan_v3' => 0,
|
||||
'created_at' => $current,
|
||||
'updated_at' => $current,
|
||||
]);
|
||||
}
|
||||
|
||||
public function autoSerahan($kodcaw,Request $request){
|
||||
$current = Carbon::now();
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
$vault = Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first();
|
||||
|
||||
$bakiawal = $vault['bakiawal'];
|
||||
$keluar = $vault['keluar'];
|
||||
$masuk = $vault['masuk'];
|
||||
$bakiakhir = $vault['bakiakhir'];
|
||||
$pendahuluan = $vault['pendahuluan'];
|
||||
$serahan = $vault['serahan'];
|
||||
$totpanjaran = $vault['totpanjar'];
|
||||
|
||||
DB::connection($cawangan['mysql'])->beginTransaction();
|
||||
DB::connection('mysql7')->beginTransaction();
|
||||
|
||||
try{
|
||||
if($request->jenispendahuluanserahan == 'pendahuluan'){
|
||||
|
||||
$totalpendahuluan = $request->amaun + $pendahuluan;
|
||||
|
||||
$bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
|
||||
|
||||
Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
|
||||
'pendahuluan' => $totalpendahuluan,
|
||||
'bakiakhir' => $bakiakhir,
|
||||
'bakieod' => $bakiakhir
|
||||
));
|
||||
|
||||
GlDetail::on($cawangan['mysql'])->create([
|
||||
'kodcaw' => $request->kodcaw,
|
||||
'tarikh' => $current->toDateString(),
|
||||
'dtacct' => $request->dtacct,
|
||||
'ktacct' => $request->ktacct,
|
||||
'descpt' => $request->keterangan,
|
||||
'pendahuluan' => $request->amaun,
|
||||
'teller' => $request->teller . ' (AUTO V3)',
|
||||
'date_created' => $current
|
||||
]);
|
||||
|
||||
ApprovalWithdrawal::on('mysql7')->update(array(
|
||||
'updated_pendahuluan_v3' => 1,
|
||||
));
|
||||
|
||||
}else if($request->jenispendahuluanserahan == 'serahan'){
|
||||
|
||||
$totalserahan = $request->amaun + $serahan;
|
||||
|
||||
$bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran;
|
||||
|
||||
Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
|
||||
'serahan' => $totalserahan,
|
||||
'bakiakhir' => $bakiakhir,
|
||||
'bakieod' => $bakiakhir
|
||||
));
|
||||
|
||||
$gldetail = GlDetail::on($cawangan['mysql'])->create([
|
||||
'kodcaw' => $request->kodcaw,
|
||||
'tarikh' => $current->toDateString(),
|
||||
'dtacct' => $request->dtacct,
|
||||
'ktacct' => $request->ktacct,
|
||||
'descpt' => $request->keterangan,
|
||||
'serahan' => $request->amaun,
|
||||
'teller' => $request->teller . ' (AUTO V3)',
|
||||
'date_created' => $current
|
||||
]);
|
||||
|
||||
DenoPendSer::on('mysql7')->create([
|
||||
'tarikh' => $current->toDateString(),
|
||||
'masa' => $current->toTimeString(),
|
||||
'kodcaw' => $kodcaw,
|
||||
'kodlaluan' => $request->teller,
|
||||
'amaun' => $request->amaun,
|
||||
'bd1' => $request->bd1,
|
||||
'bd5' => $request->bd5,
|
||||
'bd10' => $request->bd10,
|
||||
'bd20' => $request->bd20,
|
||||
'bd50' => $request->bd50,
|
||||
'bd100' => $request->bd100,
|
||||
'txtring1' => $request->txtring1,
|
||||
'txtring5' => $request->txtring5,
|
||||
'txtring10' => $request->txtring10,
|
||||
'txtring20' => $request->txtring20,
|
||||
'txtring50' => $request->txtring50,
|
||||
'txtring100' => $request->txtring100,
|
||||
'txtring1000' => $request->txtring1000,
|
||||
'txtsen1' => $request->txtsen1,
|
||||
'txtsen5' => $request->txtsen5,
|
||||
'txtsen10' => $request->txtsen10,
|
||||
'txtsen20' => $request->txtsen20,
|
||||
'txtsen50' => $request->txtsen50,
|
||||
'jenis' =>$request->jenis,
|
||||
'recno' =>$request->recno,
|
||||
'update' => '0'
|
||||
]);
|
||||
|
||||
ApprovalWithdrawal::on('mysql7')->update(array(
|
||||
'updated_serahan_v2' => 1,
|
||||
'gldetail_id' => $gldetail->id
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
// Commit transactions
|
||||
DB::connection($cawangan['mysql'])->commit();
|
||||
DB::connection('mysql7')->commit();
|
||||
|
||||
}catch(\Exception $e){
|
||||
DB::connection($cawangan['mysql'])->rollBack();
|
||||
DB::connection('mysql7')->rollBack();
|
||||
return response()->json($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public function autoSerahanApproval($kodcaw,Request $request){
|
||||
$current = Carbon::now();
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
$vault = Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first();
|
||||
|
||||
DB::connection($cawangan['mysql'])->beginTransaction();
|
||||
DB::connection('mysql7')->beginTransaction();
|
||||
|
||||
try{
|
||||
DB::connection('mysql7')->commit();
|
||||
DB::connection($cawangan['mysql'])->commit();
|
||||
}catch(\Exception $e){
|
||||
DB::connection($cawangan['mysql'])->rollBack();
|
||||
DB::connection('mysql7')->rollBack();
|
||||
return response()->json($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+2
-1
@@ -22,8 +22,9 @@ class CreateApprovalWithdrawal extends Migration
|
||||
$table->string('approval_status',20);
|
||||
$table->boolean('updated_serahan_v2')->default(false);
|
||||
$table->boolean('updated_pendahuluan_v3')->default(false);
|
||||
$table->timestamp('approval_timestamp');
|
||||
$table->timestamp('approval_timestamp')->nullable();
|
||||
$table->integer('gldetail_id');
|
||||
$table->integer('denopendser_id');
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
+3
-2
@@ -679,8 +679,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
$router->get('record/accountstatement/{kodcaw}',['uses'=>'TunaiController@getAccStatement']);
|
||||
|
||||
/* Endpoint for Auto Serahan */
|
||||
$router->get('auto/serahan/{kodcaw}',['uses'=>'VaultController@autoSerahan']);
|
||||
$router->put('auto/approve/serahan/{kodcaw}',['uses'=>'VaultController@autoSerahanApproval']);
|
||||
$router->get('autoserahan/list',['uses'=>'AutoSerahanController@getAutoSerahan']);
|
||||
$router->put('autoserahan/approve',['uses'=>'AutoSerahanController@autoSerahanApproval']);
|
||||
$router->post('autoserahan/create',['uses'=>'AutoSerahanController@createAutoSerahan']);
|
||||
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user