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

fix mohon and pendser

Browse Source
This commit is contained in:
hafifierahman
2021-10-02 09:55:22 +08:00
parent 8b41fb5eb0
commit 466f41ae50
9 changed files with 197 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/DenoPendSer.php
+28
View File
@@ -0,0 +1,28 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class DenoPendSer extends Model
{
protected $table = 'denopendser';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = ['no','kodlaluan','amaun','tarikh','masa','update','jenis','recno','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50'];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
public $timestamps = false;
}
app/Http/Controllers/KelulusanController.php
+16 -3
View File
@@ -208,13 +208,18 @@ class KelulusanController extends Controller
'norujukan'=> $norujukan,
'siri' => $request->siri,
'komen' => $request->komen,
'lastdategadai' => $request->dategadai,
'margin' => $request->margin,
'nilaimarhun' => $request->nilaimarhun,
'berat' => $request->berat,
'status' => $request->status,
'bilgad' => $request->bilgadai,
'jumpinj' => $request->jumpinjam,
'jenistebus' => $request->jenistebus,
'teller' => $request->teller,
'pelulus' => ($request->pelulus) ? $request->pelulus : ''
]);
}
else if($roles == "operasi")
@@ -226,7 +231,10 @@ class KelulusanController extends Controller
'norujukan'=> $norujukan,
'siri' => $request->siri,
'komen' => $request->komen,
'lastdategadai' => $request->dategadai,
'margin' => $request->margin,
'nilaimarhun' => $request->nilaimarhun,
'berat' => $request->berat,
'status' => $request->status,
'bilgad' => $request->bilgadai,
'jumpinj' => $request->jumpinjam,
'jenistebus' => $request->jenistebus,
@@ -255,7 +263,11 @@ class KelulusanController extends Controller
'tarikh'=> $harini->toDateString(),
'mohon' => $request->mohon,
'norujukan' => $norujukan,
'katalaluan' => $request->message,
'katalaluan' => '',
'pinjaman' => $request->pinjaman,
'nilaimarhun' => $request->nilaimarhun,
'berat' => $request->berat,
'margin' => $request->margin,
'benar' => '0',
'teller' => $request->teller
]);
@@ -276,6 +288,7 @@ class KelulusanController extends Controller
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'katalaluan' => $request->komen,
'benar' => '2',
'id' => $request->khazanah
));
app/Http/Controllers/PendahuluanSerahanController.php
+96
View File
@@ -0,0 +1,96 @@
<?php
namespace App\Http\Controllers;
use App\Cawangan;
use App\DenoPendSer;
use App\GlDetail;
use Carbon\Carbon;
use Illuminate\Http\Request;
class PendahuluanSerahanController extends Controller
{
public function createDenoPendSer($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopendser = DenoPendSer::on('mysql7')->create([
'tarikh' => $current->toDateString(),
'masa' => $current->toTimeString(),
'kodcaw' => $kodcaw,
'kodlaluan' => $request->kodlaluan,
'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'
]);
return response()->json($denopendser,200);
}
public function getDenoPendSer($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopendser = DenoPendSer::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get();
return response()->json($denopendser,200);
}
public function updateDenoPendSer($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$denopendser = DenoPendSer::on('mysql7')
->where('recno','=', $request->recno)
->update(array(
'pelulus' => $request->pelulus,
'masalulus'=> $harini->toTimeString()
));
return response()->json($denopendser,200);
}
public function delete(REQUEST $request,$kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
GlDetail::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete();
return response('Batal Berjaya', 200);
}
}
app/Http/Controllers/TunaiController.php
+1
View File
@@ -394,6 +394,7 @@ class TunaiController extends Controller
$teller = Tunai::on($cawangan['mysql'])
->select('kodlaluan')
->whereRaw('LENGTH(kodlaluan) > 14')
->orWhere('kodlaluan','=','LELONG')
->distinct()
->get();
app/Http/Controllers/VaultController.php
+33
View File
@@ -8,6 +8,7 @@ use App\AddTunai;
use App\GlDetail;
use App\imbangdugalama;
use App\GlCode;
use App\Panjar;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -163,6 +164,38 @@ class VaultController extends Controller
return response()->json($updateVault, 200);
}
public function updateVaultDeletePendahuluanSerahan($kodcaw, Request $request)
{
$current = Carbon::now();
$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();
$bakiawal = $vault['bakiawal'];
$keluar = $vault['keluar'];
$masuk = $vault['masuk'];
$bakiakhir = $vault['bakiakhir'];
$bakieod = $vault['bakieod'];
$pendahuluan = $vault['pendahuluan'];
$serahan = $vault['serahan'];
$totpanjaran = $vault['totpanjar'];
$glpend = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('pendahuluan');
$glser = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('serahan');
$bakiakhir = $bakiawal - $keluar + $masuk + $glpend - $glser - $totpanjaran;
$updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
'pendahuluan' => $glpend,
'serahan' => $glser,
'bakiakhir'=>$bakiakhir,
'bakieod'=>$bakiakhir
));
return response()->json($updateVault, 200);
}
public function create($kodcaw,Request $request)
{
$current = Carbon::now();
app/Mohon.php
+6 -3
View File
@@ -19,14 +19,17 @@ class Mohon extends Model
'norujukan',
'siri',
'komen',
'lastdategadai',
'bildad',
'bilgad',
'jumpinj',
'jenistebus',
'teller',
'pelulus',
'peloperasi',
'masalulus'
'masalulus',
'margin',
'nilaimarhun',
'berat',
'status'
];
/**
app/Mohonid.php
+4
View File
@@ -23,6 +23,10 @@ class Mohonid extends Model
'id',
'katalaluan',
'benar',
'pinjaman',
'nilaimarhun',
'berat',
'margin',
'teller'
];
app/Polis.php
+3 -1
View File
@@ -23,7 +23,9 @@ class Polis extends Model
'tebus',
'recno',
'teller',
'caj'
'caj',
'koddaerah',
'kodnegeri'
];
routes/web.php
+10
View File
@@ -317,6 +317,16 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']);
$router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']);
$router->post('requestdenopendser/{kodcaw}',['uses' => 'PendahuluanSerahanController@createDenoPendSer']);
$router->get('getdenopendser/{kodcaw}',['uses' => 'PendahuluanSerahanController@getDenoPendSer']);
$router->post('requestdenopendser/update/{kodcaw}',['uses' => 'PendahuluanSerahanController@updateDenoPendSer']);
$router->get('SenaraiPendSer/listeach/{kodcaw}',['uses'=>'PendahuluanSerahanController@listeachpendser']);
$router->post('DeletePendSer/{kodcaw}',['uses'=>'PendahuluanSerahanController@delete']);
// $router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']);
$router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePendahuluanSerahan']);
// $router->post('requestdenopendser/batal/{kodcaw}',['uses' => 'PendahuluanSerahanController@batalDenoPanjar']);
//API WAKIL