diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index fd8d862f..5a728eba 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -31,6 +31,7 @@ use App\Models\LelongBidMarhun; use App\Models\LelKarat; use App\Models\LelKarat_temp; use App\Models\Resit; +use App\Models\LogUser; use Carbon\Carbon; @@ -282,6 +283,9 @@ class LelongController extends Controller public function create($id) { + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); $simulasi = Simulasi::where('id','=',$id)->first(); $cawangansim = CawanganSimulasi::where('simulasi_id','=',$id)->get(); $simkarat = SimKarat::where('simulasi_id','=',$id)->get(); @@ -397,6 +401,7 @@ class LelongController extends Controller $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first(); $updategadai->taglel = 1; $updategadai->save(); + // $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first(); // $hapussimulasi->delete(); @@ -432,7 +437,18 @@ class LelongController extends Controller $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first(); $hapussimulasi->delete(); - } + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $data->norujukan; + $loguser->nota = 'Daftar Batch Lelong '.$lelong->id; + $loguser->save(); + } + } } @@ -457,6 +473,10 @@ class LelongController extends Controller public function delete($id) { + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + $lelongbid = LelongBid::where('lelong_id', $id) ->get()->toArray(); @@ -464,7 +484,18 @@ class LelongController extends Controller { $gadai = Gadai::where('norujukan', $bid['norujukan'])->first(); $gadai->taglel = 0; - $gadai->update(); + $gadai->update(); + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $bid['norujukan']; + $loguser->nota = ' Hapus Batch Lelong '.$id; + $loguser->save(); + } $lelong = Lelong::where('id','=',$id)->first(); @@ -970,8 +1001,26 @@ class LelongController extends Controller $data = $request->checkboxdata; foreach($data as $index=>$norujukan) { + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + $marhun = LelongBid::where('norujukan','=',$norujukan)->first(); $marhun->delete(); + + $updategadai = Gadai::where('norujukan','=', $norujukan)->first(); + $updategadai->taglel = 0; + $updategadai->save(); + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $norujukan; + $loguser->nota = ' Tangguh Lelong'; + $loguser->save(); } return redirect()->route('lelong.senaraimarhun',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid]) diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 8f8ada93..0cb2997e 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -846,6 +846,7 @@ class SimulasiController extends Controller { $marhun = SimulasiBid::where('norujukan','=',$norujukan)->first(); $marhun->delete(); + } return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid]) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 00ee7b43..c2150f7c 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -40,7 +40,7 @@ class TangguhLelongController extends Controller // $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') // ->where('lelong_id',$info['lelong_id']) - $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual') + $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual','caw_code') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code') ->where('cawangan_lelong.lelong_id', $info['lelong_id']) @@ -372,4 +372,47 @@ class TangguhLelongController extends Controller } return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success','Pengesahan Berjaya'); } + //PC + public function listtangguh($lelong_id,$caw_code) + { + $user = Auth::user(); + + // dd($id); + $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id') + ->where('tangguhlelong.norujukan', 'like', "%$caw_code%") + ->whereNotNull('tangguhlelong.tarikhtangguh') + ->select('tangguhlelong.id as tangguhlelong_id', + 'tangguhlelong.lelongbid_id', + 'tangguhlelong.norujukan', + 'tangguhlelong.tarikhtangguh', + 'tangguhlelong.ditangguh_pada', + 'tangguhlelong.ditangguh_oleh', + 'tangguhlelong.nota', + 'lelong.id as lelong_id', + 'lelong.tarikh_lelong', + 'lelong.harga_emas_asas', + 'lelong.jbg', + 'lelong.cajlelong', + 'lelong.sts_lelong' + ) + ->get(); + //dd($tangguhlelong); + + foreach($tangguhlelong as $index1=>$tanguhlel) + { + $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('lelong_id', $lelong_id) + ->where('kodcaw', $caw_code) + ->select('cawangan.caw_name','cawangan.caw_code') + ->first(); + + $tangguhlelong[$index1]['details'] = $tanguhlel; + $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; + + } + + return view('tangguhlelong.listtangguh',compact('tangguhlelong','lelong_id', 'caw_code', 'getkodcaw')); + + + } } diff --git a/app/Models/LogUser.php b/app/Models/LogUser.php new file mode 100644 index 00000000..02929efe --- /dev/null +++ b/app/Models/LogUser.php @@ -0,0 +1,23 @@ +rememberToken(); $table->timestamps(); }); + + Schema::create('loguser', function (Blueprint $table) { + $table->bigIncrements('recno'); + $table->integer('user_id')->nullable(); //set + $table->datetime('date')->nullable(); + $table->string('username')->nullable(); + $table->string('nama_user')->nullable(); + $table->string('norujukan')->nullable(); + $table->string('nota'); + $table->timestamps(); + + // $table->foreign('norujukan') + // ->references('norujukan')->on('gadai') + // ->onDelete('cascade'); + }); } /** diff --git a/resources/views/tangguhlelong/listtangguh.blade.php b/resources/views/tangguhlelong/listtangguh.blade.php new file mode 100644 index 00000000..d802806f --- /dev/null +++ b/resources/views/tangguhlelong/listtangguh.blade.php @@ -0,0 +1,116 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + +
+
+
+

Tarikh Lelong : {{ $tangguhlelong[0]['tarikh_lelong'] }}

+

Nama Cawangan : {{ $getkodcaw->caw_name }}

+

JBG : {{ $tangguhlelong[0]['jbg'] }}

+
+
+
+
+ + + + + + + + + + + + + + @foreach ($tangguhlelong as $tangguhlel) + + + + + + + + @endforeach + +
BilTarikh TangguhNo RujukanRemarkAction
{{ $loop->iteration }}{{ $tangguhlel->tarikhtangguh }}{{ $tangguhlel->norujukan }}{{ $tangguhlel->nota }} + +
+
+
+ Kembali +
+
+ +
+
+ + +@endsection diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php index 053ada70..2d04439e 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -28,6 +28,7 @@ + @foreach ($arrayinfo as $lel) {{$loop->iteration}} @@ -58,7 +59,8 @@ @if($lel['info']['sts_lelong'] == 0) - + + @endif diff --git a/routes/web.php b/routes/web.php index 9715df37..861c0b20 100644 --- a/routes/web.php +++ b/routes/web.php @@ -267,6 +267,7 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel Route::get('/carian/{lelong_id}', ['as'=>'tangguhlelong.carian','uses'=>'TangguhLelongController@carian']); Route::post('/searchbyic', ['as'=>'tangguhlelong.searchbyic','uses'=>'TangguhLelongController@searchbyic']); Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']); + Route::get('/listtangguh/{lelong_id}/{caw_code}', ['as'=>'tangguhlelong.listtangguh','uses'=>'TangguhLelongController@listtangguh']); });