From 490ba2a446145da7edd4aec563c542ccc0129ce4 Mon Sep 17 00:00:00 2001 From: Amir Date: Sun, 13 Nov 2022 11:26:20 +0800 Subject: [PATCH] Add alert, fix template layout in simulasi --- app/Http/Controllers/SimulasiController.php | 29 +- public/css/app.css | 25 + public/img/arrahn_favicon.ico | Bin 0 -> 15406 bytes resources/views/includes/sidebar.blade.php | 4 +- resources/views/layouts/app.blade.php | 6 +- .../views/lelong/senarailelong.blade.php | 1081 +++++++++-------- .../views/simulasi/listsagbycust.blade.php | 73 +- .../views/simulasi/senaraimarhunlel.blade.php | 324 ++--- .../views/simulasi/senaraisimulasi.blade.php | 248 ++-- .../views/simulasi/showsimulasi.blade.php | 584 +++++---- resources/views/welcome.blade.php | 3 +- 11 files changed, 1252 insertions(+), 1125 deletions(-) create mode 100644 public/img/arrahn_favicon.ico diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index bf985fb7..ed11d023 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -707,29 +707,9 @@ class SimulasiController extends Controller public function senaraisimulasi() { - // $simulasi = Simulasi::all(); + $simulasiAll = Simulasi::with('cawangan')->orderBy('id', 'desc')->get(); - $arrayinfo = []; - - $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id') - ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa','simulasi.harga_emas_asas') - ->groupBy('simulasi_id') - ->orderBy('simulasi.id', 'desc') - ->get() - ->toArray(); - - foreach($simulasi as $info) - { - $detailsinfo = CawanganSimulasi::join('cawangan','cawangan_simulasi.caw_id','=','cawangan.id') - ->where('simulasi_id',$info['simulasi_id']) - ->get() - ->toArray(); - - array_push($arrayinfo, ['info'=> $info, 'detailsinfo'=>$detailsinfo]); - - } - - return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo')); + return view('simulasi.senaraisimulasi',compact('simulasiAll')); } public function show2(Request $request, $id) @@ -1203,8 +1183,8 @@ class SimulasiController extends Controller } - return redirect()->route('analisa.senaraisimulasi',$request->idsimulasi) - ->with('success','Kemaskini Berjaya'); + return redirect()->route('analisa.show',$request->idsimulasi) + ->with('success','Kemaskini Harga Emas Berjaya'); } @@ -1516,6 +1496,7 @@ class SimulasiController extends Controller 'total_pinjaman', 'total_bakiupah', 'total_hargaasas', + 'simulasilel', 'total_cazlelong')); } diff --git a/public/css/app.css b/public/css/app.css index ce898cd2..8ba99088 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -16434,3 +16434,28 @@ readers do not read off random characters that represent icons */ font-family: "Font Awesome 5 Brands"; font-weight: 400; } + +.header-style { + padding: 0px 0px; + display: flex; + align-items: center; + background-color: #fff; +} + +.header-style-icon { + padding: 15px 18px; + border-right: 1px solid #ced4da; +} + +.header-style-icon:hover { + background-color: #6c757d; + color: white; + border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0; +} + +.header-style-title { + font-size: 1.125rem; + font-weight: bold; + text-transform: capitalize; + padding: 12px 12px; +} diff --git a/public/img/arrahn_favicon.ico b/public/img/arrahn_favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..3a6071cec5f0a28f902e719e9c33229575ea61bc GIT binary patch literal 15406 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 KCGh`N0{;cH_m_qM literal 0 HcmV?d00001 diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index c8c8ac39..4e845af4 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -319,9 +319,9 @@
  • Jana Simulasi
    • -
  • +
  • Senarai Simulasi
    • diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 479c472a..ef0071e2 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -7,7 +7,9 @@ - {{ config('app.name', 'Laravel') }} + {{ config('app.name', 'ArrahnBid') }} + + @@ -309,7 +311,7 @@
    @include('includes.header') -
    +
    @yield('content')
    diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index ad080c72..9921debe 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -3,17 +3,21 @@ @section('content')
    -
    +
    -
    Senarai Lelong
    +
    +
    + senarai lelong +
    +
    @if ($message = Session::get('success'))
    -

    {{ $message }}

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

    {{ $message }}

    + {{ $message }}
    @endif @@ -38,484 +42,484 @@
    - - - - - - - - - - - - - - - - - - @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 -
    -
    -
    - - - - - - - - - - - - - - - - - - @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($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 +
    +
    +
    + + + + + + + + + + + + + + + + + + @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 -
    + + Bil + ID Lelong + Tarikh Lelong + Fasa + Cawangan + Masa Tamat Lelong + Harga Emas Asas + Tempoh + Caj Lelong + Status + Tindakan + + + + @foreach($arraydetails2 as $data) + + {{$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); -
    -
    - - - - - - - - - - - - - - - - - - @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 -
    + @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 + + + @endforeach + + + +
    +
    + + + + + + + + + + + + + + + + + + @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 -
    - + + Bil + ID Lelong + Tarikh Lelong + Fasa + Cawangan + Masa Tamat Lelong + Harga Emas Asas + Tempoh + Caj Lelong + Status + Tindakan + + + + @foreach($arraydetails5 as $data) + + {{$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 + + + @endforeach + + +
    @@ -526,78 +530,77 @@ diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php index 9b40cedc..704c9019 100644 --- a/resources/views/simulasi/senaraimarhunlel.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -4,195 +4,195 @@
    -
    - - - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    +
    +
    +
    + + + +
    + senarai Sag : {{ $marhuns[0]['caw_name'] }} +
    - @endif -
    - PDF - Simulasi Lelong - Senarai Mengikut Nama Pelanggan -
    -
    - @csrf - - - - - - - - - - - - - - - - {{-- --}} - - - - - - @php $rugilelong = 0; - $bakilelong = 0; - - @endphp - @foreach ($arraymarhun as $index=> $marhun) - - - - - - - - - - - {{-- {{dd($marhun['norujukan'])}} --}} - @php - $rugi = 0; - $baki = 0; - if(strpos($marhun['baki'], '-') !== false) - { - $baki = -$marhun['baki']; +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @endif + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $simulasilel[0]->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + @endphp +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + Muat Turun PDF + + Senarai Mengikut Nama Pelanggan +
    + + @csrf + + +
    NoNo RujukanTempohBerat (gm)Nilai Marhun (RM)Harga Asas (RM)Pembiayaan (RM)Keuntungan (RM)Caj Lelong (%)Rugi Lelong (RM)Baki Lelong (RM)Tindakan
    {{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['tempoh']}}{{ $marhun['berat'] }}{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}{{ number_format($marhun['hargaasas'], 2, '.', ',') }}{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }}{{ number_format($marhun['cajlelong'], 2, '.', ',') }}
    + + + + + + + + + + + + + + + + + @php $rugilelong = 0; + $bakilelong = 0; + + @endphp + @foreach ($arraymarhun as $index=> $marhun) + + + + + + + + + + + @php + $rugi = 0; + $baki = 0; + if(strpos($marhun['baki'], '-') !== false) + { + $baki = -$marhun['baki']; $bakilelong += $marhun['baki']; - } - else { + } + else { $baki = $marhun['baki']; $bakilelong += $marhun['baki']; - } - @endphp - {{-- --}} - - - - - - @endforeach - - - - - - - - - - - {{-- --}} - - - - - -
    NoNo RujukanTempohBerat (gm)Nilai Marhun (RM)Harga Asas (RM)Pembiayaan (RM)Keuntungan (RM)Caj Lelong (%)Baki Lelong (RM)Tindakan
    {{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['tempoh']}}{{ $marhun['berat'] }}{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}{{ number_format($marhun['hargaasas'], 2, '.', ',') }}{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }}{{ number_format($marhun['cajlelong'], 2, '.', ',') }}({{number_format($rugi, 2, '.', ',')}})@if($marhun['baki'] > 0) - {{number_format($marhun['baki'], 2, '.', ',')}} - @elseif($marhun['baki'] < 0 ) - ({{number_format(-($marhun['baki']), 2, '.', ',')}}) - @endif - - -
    JUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nilaimarhun, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_bakiupah, 2, '.', ',') }}{{ number_format($total_cazlelong, 2, '.', ',') }}({{ number_format($rugilelong, 2, '.', ',') }}){{ number_format($bakilelong, 2, '.', ',') }}
    -
    - Kembali - + } + @endphp + @if($marhun['baki'] > 0) + {{number_format($marhun['baki'], 2, '.', ',')}} + @elseif($marhun['baki'] < 0 ) ({{number_format(-($marhun['baki']), 2, '.', ',')}}) @endif + + + + + + + @endforeach + + + + JUMLAH KESELURUHAN + {{ number_format($total_berat, 2, '.', ',') }} + {{ number_format($total_nilaimarhun, 2, '.', ',') }} + {{ number_format($total_hargaasas, 2, '.', ',') }} + {{ number_format($total_pinjaman, 2, '.', ',') }} + {{ number_format($total_bakiupah, 2, '.', ',') }} + {{ number_format($total_cazlelong, 2, '.', ',') }} + {{-- ({{ number_format($rugilelong, 2, '.', ',') }}) --}} + {{ number_format($bakilelong, 2, '.', ',') }} + + + + + +
    + + +
    + {{-- Kembali --}} + +
    - {{-- Kembali --}} - - +
    - +
    -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index e35c822d..5bd4e772 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -1,141 +1,163 @@ @extends('layouts.app') @section('content') -
    +
    -
    - - @if ($message = Session::get('success')) -
    - {{ $message }} +
    +
    +
    +
    + senarai simulasi +
    - @endif -
    - - - - - - - - - - - - - - +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @endif + + +
    NoID LelongTarikh LelongFasaCawanganHarga Asas (RM)Tindakan
    + + + + + + + + + + + + + @foreach($simulasiAll as $simulasi) + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $simulasi->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + @endphp + + + + + + + + + @endforeach + - @foreach ($arrayinfo as $info) - - - - - - - - - - - @endforeach - - -
    NoID LelongTarikh LelongFasaCawanganHarga Asas (RM)Tindakan
    {{$loop->iteration}}{{$simulasi->id}}{{$t_lelong}}{{$simulasi->fasa}} + @foreach($simulasi->cawangan as $caw) +
    + {{$caw->caw_name}} +
    + @endforeach +     		{{$simulasi->fasa}} +
    + + + +
    +
    {{$loop->iteration}}{{$info['info']['simulasi_id']}} - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $info['info']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp - {{$info['info']['fasa']}} - @foreach($info['detailsinfo'] as $info2) - {{$info2['caw_name']}}
    - @endforeach -     		{{ $info['info']['harga_emas_asas'] }} - - - - - -
    -
    + + +
    +
    -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 3e626255..218951ff 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -2,238 +2,317 @@ @section('content')
    -
    -
    - - -
    -