From b1802554823da6d6ead110bc745b32541b9713ba Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 17 Nov 2022 17:02:49 +0800 Subject: [PATCH 01/13] update design table --- app/Http/Controllers/PaymentController.php | 9 ++++- app/Http/Controllers/PembidaController.php | 8 +++- .../views/pembayaran/SAGBidItem.blade.php | 17 ++++++--- .../pembayaran/kaunterpembayaran.blade.php | 33 ++++++++++------ .../pembayaran/senarailelongbayaran.blade.php | 19 ++++++++-- .../listkebenaranbayarantunai.blade.php | 19 +++++++--- .../pembida/senaraipemenangbycaw.blade.php | 38 ++++++++++++------- 7 files changed, 100 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index b238817a..4478f92f 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -47,8 +47,10 @@ class PaymentController extends Controller array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); // dd($detailsinfo); } + $datacaw = Cawangan::where('caw_code','=', $user->kodcaw) + ->get(); - return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo')); + return view('pembayaran.senarailelongbayaran',compact('datacaw','lelong', 'arrayinfo')); } @@ -111,7 +113,10 @@ class PaymentController extends Controller } - return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); + $datacaw = Cawangan::where('caw_code','=', $user->kodcaw) + ->get(); + + return view('pembayaran.kaunterpembayaran',compact('datacaw','listwinner','lelong_id')); } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 4b0856fc..881d44c8 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -485,8 +485,10 @@ class PembidaController extends Controller array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); } // dd($request->kodcaw); + $datacaw = Cawangan::where('caw_code','=',$kodcaw) + ->get(); - return view('pembida.listkebenaranbayarantunai',compact('lelong','arrayinfo')); + return view('pembida.listkebenaranbayarantunai',compact('datacaw','lelong','arrayinfo')); } // public function senaraipemenangbycaw(Request $request, $lelong_id){ @@ -596,9 +598,11 @@ class PembidaController extends Controller $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; } + $datacaw = Cawangan::where('caw_code','=',$caw_code) + ->get(); // return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); - return view('pembida.senaraipemenangbycaw',compact('listwinner','lelong_id','caw_code')); + return view('pembida.senaraipemenangbycaw',compact('datacaw','listwinner','lelong_id','caw_code')); } diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 4b50df8d..d5e4573b 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -10,7 +10,7 @@
- Cawangan : @foreach($datacaw as $data1) + Senarai SAG : @foreach($datacaw as $data1) {{$data1['caw_name']}} @endforeach
@@ -74,7 +74,7 @@ - +
@@ -130,20 +130,25 @@
No
- @if($statuspayment->opencash == '1') + {{-- {{dd($statuspayment->status_payment)}} --}} + @if($statuspayment->opencash == '1' && $statuspayment->status_payment == NULL)
{{-- Kembali --}} {{-- --}}
- @elseif($statuspayment->opencash == '0') + @elseif($statuspayment->opencash == '0' && $statuspayment->status_payment == NULL)

Sila Hubungi Operasi Untuk Kebenaran

+ @elseif($statuspayment->opencash == '1' && $statuspayment->status_payment == '1') +
+ +
@endif -
+ {{--
Kembali -
+
--}} diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index 52c62eec..a36f4e38 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -4,6 +4,7 @@
+
@if ($message = Session::get('success'))
@@ -14,8 +15,18 @@

{{ $message }}

@endif -

Senarai Bayaran Pemenang

- + {{--

Senarai Bayaran Pemenang

--}} +
+ + + +
+ Senarai Bayaran Pemenang : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
+
+
@@ -28,7 +39,7 @@ - + {{-- --}} @@ -36,7 +47,7 @@ @foreach($listwinner as $winner) - + @@ -49,31 +60,31 @@ @endif - - - + --}} @endforeach
NoStatus Bayaran Penyata Bayaran Slip SerahanResit PembayaranResit PembayaranTindakan
{{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['name']}} {{ $winner['details']['nokp']}} {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat']}} + + + {{-- - {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) ) --}} - + {{-- @endif --}}
-
+ {{--
Kembali -
+
--}}
diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php index 587386c1..de2398d9 100644 --- a/resources/views/pembayaran/senarailelongbayaran.blade.php +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -10,13 +10,24 @@

{{ $message }}

@endif -

Senarai Lelong

+
+
+
+ + + +
+ Senarai Lelong : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
+
- + {{-- --}} @@ -28,11 +39,11 @@ - + --}}
No ID LelongCawanganCawanganFasa Tarikh Lelong Status Lelong
{{$loop->iteration}} {{ $data['info']['lelong_id'] }} + {{-- @foreach($data['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach - 		{{ $data['info']['fasa'] }} @php $myDateTime = DateTime::createFromFormat('Y-m-d', $data['info']['tarikh_lelong'] ); diff --git a/resources/views/pembida/listkebenaranbayarantunai.blade.php b/resources/views/pembida/listkebenaranbayarantunai.blade.php index 8bae945e..21086f50 100644 --- a/resources/views/pembida/listkebenaranbayarantunai.blade.php +++ b/resources/views/pembida/listkebenaranbayarantunai.blade.php @@ -1,17 +1,26 @@ @extends('layouts.app') @section('content') -
-
+
+
+ {{--
--}} @if ($message = Session::get('success'))

{{ $message }}

@endif -

KEBENARAN BAYARAN TUNAI

- +
+
+ + + +
+ Kebenaran Bayaran Tunai +
+
+
@@ -37,7 +46,7 @@ @endphp - + - {{-- --}} @foreach ($arraydetails as $laporan) - + - - {{-- --}} @endforeach diff --git a/resources/views/marhun/scanbarcode.blade.php b/resources/views/marhun/scanbarcode.blade.php index 1f3bcd4c..249c6ca2 100644 --- a/resources/views/marhun/scanbarcode.blade.php +++ b/resources/views/marhun/scanbarcode.blade.php @@ -17,6 +17,7 @@ @endif Kembali + Senarai SAG Keluar Peti Besi

Tarikh Lelong: @php @@ -30,9 +31,9 @@

  • Senarai SAG Akan Dilelong
    • -
  • + {{--
  • Senarai SAG Keluar/Masuk Peti Besi -
    • + --}}
    @@ -71,7 +72,7 @@
    No @foreach($lel['detailsinfo'] as $details) - + {{ $details['caw_name']}}
    @endforeach diff --git a/resources/views/pembida/senaraipemenangbycaw.blade.php b/resources/views/pembida/senaraipemenangbycaw.blade.php index 1653e9d6..5c11ea8f 100644 --- a/resources/views/pembida/senaraipemenangbycaw.blade.php +++ b/resources/views/pembida/senaraipemenangbycaw.blade.php @@ -4,21 +4,33 @@
    -
    +
    +
    + {{--
    --}} @if ($message = Session::get('success'))

    {{ $message }}

    @endif -
    -

    Senarai Bayaran Pemenang

    - +
    +
    + + + +
    + Senarai Pemenang : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
    +
    +
    + {{--
    --}} + {{--
    --}} +
    - + @@ -35,13 +47,13 @@ @foreach($listwinner as $winner) - + - --}} - @endforeach
    NoNamaNama No Kad Pengenalan No Telefon Bilangan Surat
    {{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['name']}} {{ $winner['details']['nokp']}} {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat']}} {{ number_format($winner['totalBid'], 2, '.', ',')}} {{ number_format($winner['totalPay'], 2, '.', ',')}} + @if($winner['totalPay'] < $winner['totalBid']) @elseif($winner['totalPay'] == $winner['totalBid']) @@ -59,16 +71,16 @@ - + +
    -
    + {{--
    Kembali -
    +
    --}}
    From c11315d004ecb963a91ad2b6cecde5ef1fa95efc Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Mon, 21 Nov 2022 09:45:33 +0800 Subject: [PATCH 02/13] update scan barcode (10/11/22) --- app/Http/Controllers/MarhunController.php | 60 ++++++++---- .../views/lelong/laporanlelong.blade.php | 9 +- resources/views/marhun/scanbarcode.blade.php | 9 +- .../views/marhun/scanbarcodemasuk.blade.php | 91 +++++++++++++++++++ .../views/marhun/senarailelongscan.blade.php | 11 +++ routes/web.php | 2 + 6 files changed, 152 insertions(+), 30 deletions(-) create mode 100644 resources/views/marhun/scanbarcodemasuk.blade.php diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index a10447ea..e236d6e6 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -26,6 +26,7 @@ use App\Models\ScanSemak; use App\Models\TangguhLelong; use Carbon\Carbon; use App\Models\ScanJual; +use DateTime; class MarhunController extends Controller { @@ -1599,6 +1600,32 @@ class MarhunController extends Controller return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar')); } + public function listScanBarcodeMasuk($lelong_id) + { + $user = Auth::user(); + $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); + + $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('caw_id', '=', $caw->id) + ->select('id') + ->get() + ->keyBy('id'); + + $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id) + ->where('kodcaw', '=', $caw->caw_code) + ->whereNull('scan_masuk') + ->get(); + + $pluckLelongBid = $lelongbid->pluck('id')->toArray(); + $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray(); + $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar); + + $new_lelong_bid = LelongBid::with('scanSemakSelesai')->whereIn('id', $diff_lelong_bid)->get(); + + return view('marhun.scanbarcodemasuk', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar')); + } + public function scanKeluarMarhun(Request $request) { @@ -1958,21 +1985,15 @@ class MarhunController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); + // dd($request->datehingga); - if($request->datemula == null){ - $mula_date = '2017-01-01'; - }else{ - $split_date = explode('-', $request->datemula); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datehingga == null){ - $hingga_date = $current->toDateString(); - }else{ - $split_date = explode('-', $request->datehingga); - $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } + + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->datehingga ); + $datez = $myDateTime->modify('+1 day')->format('Y-m-d'); + $request->datehingga =$datez; + + $kodcaw = $auth_user['kodcaw']; $cawangan = Cawangan::where('caw_code','=',$kodcaw) @@ -1982,7 +2003,8 @@ class MarhunController extends Controller { $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) ->join('users','scan_semak.khazanah_id','=','users.id') - ->where([['scan_keluar','>=',$request->datemula],['scan_keluar','<=',$request->datehingga]]) + ->where('scan_keluar','>=', $request->datemula) + ->where('scan_keluar','<=', $request->datehingga ) ->get(); return view('pdf.laporanscankeluar', compact('scan','auth_user','tarikh_cetak','cawangan')); @@ -1991,11 +2013,10 @@ class MarhunController extends Controller else if($request->jenis == 'masuk'){ - $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) - ->join('users','scan_semak.khazanah_id','=','users.id') - ->where([['scan_masuk','>=',$request->datemula],['scan_masuk','<=',$request->datehingga]]) - ->get(); - // dd($scan); + $scan=ScanSemak::join('users','scan_semak.khazanah_id','=','users.id') + ->where('scan_semak.kodcaw','=',$kodcaw) + ->where([['scan_masuk','>=', $request->datemula],['scan_masuk','<=', $request->datehingga ]]) + ->get(); return view('pdf.laporanscanmasuk', compact('scan','auth_user','tarikh_cetak','cawangan')); @@ -2012,6 +2033,7 @@ class MarhunController extends Controller } + } public function senaraiterimaserah(Request $request){ diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index 5545cb2a..6e3a84bb 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -17,17 +17,16 @@
    NoID LelongBatch Lelong Tarikh Lelong Fasa CawanganMuat Turun
    {{ $loop->iteration }} {{ $laporan['laporan']['lelong_id']}} @php @@ -43,10 +42,6 @@ {{ $details['caw_name']}}
    @endforeach     		- -
    -
    + {{--
    @@ -110,7 +111,7 @@
    -
    +
    --}} diff --git a/resources/views/marhun/scanbarcodemasuk.blade.php b/resources/views/marhun/scanbarcodemasuk.blade.php new file mode 100644 index 00000000..756232bf --- /dev/null +++ b/resources/views/marhun/scanbarcodemasuk.blade.php @@ -0,0 +1,91 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    +
    +
    Scan Barcode
    +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @elseif ($message = Session::get('failed')) +
    + {{ $message }} +
    + @endif + Kembali + Senarai SAG Masuk Peti Besi + + +

    Tarikh Lelong: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp +

    + + +
    +
    +
    +
    + + @csrf + + + + +
    +
    + + + + + + + + + + + + + + + @foreach ($senaraiScanKeluar as $index) + + + + + + + + + @endforeach + + +
    BilNo RujukanStatusTarikh/Masa Scan KeluarTarikh/Masa Terima MarhunTarikh/Masa Serah Marhun
    {{$loop->iteration}}{{$index->norujukan}}Berada Di Luar Peti Besi{{$index->scan_keluar}}{{$index->terima_marhun}}{{$index->serah_marhun}}
    + +
    +
    + +
    +
    +
    +
    +
    + + + + +@endsection \ No newline at end of file diff --git a/resources/views/marhun/senarailelongscan.blade.php b/resources/views/marhun/senarailelongscan.blade.php index a9a3c2db..f508e873 100644 --- a/resources/views/marhun/senarailelongscan.blade.php +++ b/resources/views/marhun/senarailelongscan.blade.php @@ -14,6 +14,8 @@ Tarikh Lelong Status Lelong Tindakan + Scan Keluar + Scan Masuk @@ -34,9 +36,18 @@ @if($lel['info']['sts_lelong'] == 0) + @endif + + + @if($lel['info']['sts_lelong'] == 0) @endif + + @if($lel['info']['sts_lelong'] == 0) + + @endif + @endforeach diff --git a/routes/web.php b/routes/web.php index 4f161311..e890fc62 100644 --- a/routes/web.php +++ b/routes/web.php @@ -252,6 +252,8 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); Route::get('/senarailelongscan',['as'=>'marhun.senarailelongscan','uses'=>'MarhunController@senarailelongscan']); Route::get('/scanbarcode/{lelong_id}',['as'=>'marhun.scanbarcode','uses'=>'MarhunController@listScanBarcode']); + Route::get('/scanbarcodemasuk/{lelong_id}',['as'=>'marhun.scanbarcodemasuk','uses'=>'MarhunController@listScanBarcodeMasuk']); + Route::post('/scankeluarmarhun',['as'=>'marhun.scankeluarmarhun','uses'=>'MarhunController@scanKeluarMarhun']); Route::post('/scanmasukmarhun',['as'=>'marhun.scanmasukmarhun','uses'=>'MarhunController@scanMasukMarhun']); Route::post('/terimamarhun',['as'=>'marhun.terimamarhun','uses'=>'MarhunController@terimaMarhun']); From 68e3aa3292ce21cfe4f8ffb12d0886bae0342c3c Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 21 Nov 2022 15:37:40 +0800 Subject: [PATCH 03/13] Style sidebar --- public/css/app.css | 352 +++++ resources/views/includes/header.blade.php | 6 +- resources/views/includes/sidebar.blade.php | 1134 +++++++++-------- resources/views/layouts/app.blade.php | 261 +--- .../views/lelong/senarailelong.blade.php | 371 +++--- .../views/pengurusanpengguna/index.blade.php | 24 +- .../views/simulasi/janasimulasi.blade.php | 15 +- .../views/simulasi/senaraisimulasi.blade.php | 7 +- .../views/simulasi/showsimulasi.blade.php | 8 +- resources/views/tetapan/parameter.blade.php | 25 +- 10 files changed, 1241 insertions(+), 962 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 8ba99088..77e3ed9f 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -16459,3 +16459,355 @@ readers do not read off random characters that represent icons */ text-transform: capitalize; padding: 12px 12px; } + +a, +a:hover, +a:focus { + color: inherit; + text-decoration: none; + transition: all 0.3s; +} + +.navbar { + padding: 15px 10px; + background: #fff; + border: none; + border-radius: 0; + margin-bottom: 40px; + box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.1); +} + +.navbar-btn { + box-shadow: none; + outline: none !important; + border: none; +} + +.line { + width: 100%; + height: 1px; + border-bottom: 1px dashed #ddd; + margin: 40px 0; +} + + +.wrapper { + /* display: flex; */ + /* width: 100%; */ +} + +/* --------------------------------------------------- + SIDEBAR STYLE +----------------------------------------------------- */ + +#sidebar { + bottom: 0; + overflow-y: scroll; + width: 265px; + position: static; + top: 0; + left: 0; + height: 100vh; + z-index: 999; + background: #1E1E2D; + /* color: rgb(41, 39, 39); */ + color: #808080; + transition: all 0.3s; +} + +#sidebar.active { + margin-left: -265px; +} + +.sidebar-header { + padding: 20px; + display: flex; + justify-content: space-between; + /* border-bottom: 0.2px solid #6d7fcc; */ +} + +.sidebar-title { + font-size: 1.074rem; + font-weight: bold; + color: white; + border-color: white; + align-self: center; + /* border-bottom: border 1px solid white; */ +} + +.sidebar-logo { + width: 50px; + height: 35px; +} + +/* #sidebar ul.components { + padding: 20px 0; + border-bottom: 1px solid #fff; +} */ + +/* #sidebar ul p { + color: rgb(41, 39, 39); + padding: 10px; +} */ + +#sidebar ul li { + margin: 3px 0; +} + +#sidebar ul li.active { + background: #2a2a3c; + color: white; + border-radius: 25px; +} + +#sidebar ul li.active:hover { + background: #2a2a3ca1; + /* color: white; */ +} + +#sidebar ul li a { + padding: 7px 5px; + font-size: 1.05em; + display: block; +} + +#sidebar ul li a:hover { + color: white; + /* background: var(--indigo); */ + border-radius: 15px; +} + +/* #sidebar ul li.active a{ + color: white; + background: #F0F0F0; +} */ + +#sidebar ul li .active a{ + color: white; + /* background: #2a2a3c; */ + border-radius: 15px; + margin: 2px; + background-position: 20px; + /* width: 70%; */ +} + +#sidebar ul li .active a:hover{ + color: #ffffffd6; + background: #2a2a3ca1; +} + +/* #sidebar ul li.active>a, +a[aria-expanded="true"] { + color: #111; + background: #F0F0F0; +} */ + +#sidebar ul li ul li a:before{ + font-family: "Font Awesome 5 Free"; + font-weight: 600; + content: "\f111"; + font-size: 4px; + vertical-align: middle; + margin-right: 8px; +} + + + +/* .dropdown-toggle::after { + display: block; + position: absolute; + top: 50%; + right: 20px; + transform: translateY(-50%); +} */ + +#sidebar ul ul a { + font-size: 0.9em; + padding-left: 30px !important; + /* background: #fff; */ +} + + + +.sidebar-menu { + display: flex; + justify-content: space-between; +} + +.sidebar-menu-title { + margin-top: 20px; + padding: 6px 14px; +} + +.sidebar-menu-item-expand { + align-self: center; + font-size: 1.0em; + margin-right: 11px; +} + +/* .sidebar-menu-item-expand::before { + font-family: "Font Awesome 5 Free"; + font-weight: 900; + content: "\f078"; +} */ + +.sidebar-menu-main-title { + display: flex; +} + +.sidebar-menu-item-main { + font-size: 1.0em; + /* vertical-align: sub; */ + margin-right: 9px; + margin-left: 7px; + align-self: center; + color: var(--indigo); +} + +/* .sidebar-menu-item-main:hover { + color: white; + background: white; +} */ + +/* ul.CTAs { + padding: 20px; +} + +ul.CTAs a { + text-align: center; + font-size: 0.9em !important; + display: block; + border-radius: 5px; + margin-bottom: 5px; +} */ +a[data-toggle="collapse"] { + position: relative; +} + +a.download { + background: #fff; + color: #7386D5; +} + +a.article, +a.article:hover { + background: #6d7fcc !important; + color: #fff !important; +} + +/* --------------------------------------------------- + CONTENT STYLE +----------------------------------------------------- */ + +#content { + width: calc(100% - 265px); + padding: 3x; + min-height: 100vh; + transition: all 0.3s; + position: absolute; + top: 0; + right: 0; + overflow-y: auto; +} + +#content.active { + width: 100%; +} + +.hovernone:hover { + background-color: #3490dc !important; + cursor: context-menu !important; +} + +.hovernone-success:hover { + background-color: #38c172 !important; + cursor: context-menu !important; +} + +.hovernone-danger:hover { + background-color: #e3342f !important; + 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("") no-repeat center center; + z-index: 99999; + + +} + +#loader-image { + position: absolute; + top: 40%; + left: 45%; + z-index: 100 +} + +.button { + background-color: #E09215; + border: none; + color: white; + padding: 10px 24px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 14px; + margin: 4px 2px; + cursor: pointer; +} + + + +/* --------------------------------------------------- + MEDIAQUERIES +----------------------------------------------------- */ + +@media (max-width: 992px) { + #sidebar { + margin-left: -265px; + } + + #sidebar.active { + margin-left: 0; + } + + #content { + width: 100%; + } + + #content.active { + width: calc(100% - 265px); + } + + #sidebarCollapse span { + display: none; + } +} + +.sidebar-footer { + /* position: absolute; */ + /* bottom: 0; */ + margin-top: 70px; +} + +.sidebar-footer-content { + display: flex; + justify-content: center; + align-self: center; + border: 2px solid #2a2a3c; + padding: 10px; + margin: 46px; + border-radius: 10px; + color: #484859; +} + +.user-info { + /* display: flex; */ +} \ No newline at end of file diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php index 3a0fdd58..e8a1c7be 100644 --- a/resources/views/includes/header.blade.php +++ b/resources/views/includes/header.blade.php @@ -1,14 +1,14 @@ - \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index ef0071e2..9812e55b 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,5 +1,6 @@ + @@ -12,20 +13,21 @@ - - - - + + + + {{-- --}} - + + - - + + - - +
    @include('includes.sidebar') -
    -
    +
    +
    @include('includes.header')
    @yield('content')
    -
    - - + + + - + + \ No newline at end of file diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 006698f1..ab6edff3 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -47,183 +47,189 @@
    - - - - - - - - - - - - - - - - - @foreach($arraydetails0 as $lelong) - - - - - - - - - - - - - @endforeach - -
    BilID LelongTarikh LelongFasaCawanganHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} - @foreach($lelong->cawangan as $cawangan) -
    - {{$cawangan->caw_name}} -
    - @endforeach -     		{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG BELUM MULA -
    - - - -
    -
    - +
    + + + + + + + + + + + + + + + + + @foreach($arraydetails0 as $lelong) + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
    + {{$cawangan->caw_name}} +
    + @endforeach +     		{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG BELUM MULA +
    + + + +
    +
    +
    - - - - - - - - - - - - - - - - - - @foreach($arraydetails1 as $lelong) - - - - - - - - - - - - - - @endforeach - -
    BilID LelongTarikh LelongFasaCawanganMasa Mula LelongMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatus
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} - @foreach($lelong->cawangan as $cawangan) -
    - {{$cawangan->caw_name}} -
    - @endforeach -     		{{$lelong->masamula_lelong}}{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG SEDANG DIJANLANKAN
    - +
    + + + + + + + + + + + + + + + + + + @foreach($arraydetails1 as $lelong) + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Mula LelongMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatus
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
    + {{$cawangan->caw_name}} +
    + @endforeach +     		{{$lelong->masamula_lelong}}{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG SEDANG DIJANLANKAN
    +
    - - - - - - - - - - - - - - - - - @foreach($arraydetails2 as $data) - - - - - - - - - - - - - @endforeach - -
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatus
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} - @foreach($lelong->cawangan as $cawangan) -
    - {{$cawangan->caw_name}} -
    - @endforeach -     		{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG JANA PEMENANGAN
    +
    + + + + + + + + + + + + + + + + + @foreach($arraydetails2 as $data) + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatus
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
    + {{$cawangan->caw_name}} +
    + @endforeach +     		{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG JANA PEMENANGAN
    +
    - - - - - - - - - - - - - - - - - - - @foreach($arraydetails3 as $lelong) - - - - - - - - - - - - - - - @endforeach - -
    BilID LelongTarikh LelongFasaCawanganMasa Mula LelongMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} - @foreach($lelong->cawangan as $cawangan) -
    - {{$cawangan->caw_name}} -
    - @endforeach -     		{{$lelong->masamula_lelong}}{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG SELESAI - - - -
    +
    + + + + + + + + + + + + + + + + + + + @foreach($arraydetails3 as $lelong) + + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Mula LelongMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
    + {{$cawangan->caw_name}} +
    + @endforeach +     		{{$lelong->masamula_lelong}}{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG SELESAI + + + +
    +
    @@ -306,34 +312,19 @@ $('.export').removeClass('dt-button'); var tableLelongSemasa = $('#lelong-semasa').DataTable({ - "pageLength": 5000, - "paging": false, - "searching": false, - "info": false + "pageLength": 100, }); var tableLelongSedang = $('#lelong-sedang').DataTable({ - "pageLength": 5000, - "paging": false, - "searching": false, - "info": false + "pageLength": 100, }); var tableLelongBelum = $('#lelong-belum').DataTable({ - "pageLength": 5000, - "paging": false, - "searching": false, - "info": false + "pageLength": 100, }); var tableLelongJanaPemenang = $('#lelong-jana-pemenang').DataTable({ - "pageLength": 5000, - "paging": false, - "searching": false, - "info": false + "pageLength": 100, }); var tableLelongSelesai = $('#lelong-selesai').DataTable({ - "pageLength": 5000, - "paging": false, - "searching": false, - "info": false + "pageLength": 100, }); diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index f23f6545..0b7c07f4 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -4,30 +4,31 @@
    -
    - +
    +
    +
    +
    + Senarai Pengguna +
    +
    +
    @if ($message = Session::get('success'))
    -

    {{ $message }}

    + {{ $message }}
    @endif @if ($message = Session::get('failed'))
    -

    {{ $message }}

    + {{ $message }}
    @endif -
    -
    - Senarai Pengguna -
    -
    -
    @csrf +
    @@ -77,7 +78,10 @@ @endforeach
    +
    +
    +
    diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index 090e0ad3..2c8294c7 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -4,11 +4,16 @@ -
    +
    -
    -

    Simulasi

    - +
    +
    +
    +
    + Jana Simulasi +
    +
    +
    @if ($message = Session::get('failed'))
    {{ $message }} @@ -79,6 +84,8 @@
    +
    +
    diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 2368c64a..9a9c9d60 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -18,7 +18,8 @@ @endif
    - +
    +
    @@ -61,6 +62,7 @@
    No
    +
    @@ -140,8 +142,7 @@ "targets": 6 } ], - "pageLength": 50, - "scrollX": true + "pageLength": 100, }); diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 9d78b5c4..e3dc9490 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -171,6 +171,7 @@ +
    @@ -221,9 +222,11 @@
    +
    Jumlah Berat Mengikut Mutu (Keseluruhan)
    - +
    +
    + + + @foreach ($lelkarat as $index=>$karat) + + @endforeach - - - @foreach ($lelkarat as $index=>$karat) - - @endforeach - + @@ -161,11 +249,10 @@ - {{-- --}} - + - +
    MUTU{{$karat->karat}}
    MUTU{{$karat->karat}}
    BERAT (gm) {{$total24Kgb}}{{$total18K}} {{$total14Kp}} {{$total14K}}{{$total9K}}
    @@ -195,7 +282,7 @@
    @csrf - +
    @@ -378,42 +465,20 @@ } }); - var tablesimulasi = $('#simulasi').DataTable( { - "columnDefs": [ - { - "targets": 0, - "orderable": false - } - ], - "scrollX": true, - order: [[0, 'asc']], - // "ordering": false, - "searching":false, - "info": false, - "lengthChange": false, - "pageLength": 9999, - dom: 'Bfrtip', - buttons: [ - // 'copy', 'excel', 'pdf' - // { text: 'copy', className: 'btn btn-primary' }, - // { - // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', - // text: '', - // titleAttr: 'Filter By', - // action: function ( e, dt, node, config ) { - // $('#modalfilter').modal("show"); - // } - // }, - { - className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export', - titleAttr: 'Muat Turun PDF', - text: 'PDF', - action: function ( e, dt, node, config ) { - $("#exportform").submit(); - } - } - ] - }); + var tablesimulasi = $('#simulasi').DataTable({ + "scrollX": true, + "pageLength": 50, + }); + + + var tableJumlahBerat = $('#jumlahberat').DataTable({ + "scrollX": true, + "info": false, + "paging": false, + "searching": false, + "ordering": false + }); + $('.addsim').tooltip(); $('.export').tooltip(); diff --git a/resources/views/marhun/lihatubahmutumarhun.blade.php b/resources/views/marhun/lihatubahmutumarhun.blade.php new file mode 100644 index 00000000..ce1c61f0 --- /dev/null +++ b/resources/views/marhun/lihatubahmutumarhun.blade.php @@ -0,0 +1,419 @@ +@extends('layouts.app') + +@section('content') + + +
    +
    +
    +
    +
    + + + +
    + Perubahan Semakan Marhun +
    +
    +
    + + @csrf + + + + + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + +
    + + {{-- Kembali --}} + +
    +
    +

    No Rujukan : {{ $lelongbid->norujukan }}

    +

    Tempoh : {{ $lelongbid->jbg }}

    +

    Kod Cawangan : {{ $lelongbid->kodcaw }}

    +
    +
    +

    Harga Asas(RM) : {{ number_format($marhuns[0]['totalnewhargaasas'], 2, '.', ',') }}

    +

    Pembiayaan(RM) : {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}

    +

    Keuntungan(RM) : {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}

    + {{--

    Caj Lelong(RM) : {{ number_format($marhuns[0]['cajlelong'], 2, '.', ',') }}

    +

    Baki Lelong(RM) : {{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}

    +

    Rugi Lelong(RM) : {{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}

    --}} + +
    +
    + {{--

    Hargaasas(RM) : {{ number_format($marhuns[0]['totalnewhargaasas'], 2, '.', ',') }}

    +

    Pembiayaan(RM) : {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}

    +

    Keuntungan(RM) : {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}

    --}} +

    Caj Lelong(RM) : {{ number_format($marhuns[0]['cajlelong'], 2, '.', ',') }}

    +

    Baki Lelong(RM) : {{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}

    +

    Rugi Lelong(RM) : {{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}

    + +
    +
    +
    +
    Karat
    + + + + + + + {{-- --}} + + + {{-- --}} + + + + + + @php $sumhargaasas = 0 @endphp + @foreach($arraylelbidmarhun as $index1=>$detail) + {{-- {{dd($detail[0]['marhun'])}} --}} + + + + + + + + {{-- --}} + + + + + {{-- --}} + + {{-- @php $sumhargaasas += $newhargaasas @endphp --}} + {{-- {{ $sumhargaasas }} --}} + + @endforeach + +
    BilMarhunKarat Berat (gm)Harga Gadai (RM)/gmHarga Lelong p/gmN. Marhun AsalN. Marhun LelongHarga AsasStatus
    {{ $loop->iteration }} + @if(empty($detail[0]['status_ubah']['status_ubah'])) + {{ $detail[0]['old_marhun'] }} + @elseif(!empty($detail[0]['status_ubah']['status_ubah'])) + @if($detail[0]['status_ubah']['request_marhun'] == NULL) + {{ $detail[0]['old_marhun'] }} + @elseif($detail[0]['old_marhun'] != $detail[0]['status_ubah']['request_marhun']) + {{ $detail[0]['old_marhun'] }} {{ $detail[0]['status_ubah']['request_marhun'] }} + @elseif($detail[0]['old_marhun'] == $detail[0]['status_ubah']['request_marhun']) + {{ $detail[0]['old_marhun'] }} + @else + {{ $detail[0]['old_marhun'] }} + @endif + @endif + {{-- {{ $detail[0]['status_ubah'] }} --}} + + @if(empty($detail[0]['status_ubah']['status_ubah'])) + {{ $detail[0]['old_karat'] }} + @elseif(!empty($detail[0]['status_ubah']['status_ubah'])) + @if($detail[0]['status_ubah']['request_karat'] == NULL) + {{ $detail[0]['old_karat'] }} + @elseif($detail[0]['old_karat'] != $detail[0]['status_ubah']['request_karat']) + {{ $detail[0]['old_karat'] }} {{ $detail[0]['status_ubah']['request_karat'] }} + @elseif($detail[0]['old_karat'] == $detail[0]['status_ubah']['request_karat']) + {{ $detail[0]['old_karat'] }} + @endif + @endif + {{-- {{ $detail[0]['karat'] }} --}} + + @if(empty($detail[0]['status_ubah']['status_ubah'])) + {{ $detail[0]['old_berat'] }} + @elseif(!empty($detail[0]['status_ubah']['status_ubah'])) + @if($detail[0]['status_ubah']['request_berat'] == NULL) + {{ $detail[0]['old_berat'] }} + @elseif($detail[0]['old_berat'] != $detail[0]['status_ubah']['request_berat']) + {{ $detail[0]['old_berat'] }} {{ $detail[0]['status_ubah']['request_berat'] }} + @elseif($detail[0]['old_berat'] == $detail[0]['status_ubah']['request_berat']) + {{ $detail[0]['old_berat'] }} + @endif + @endif + {{-- {{ $detail[0]['berat'] }} --}} + + @if(empty($gadai[$index1]['harga'])) + - + @elseif(!empty($gadai[$index1]['harga'])) + {{ number_format ($gadai[$index1]['harga'], 2, '.', ',') }} + @endif + + {{-- {{dd($detail[0]['karatnew']['harga2'])}} --}} + @if(empty($detail[0]['status_ubah']['status_ubah'])) + {{number_format($detail[0]['harga'], 2, '.', ',') }} + @elseif(!empty($detail[0]['status_ubah']['status_ubah'])) + @if($detail[0]['status_ubah']['status_ubah'] == 8) + {{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} --}} + {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }} + + @elseif($detail[0]['status_ubah']['status_ubah'] == 9) + {{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} --}} + {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }} + + @elseif($detail[0]['status_ubah']['status_ubah'] == 10) + {{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} --}} + {{number_format($detail[0]['harga'], 2, '.', ',') }} + + @elseif($detail[0]['status_ubah']['status_ubah'] == 5) + {{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} --}} + {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }} + + @elseif($detail[0]['status_ubah']['status_ubah'] == 1) + {{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} --}} + {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }} + + @elseif($detail[0]['status_ubah']['status_ubah'] == 4) + {{-- {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} --}} + {{number_format($detail[0]['harga'], 2, '.', ',') }} + + @elseif($detail[0]['status_ubah']['status_ubah'] == 7) + {{number_format($detail[0]['harga'], 2, '.', ',') }} + @else + {{number_format($detail[0]['harga'], 2, '.', ',') }} + @endif + @endif + @if(empty($gadai[$index1]['n_marhun'])) + - + @elseif(!empty($gadai[$index1]['n_marhun'])) + {{ number_format($gadai[$index1]['n_marhun'], 2, '.', ',') }} + @endif + + + {{-- {{dd($detail[0]['karatnew']['harga2'])}} --}} + @if(empty($detail[0]['status_ubah']['status_ubah'])) + {{ number_format($detail[0]['hargaasas'], 2, '.', ',') }} + @elseif(!empty($detail[0]['status_ubah']['status_ubah'])) + @if($detail[0]['status_ubah']['status_ubah'] == 8) + {{-- @php + $newhargaasas = bcdiv($detail[0]['status_ubah']['request_berat'] * $detail[0]['karatnew']['harga2'], 1); + @endphp --}} + {{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} --}} + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @elseif($detail[0]['status_ubah']['status_ubah'] == 9) + {{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} --}} + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @elseif($detail[0]['status_ubah']['status_ubah'] == 10) + {{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} --}} + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @elseif($detail[0]['status_ubah']['status_ubah'] == 5) + {{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} --}} + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @elseif($detail[0]['status_ubah']['status_ubah'] == 1) + {{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} --}} + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @elseif($detail[0]['status_ubah']['status_ubah'] == 4) + {{-- {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} --}} + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @elseif($detail[0]['status_ubah']['status_ubah'] == 7) + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @elseif($detail[0]['status_ubah']['status_ubah'] == 3) + {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} + @else + {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} + @endif + @endif + + + {{-- {{dd($detail[$index1]['status_ubah']['status_ubah'])}} --}} + @if(empty($detail[0]['status_ubah']['status_ubah'])) + + @elseif(!empty($detail[0]['status_ubah']['status_ubah'])) + @if($detail[0]['status_ubah']['status_ubah'] == 8) + + @elseif($detail[0]['status_ubah']['status_ubah']== 10) + + @elseif($detail[0]['status_ubah']['status_ubah']== 9) + + @elseif($detail[0]['status_ubah']['status_ubah']== 5) + + @elseif($detail[0]['status_ubah']['status_ubah']== 1) + + @elseif($detail[0]['status_ubah']['status_ubah']== 4) + + @elseif($detail[0]['status_ubah']['status_ubah']== 7) + + @elseif($detail[0]['status_ubah']['status_ubah']== 3) + + @elseif($detail[0]['status_ubah']['status_ubah']== 2) + + @else + + @endif + @endif + + @if(isset($detail[0]['status_ubah']['status_ubah']) == 1) + + @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 2) + + @elseif(isset($detail[0]['status_ubah']['status_ubah'])== 3) + + @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 4) + + @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 5) + + @else + + @endif +
    +
    + + {{-- --}} + {{-- --}} +
    +
    +
    + + + + + +@endsection diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 46e4155f..7de5f10b 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -3,10 +3,17 @@ @section('content')
    -
    -
    - Kembali -
    +
    +
    +
    + + + +
    + No Rujukan : {{ $lelongbid->norujukan }} +
    +
    +
    @if ($message = Session::get('success'))

    {{ $message }}

    @@ -31,8 +38,8 @@
    -

    No Rujukan : {{ $lelongbid->norujukan }} -

    + {{--

    No Rujukan : {{ $lelongbid->norujukan }} +

    --}}
    @@ -51,7 +58,7 @@

    - +
    @@ -114,29 +121,37 @@ @@ -145,13 +160,28 @@
    Barang{{ $item->nota }} @if($lelongbid->status_semak == 1) - @elseif(isset($item->pengesahan)) - @if($item->pengesahan['status_ubah'] == 1) - Tunggu Pengesahan
    Ubah Mutu     - @elseif($item->pengesahan['status_ubah'] == 2) - Tunggu Pengesahan
    Tambah Marhun     - @elseif($item->pengesahan['status_ubah'] == 3) - Tunggu Pengesahan
    Hapus Marhun     - @elseif($item->pengesahan['status_ubah'] == 4) - Tunggu Pengesahan
    Ubah Berat     - @elseif($item->pengesahan['status_ubah'] == 5) - Tunggu Pengesahan
    Ubah Mutu & Berat     - @elseif($item->pengesahan['status_ubah'] == 7) - Tunggu Pengesahan
    Ubah Marhun     - @elseif($item->pengesahan['status_ubah'] == 8) - Tunggu Pengesahan
    Ubah Mutu, Berat & Marhun     - @elseif($item->pengesahan['status_ubah'] == 9) - Tunggu Pengesahan
    Ubah Mutu & Marhun     - @elseif($item->pengesahan['status_ubah'] == 10) - Tunggu Pengesahan
    Ubah Berat & Marhun     + Telah Semak
     + @elseif($lelongbid->status_semak == 0) + @if(isset($item->pengesahan['status'])) + @if($item->pengesahan['status_ubah'] == 1 ) + Tunggu Pengesahan
    Ubah Mutu     + @elseif($item->pengesahan['status_ubah'] == 2) + Tunggu Pengesahan
    Tambah Marhun     + @elseif($item->pengesahan['status_ubah'] == 3) + Tunggu Pengesahan
    Hapus Marhun     + @elseif($item->pengesahan['status_ubah'] == 4) + Tunggu Pengesahan
    Ubah Berat     + @elseif($item->pengesahan['status_ubah'] == 5) + Tunggu Pengesahan
    Ubah Mutu & Berat     + @elseif($item->pengesahan['status_ubah'] == 7) + Tunggu Pengesahan
    Ubah Marhun     + @elseif($item->pengesahan['status_ubah'] == 8) + Tunggu Pengesahan
    Ubah Mutu, Berat & Marhun     + @elseif($item->pengesahan['status_ubah'] == 9) + Tunggu Pengesahan
    Ubah Mutu & Marhun     + @elseif($item->pengesahan['status_ubah'] == 10) + Tunggu Pengesahan
    Ubah Berat & Marhun     + @elseif($item->pengesahan['status'] == 1) + Telah Sah + @endif + @else + @endif + @else - - + + {{-- --}} @endif
    + + {{-- {{dump($status['status'])}} --}} @if($lelongbid->status_semak == 0) - + @if(isset($status['status'])) + @if($status['status'] == 0) + + @elseif($status['status'] == 1) + + @else + + @endif + + @else + + @endif + {{-- --}} @elseif($lelongbid->status_semak == 1) - + @endif
    +