From 9e987e28026991fc29580cd7fb7f79986d6e4510 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Feb 2022 09:29:04 +0800 Subject: [PATCH] update senarai lelong tak laku --- app/Http/Controllers/LelongController.php | 18 +++- resources/views/includes/sidebar.blade.php | 4 +- .../lelong/senarailelongtaklaku.blade.php | 94 +++++++++++++++++++ routes/web.php | 3 +- 4 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 resources/views/lelong/senarailelongtaklaku.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1e88947a..eda9ba9d 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -6,8 +6,8 @@ use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; -use App\Models\User; use PDF; +use App\Models\User; use App\Models\Cawangan; use App\Models\JenisEmas; use App\Models\JenisKarat; @@ -532,10 +532,23 @@ class LelongController extends Controller } - public function lelongtaklaku(Request $request){ + public function senarailelongtaklaku(Request $request){ + + $user = Auth::user(); + + $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('cawangan.caw_code', $user->kodcaw) + ->get(); + + return view('lelong.senarailelongtaklaku',compact('senarai')); + } + + public function lelongtaklaku($lelong_id){ $lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') ->where('status_jual', 0) + ->where('lelongbid.lelong_id', $lelong_id) ->whereNull('t_jual') ->select( 'lelongbid.t_lelong', @@ -555,6 +568,7 @@ class LelongController extends Controller foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') + ->where('lelongbid.lelong_id', $lelong_id) ->whereNull('t_jual') ->get(); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index ba2aacf8..c7f3d5fe 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -102,8 +102,8 @@
  • Senarai Lelong
  • -
  • - Senarai Lelong Tak Laku +
  • + Senarai Lelong Tak Laku
  • diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php new file mode 100644 index 00000000..2e68ffba --- /dev/null +++ b/resources/views/lelong/senarailelongtaklaku.blade.php @@ -0,0 +1,94 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + @foreach($senarai as $data) + + + + + + + + + + @endforeach + +
    Tarikh LelongMasa Tamat LelongHarga Emas AsasJBGCaj LelongAction
    {{ $data->tarikh_lelong }}{{ $data->masatamat_lelong }}{{ $data->harga_emas_asas }}{{ $data->jbg }}{{ $data->cajlelong }}
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 73d3a65c..1d0c7647 100644 --- a/routes/web.php +++ b/routes/web.php @@ -77,7 +77,8 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:pendaftaranbatch']], function () { Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); - Route::get('/lelongtaklaku',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); + Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); + Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']);