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 00000000..3a6071ce Binary files /dev/null and b/public/img/arrahn_favicon.ico differ 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')
    -
    -
    - - -
    -