diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 11831fa1..17a7c8f2 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -666,6 +666,118 @@ class LelongController extends Controller ->with('success','Create Lelong Berjaya'); } + + public function senarailelong() + { + + $arraydetails = []; + $arraydetails2 = []; + $arraydetails3 = []; + $arraydetails4 = []; + $arraydetails5 = []; + + $currentdate = Carbon::now(); + $currentdate2 = $currentdate->toDateString(); + + $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','lelong.created_at') + ->groupBy('lelong_id') + ->where('lelong.created_at', 'like', '%' . $currentdate2 . '%') + ->where('sts_lelong',0) + ->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]); + } + +///////////// lelong belum mula + + $lelong2 = 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','lelong.created_at') + ->groupBy('lelong_id') + ->where('lelong.sts_lelong',0) + + ->get()->toArray(); + + foreach($lelong2 as $laporan2) + { + $details2 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan2['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails2,['laporan2' => $laporan2,'details2' => $details2]); + } + +////////// lelong selesai + + $lelong3 = 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','lelong.created_at') + ->groupBy('lelong_id') + ->where('lelong.sts_lelong',3) + ->get()->toArray(); + + foreach($lelong3 as $laporan3) + { + $details3 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan3['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails3,['laporan3' => $laporan3,'details3' => $details3]); + } + +////////// lelong sedang dijalankan + + + $lelong4 = 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','lelong.created_at') + ->groupBy('lelong_id') + ->where('lelong.sts_lelong',1) + ->get()->toArray(); + + foreach($lelong4 as $laporan4) + { + $details4 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan4['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails4,['laporan4' => $laporan4,'details4' => $details4]); + } + +/////////////// lelong jana pemenang + + $lelong5 = 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','lelong.created_at') + ->groupBy('lelong_id') + ->where('lelong.sts_lelong',2) + ->get()->toArray(); + + foreach($lelong5 as $laporan5) + { + $details5 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan5['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails5,['laporan5' => $laporan5,'details5' => $details5]); + } + + + + + return view('lelong.senarailelong',compact('lelong', 'arraydetails', + 'lelong2','arraydetails2', + 'lelong3','arraydetails3', + 'lelong4','arraydetails4', + 'lelong5','arraydetails5')); + } + + + + public function delete($id) diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index acec51bc..2c9af164 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -193,6 +193,7 @@ class RolesSeeder extends Seeder $role5->givePermissionTo('janapemenang'); $role6 = Role::create(['name' => 'operasi']); + $role6->givePermissionTo('pengguna'); $role6->givePermissionTo('pendaftaranbatch'); $role6->givePermissionTo('report'); $role6->givePermissionTo('tangguhan'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 206e442b..c8c8ac39 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -42,12 +42,12 @@
  • Pengurusan Database
    • -
  • + {{--
  • Yuran Bidaan
  • Testing billplz -
    • + --}} {{--
  • Portfolio
    • @@ -284,6 +284,23 @@ @endhasrole @hasrole('operasi') + +
  • + + +
    • +
  • Tetapan
    • @@ -319,6 +336,9 @@
  • Senarai Lelong
    • + {{--
  • + Senarai Lelong +
    • --}}
  • Senarai Lelong All
    • diff --git a/resources/views/lelong/currentlelong.blade.php b/resources/views/lelong/currentlelong.blade.php new file mode 100644 index 00000000..a1df1c3f --- /dev/null +++ b/resources/views/lelong/currentlelong.blade.php @@ -0,0 +1,187 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + + + + + @foreach($arraydetails as $data) + + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$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 + + @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) + {{-- --}} + + + Export + @endif + @endhasrole +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index a1df1c3f..ad080c72 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -1,18 +1,45 @@ @extends('layouts.app') @section('content') -
    -
    - - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    -
    - @endif - - +
    +
    +
    Senarai Lelong
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @elseif ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    + @endif + + + + +
    +
    +
    + @@ -104,84 +131,480 @@ @endforeach
    Bil ID Lelong
    +
    +
    + + + + + + + + + + + + + + + + + + @foreach($arraydetails4 as $data) + + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{ $data['laporan4']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan4']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$data['laporan4']['fasa']}} + @foreach($data['details4'] as $details) + {{$details['caw_name']}}
    + @endforeach +     		@if($data['laporan4']['masatamat_lelong'] == 0) + {{$data['laporan4']['masatamat_lelong']}} + @else + @php + $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan4']['masatamat_lelong'] ); + $masa_lelong = $myDateTime->format('h:i: a'); + echo($masa_lelong); + + @endphp + + @endif + {{$data['laporan4']['harga_emas_asas']}}{{$data['laporan4']['jbg']}}{{$data['laporan4']['cajlelong']}} + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan4']['sts_lelong'] == 0) + + @elseif($data['laporan4']['sts_lelong'] == 1) + + @elseif($data['laporan4']['sts_lelong'] == 2) + + @elseif($data['laporan4']['sts_lelong'] == 3) + + + @endif + @endhasrole + + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan4']['sts_lelong'] == 0) + + + {{-- --}} + + @elseif($data['laporan4']['sts_lelong'] == 1) + {{-- --}} + @elseif($data['laporan4']['sts_lelong'] == 2) + {{-- --}} + @elseif($data['laporan4']['sts_lelong'] == 3) + {{-- --}} + + + Export + @endif + @endhasrole +
    + + +
    +
    + + + + + + + + + + + + + + + + + + @foreach($arraydetails2 as $data) + + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{ $data['laporan2']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan2']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$data['laporan2']['fasa']}} + @foreach($data['details2'] as $details) + {{$details['caw_name']}}
    + @endforeach +     		@if($data['laporan2']['masatamat_lelong'] == 0) + {{$data['laporan2']['masatamat_lelong']}} + @else + @php + $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan2']['masatamat_lelong'] ); + $masa_lelong = $myDateTime->format('h:i: a'); + echo($masa_lelong); + + @endphp + + @endif + {{$data['laporan2']['harga_emas_asas']}}{{$data['laporan2']['jbg']}}{{$data['laporan2']['cajlelong']}} + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan2']['sts_lelong'] == 0) + + @elseif($data['laporan2']['sts_lelong'] == 1) + + @elseif($data['laporan2']['sts_lelong'] == 2) + + @elseif($data['laporan2']['sts_lelong'] == 3) + + + @endif + @endhasrole + + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan2']['sts_lelong'] == 0) + + + {{-- --}} + + @elseif($data['laporan2']['sts_lelong'] == 1) + {{-- --}} + @elseif($data['laporan2']['sts_lelong'] == 2) + {{-- --}} + @elseif($data['laporan2']['sts_lelong'] == 3) + {{-- --}} + + + Export + @endif + @endhasrole +
    + +
    +
    + + + + + + + + + + + + + + + + + + @foreach($arraydetails3 as $data) + + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{ $data['laporan3']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan3']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$data['laporan3']['fasa']}} + @foreach($data['details3'] as $details) + {{$details['caw_name']}}
    + @endforeach +     		@if($data['laporan3']['masatamat_lelong'] == 0) + {{$data['laporan3']['masatamat_lelong']}} + @else + @php + $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan3']['masatamat_lelong'] ); + $masa_lelong = $myDateTime->format('h:i: a'); + echo($masa_lelong); + + @endphp + + @endif + {{$data['laporan3']['harga_emas_asas']}}{{$data['laporan3']['jbg']}}{{$data['laporan3']['cajlelong']}} + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan3']['sts_lelong'] == 0) + + @elseif($data['laporan3']['sts_lelong'] == 1) + + @elseif($data['laporan3']['sts_lelong'] == 2) + + @elseif($data['laporan3']['sts_lelong'] == 3) + + + @endif + @endhasrole + + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan3']['sts_lelong'] == 0) + + + {{-- --}} + + @elseif($data['laporan3']['sts_lelong'] == 1) + {{-- --}} + @elseif($data['laporan3']['sts_lelong'] == 2) + {{-- --}} + @elseif($data['laporan3']['sts_lelong'] == 3) + {{-- --}} + + + Export + @endif + @endhasrole +
    + +
    +
    + + + + + + + + + + + + + + + + + + @foreach($arraydetails5 as $data) + + + + + + + + + + + + + + + @endforeach + +
    BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
    {{$loop->iteration}}{{ $data['laporan5']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan5']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$data['laporan5']['fasa']}} + @foreach($data['details5'] as $details) + {{$details['caw_name']}}
    + @endforeach +     		@if($data['laporan5']['masatamat_lelong'] == 0) + {{$data['laporan5']['masatamat_lelong']}} + @else + @php + $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan5']['masatamat_lelong'] ); + $masa_lelong = $myDateTime->format('h:i: a'); + echo($masa_lelong); + + @endphp + + @endif + {{$data['laporan5']['harga_emas_asas']}}{{$data['laporan5']['jbg']}}{{$data['laporan5']['cajlelong']}} + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan5']['sts_lelong'] == 0) + + @elseif($data['laporan5']['sts_lelong'] == 1) + + @elseif($data['laporan5']['sts_lelong'] == 2) + + @elseif($data['laporan5']['sts_lelong'] == 3) + + + @endif + @endhasrole + + @hasrole('jurulelong') + + @endhasrole + @hasrole('operasi') + + @if($data['laporan5']['sts_lelong'] == 0) + + + {{-- --}} + + @elseif($data['laporan5']['sts_lelong'] == 1) + {{-- --}} + @elseif($data['laporan5']['sts_lelong'] == 2) + {{-- --}} + @elseif($data['laporan5']['sts_lelong'] == 3) + {{-- --}} + + + Export + @endif + @endhasrole +
    + +
    +
    +
    + - + + + @endsection \ No newline at end of file diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index b910f16c..3b9a109e 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -89,7 +89,7 @@ No Cawangan - Bil Marhun (Paket) + Bil Surat Berat (gm) N. Marhun (RM) Pembiayaan (RM) diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 1a582aa1..5b2a94f2 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -61,10 +61,10 @@ Bil Marhun Karat - Berat - Harga Gadai(RM)/grm - Harga(RM)/grm - N. Marhun Gadai + Berat (gm) + {{-- Harga Gadai (RM)/gm --}} + Harga Lelong p/gm + N. Marhun Asal {{-- N. Marhun Lelong --}} Harga Asas Status @@ -92,7 +92,7 @@ @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'])) @@ -107,7 +107,7 @@ {{-- {{ $detail[0]['karat'] }} --}} - + @if(empty($detail[0]['status_ubah']['status_ubah'])) {{ $detail[0]['old_berat'] }} @elseif(!empty($detail[0]['status_ubah']['status_ubah'])) @@ -122,33 +122,41 @@ {{-- {{ $detail[0]['berat'] }} --}} - @if(empty($gadai[$index1]['harga'])) + {{-- + @if(empty($gadai[$index1]['harga'])) - @elseif(!empty($gadai[$index1]['harga'])) {{ number_format ($gadai[$index1]['harga'], 2, '.', ',') }} - @endif + @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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} @@ -173,17 +181,23 @@ {{-- @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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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, '.', ',') }} + {{-- {{ 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) diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index 035a5d71..a6f0f755 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -47,16 +47,16 @@ @foreach ($user->roles as $taraf) - +
    @endforeach - + @if ($user->status =='active') - + @elseif ($user->status == 'inactive') - + @elseif ($user->status =='banned') - + @endif diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php index e488abff..9b40cedc 100644 --- a/resources/views/simulasi/senaraimarhunlel.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -141,7 +141,7 @@ type: 'red', typeAnimated: true, buttons: { - Delete: { + Hapus: { btnClass: 'btn-danger', action: function () { $("#deletesag").submit(); diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 295c3f5c..e35c822d 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -73,7 +73,7 @@ type: 'orange', typeAnimated: true, buttons: { - Delete: { + Hapus: { btnClass: 'btn-warning', action: function () { location.href = this.$target.attr('href'); diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index d50de8cb..3e626255 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -77,7 +77,7 @@ No Cawangan - Bil Marhun (Paket) + Bil Surat Berat (gm) N. Marhun (RM) Pembiayaan (RM) diff --git a/routes/web.php b/routes/web.php index 0d4d394a..4f161311 100644 --- a/routes/web.php +++ b/routes/web.php @@ -131,7 +131,9 @@ Route::group(['middleware','prefix'=>'payment'], function () { 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('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@senarailelong']); //senarai lelong by status + + // Route::get('/currentlelong',['as'=>'lelong.currentlelong','uses'=>'LelongController@index']); // senarai semua lelong Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); Route::get('/senaraisagpemenang/{user_id}/{lelong_id}/{kodcaw}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']);