diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 98cc475e..5abb2a35 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -39,6 +39,7 @@ use App\Models\Negeri; use Carbon\Carbon; use App\Models\LelongTebus; +use App\Models\Tetapan; class LelongController extends Controller @@ -1883,6 +1884,167 @@ class LelongController extends Controller ->with('success','Kemaskini Berjaya'); } + public function pindahsenarailelong() + { + $arraydetails = []; + + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + // ->where('lelong.sts_lelong', 3) + ->get()->toArray(); + + foreach($lelong as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + return view('lelong.pindahsenarailelong',compact('lelong', 'arraydetails')); + } + public function temppindahsenarailelong(Request $request) + { + $id = $request->lelong_id; + $lelong_id = $id; + $lelong = Lelong::where('id','=',$id)->first(); + $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get(); + $lelkarat = LelKarat::where('lelong_id','=',$id)->get(); + $jeniskarat = JenisKarat::all(); + + $arraydata = []; + $arraycaw = []; + $data = []; + + $total_marhun = 0; + $total_berat = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_nilaimarhun = 0; + $nilai_marhun = 0; + + + foreach($cawanganlel as $cawlel) + { + $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); + $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar') + ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get(); + + // dd($databid->toArray()); + $packet = 0; + $berat = 0; + $pinjaman =0; + $nilai_marhun = 0; + $kali = $cawlel->kali; + + + foreach($databid as $index1=>$bid) + { + $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); + $berat = $berat + $bid['berat']; + $nilai_marhun = $nilai_marhun + $bid['nilaimarhun']; + $pinjaman =$pinjaman + $bid['pinjaman']; + } + array_push($arraycaw,[ + 'id_cawangan'=> $cawangan['id'], + 'cawangan'=>$cawangan['caw_name'], + 't_lelong'=>$lelong['tarikh_lelong'], + 'kodcaw'=>$cawangan['caw_code'], + 'bil_marhun'=>sizeof($databid), + 'berat'=>$berat, + 'n_marhun'=>$nilai_marhun, + 'pinjaman'=>$pinjaman, + + ]); + + $total_marhun = $total_marhun + sizeof($databid); + $total_berat = $total_berat + $berat; + $total_pinjaman = $total_pinjaman + $pinjaman; + $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; + + $data = Lelong::where('lelong.id','=',$lelong_id) + ->get(); + } + $datapindah = lelong::select("id","tarikh_lelong") + ->where('sts_lelong', 0) + ->where('id','!=', $lelong_id) + ->where('kali','=', $kali) + ->get()->toArray(); + foreach($datapindah as $row) + { + $id = $row['id']; + $tarikh_lelong = date('d-m-Y', strtotime($row['tarikh_lelong']));; + + } + + return view('lelong.showpindah',compact( + 'datapindah', + 'arraycaw', + 'total_marhun', + 'total_berat', + 'total_nmarhun', + 'total_nilaimarhun', + 'total_pinjaman', + 'lelong_id', + 'data' + )); + } + + public function pindahjanadata(Request $request) + { + // dd($request->all()); + $lelongidasal = $request->lelongidasal; + $lelongidbaru = $request->lelong_id; + // dd($lelongidasal); + + //pindah ID lelong + if($request->caw) + { + // dd($request->caw); + $caw = Cawangan::whereIn('caw_code',$request->caw)->get(); + // dd($caw); + foreach($caw as $index=>$cawpindah){ + // dd($cawpindah->id); + + // dd($caw_pindah); + + $surat = LelongBid::where('lelong_id','=',$lelongidasal) + ->where('kodcaw','=',$request->caw) + ->get(); + // dd($surat); + + $suratcaw = $surat->where('kodcaw','=',$cawpindah->caw_code)->all(); + foreach(array_chunk($suratcaw,100) as $data_chunk) + { + //dd($data); + foreach($data_chunk as $data) + { + // dd($data); + $caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)->first(); + $caw_pindahsag->lelong_id = $lelongidbaru; + $caw_pindahsag->update(); + + $caw_pindah = CawanganLelong::where('caw_id', $cawpindah->id)->first(); + $caw_pindah->lelong_id = $lelongidbaru; + $caw_pindah->update(); + } + + + + } + + } + } + else + { + // dd('error'); + } + + return redirect()->route('lelong.pindahsenarailelong'); + } + diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 9cb8acdf..ab91f002 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -155,9 +155,9 @@ class CreateLelongsTable extends Migration $table->string('teller')->nullable(); $table->string('norujukan')->nullable(); $table->string('batch_no')->nullable(); - $table->decimal('nilaimarhun', $precision = 5, $scale = 2); - $table->decimal('pinjaman', $precision = 5, $scale = 2); - $table->decimal('upah', $precision = 5, $scale = 2); + $table->decimal('nilaimarhun', $precision = 11, $scale = 2); + $table->decimal('pinjaman', $precision = 11, $scale = 2); + $table->decimal('upah', $precision = 11, $scale = 2); $table->decimal('jbg', $precision = 5, $scale = 2); $table->string('jenis_tebus')->nullable(); $table->timestamps(); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index fd27893b..b1991033 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -183,6 +183,9 @@
  • Senarai Lelong Tidak Laku
  • +
  • + Tukar Tarikh Lelong +
  • diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 9878ccd5..636f9eb8 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -244,6 +244,22 @@ cursor: context-menu !important; } + #loader { + display: none; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + background: rgba(0,0,0,0.4) url("/your_loading_image.gif") no-repeat center center; + z-index: 99999; + + + } + + + /* --------------------------------------------------- MEDIAQUERIES ----------------------------------------------------- */ diff --git a/resources/views/lelong/pindahsenarailelong.blade.php b/resources/views/lelong/pindahsenarailelong.blade.php new file mode 100644 index 00000000..fcad8744 --- /dev/null +++ b/resources/views/lelong/pindahsenarailelong.blade.php @@ -0,0 +1,176 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    Pindah/Tukar Tarikh Lelong
    + + + + + + + + + + + + + + + + + @foreach($arraydetails as $data) + + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongTindakan
    {{$loop->iteration}}{{ $data['laporan']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$data['laporan']['fasa']}} + @foreach($data['details'] as $details) + {{$details['caw_name']}}
    + @endforeach +
    @if($data['laporan']['masatamat_lelong'] == 0) + {{$data['laporan']['masatamat_lelong']}} + @else + @php + $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan']['masatamat_lelong'] ); + $masa_lelong = $myDateTime->format('h:i: a'); + echo($masa_lelong); + + @endphp + + @endif + {{$data['laporan']['harga_emas_asas']}}{{$data['laporan']['jbg']}}{{$data['laporan']['cajlelong']}} + @hasrole('jurulelong') + + + + + + + + + + + + + + @endhasrole + @hasrole('operasi') + + @if($data['laporan']['sts_lelong'] == 0) + + @elseif($data['laporan']['sts_lelong'] == 1) + + @elseif($data['laporan']['sts_lelong'] == 2) + + @elseif($data['laporan']['sts_lelong'] == 3) + + @endif + @endhasrole +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/lelong/showpindah.blade.php b/resources/views/lelong/showpindah.blade.php new file mode 100644 index 00000000..47c88d30 --- /dev/null +++ b/resources/views/lelong/showpindah.blade.php @@ -0,0 +1,258 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + +
    + + + +@endsection diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index 61de86d1..22808973 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -17,6 +17,7 @@
    @csrf +
    @@ -101,5 +102,14 @@ }); }); + + @endsection diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php index b449292e..8211024f 100644 --- a/resources/views/simulasi/senaraitempsimulasi.blade.php +++ b/resources/views/simulasi/senaraitempsimulasi.blade.php @@ -12,8 +12,9 @@

    Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}

    @csrf + - +
    @@ -151,4 +152,13 @@ }); }); + + @endsection diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 7f7543dc..8dadc985 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -179,6 +179,7 @@
    @csrf +
    diff --git a/routes/web.php b/routes/web.php index 5901a4c6..dbf01b68 100644 --- a/routes/web.php +++ b/routes/web.php @@ -112,8 +112,10 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/kemaskinidata/{lelong_id}',['as'=>'lelong.kemaskinidata','uses'=>'LelongController@kemaskinidata']); - - }); + Route::get('/pindahsenarailelong',['as'=>'lelong.pindahsenarailelong','uses'=>'LelongController@pindahsenarailelong']); + Route::get('/temppindahsenarailelong/{lelong_id}',['as'=>'lelong.temppindahsenarailelong','uses'=>'LelongController@temppindahsenarailelong']); + Route::post('/pindahjanadata',['as'=>'lelong.pindahjanadata','uses'=>'LelongController@pindahjanadata']); +}); Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']);