From bccf4c89d135320c4576be680d9ea4a5a44ef68d Mon Sep 17 00:00:00 2001
From: Amir Hassan <amirhassan@utm.local>
Date: Wed, 22 Feb 2023 13:39:14 +0800
Subject: [PATCH] Add receipt photo at PC side

---
 .../pembayaran/kaunterpembayaran.blade.php    | 254 ++++++++----------
 routes/web.php                                |   1 +
 2 files changed, 107 insertions(+), 148 deletions(-)

diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index f17fa109..6f2b7efc 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -7,169 +7,127 @@
         <div class="col">
             <div class="card">
                 <div class="card-header header-style">
-                <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
-                    <i class="fas fa-arrow-left"></i>
-                </a>
-                <div class="header-style-title">
-                    Senarai Bayaran Pemenang : @foreach($datacaw as $data1)
-                    {{$data1['caw_name']}}
-                    @endforeach 
+                    <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        Senarai Bayaran Pemenang : @foreach($datacaw as $data1)
+                        {{$data1['caw_name']}}
+                        @endforeach
+                    </div>
                 </div>
-            </div>
-            <div class="card-body">
-            @if ($message = Session::get('success'))
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
                     <div class="alert alert-success">
                         <p>{{ $message }}</p>
                     </div>
-            @elseif ($message = Session::get('failed'))
+                    @elseif ($message = Session::get('failed'))
                     <div class="alert alert-danger">
                         <p>{{ $message }}</p>
                     </div>
-            @endif
-        <table class="table text-center table-bordered" id="tablekaunter" style="width:100%">
-            <thead class="bg-primary text-white">
-                    <tr>
-                        <th>No</th>
-                        <th>Nama</th>
-                        <th>No Kad Pengenalan</th>
-                        <th>No Telefon</th>
-                        <th>Bilangan Surat</th>
-                        <th>Jumlah Bidaan(RM)</th>
-                        <th>Amaun Telah Dibayar(RM)</th>
-                        <th>Status Bayaran</th>
-                        <th>Penyata Pemenang</th>
-                        <th>Slip Serahan Marhun</th>
-                        {{-- <th>Resit Pembayaran</th> --}}
-                        <th class="text-center">Tindakan</th>
-                    </tr>
-            </thead>
-            <tbody>
-          @php  $totalsurat = 0;
-                $totalbid = 0;
-                $totalpay = 0;
-          @endphp
-                @foreach($listwinner as $winner)
+                    @endif
+                    <table class="table text-center table-bordered" id="tablekaunter" style="width:100%">
+                        <thead class="bg-primary text-white">
                             <tr>
-                            <td> {{ $loop->iteration }} </td>
-                            <td style='white-space:nowrap;' align = 'left'>{{ $winner['details']['name']}}</td>
-                            <td>{{ $winner['details']['nokp']}}</td>
-                            <td>{{ $winner['details']['notelbimbit']}}</td>
-                            <td>{{ $winner['total_surat']}}</td>
-                            <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
-                            <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
-                            <td>
-                                @if($winner['sts_payment'] == 2)
-                                    <button class="btn btn-warning btn-sm" disabled>TUNGGU PENGESAHAN</button>
-                                @elseif($winner['sts_payment'] == 1)
-                                    <button class="btn btn-success btn-sm" disabled>SELESAI</button>
-                                @else
-                                    <button class="btn btn-danger btn-sm" disabled>BELUM BAYAR</button>
-                                @endif
-                            </td>
-                            <td align="center">
-                                <a class="btn m-1 btn-warning"  href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
-                            </td>
+                                <th>No</th>
+                                <th>Nama</th>
+                                <th>No Kad Pengenalan</th>
+                                <th>No Telefon</th>
+                                <th>Bilangan Surat</th>
+                                <th>Jumlah Bidaan(RM)</th>
+                                <th>Penyata Pemenang</th>
+                                <th class="text-center">Lakukan Bayaran Tunai</th>
+                                <th>Status Bayaran</th>
+                                <th>Maklumat Bayaran</th>
+                                <th>Slip Serahan Marhun</th>
+                                {{-- <th>Resit Pembayaran</th> --}}
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @php $totalsurat = 0;
+                            $totalbid = 0;
+                            $totalpay = 0;
+                            @endphp
+                            @foreach($listwinner as $winner)
+                            <tr>
+                                <td> {{ $loop->iteration }} </td>
+                                <td style='white-space:nowrap;' align='left'>{{ $winner['details']['name']}}</td>
+                                <td>{{ $winner['details']['nokp']}}</td>
+                                <td>{{ $winner['details']['notelbimbit']}}</td>
+                                <td>{{ $winner['total_surat']}}</td>
+                                <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
+                                <td align="center">
+                                    <a class="btn btn-warning" href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target="blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran"><i class="fas fa-download"></i></a>
+                                </td>
+                                <td>
+                                    <a class="btn btn-primary" href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
+                                </td>
+                                <td>
+                                    @if($winner['sts_payment'] == 2)
+                                    <button class="btn btn-warning" disabled>TUNGGU PENGESAHAN</button>
+                                    @elseif($winner['sts_payment'] == 1)
+                                    <button class="btn btn-success" disabled>SELESAI</button>
+                                    @else
+                                    <button class="btn btn-danger" disabled>BELUM BAYAR</button>
+                                    @endif
+                                </td>
+                                <td>
+                                    @if($winner['sts_payment'] == 1)
+                                    <a href="{{ route('report.detailsbayaran', [ $lelong_id, 'user_id'=>$winner['details']['id'], $datacaw[0]->caw_code ]) }}" class="btn btn-warning" data-toggle="tooltip" data-placement="top" title="Butiran Bayaran"><i class="far fa-list-alt"></i></a>
+                                    @endif
+                                </td>
 
-                            <td align="center">
-                                <a class="btn m-1 btn-success" href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan" ><i class="fas fa-download"></i></a>
-                            </td>
-
-                            {{-- <td>
-                            <a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Resit Pembayaran"><i class="far fa-edit"></i></a>
-                            </td> --}}
-
-                           
-                            <td>
-                                {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )     --}}
-                                    <a class="btn m-1 btn-primary" href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
-                                {{-- @endif --}}
-                            </td>
-                        </tr>
-                        @php 
-                        $totalsurat += $winner['total_surat'];
-                        $totalbid += $winner['totalBid'];
-                        $totalpay += $winner['totalPay'];
-                    @endphp
-                @endforeach
-            </tbody>
-            <tfoot>
-                <tr>
-                    <td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
-                    <td align = 'center'><b><b>{{$totalsurat}}</b></td>
-                    <td align = 'center'><b>{{ number_format($totalbid, 2, '.', ',') }}</b></td>
-                    <td align = 'center'><b>{{ number_format($totalpay, 2, '.', ',') }}</b></td>
-                    <td colspan="4"></td>
-                </tr>
-            </tfoot>
-        </table>
-        {{-- <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary">Kembali</a>
-        </div> --}}
+                                <td align="center">
+                                    <a class="btn m-1 btn-success" href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target="blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan"><i class="fas fa-download"></i></a>
+                                </td>
+                            </tr>
+                            @php
+                            $totalsurat += $winner['total_surat'];
+                            $totalbid += $winner['totalBid'];
+                            $totalpay += $winner['totalPay'];
+                            @endphp
+                            @endforeach
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
+                                <td align='center'><b><b>{{$totalsurat}}</b></td>
+                                <td align='center'><b>{{ number_format($totalbid, 2, '.', ',') }}</b></td>
+                                <td colspan="5"></td>
+                            </tr>
+                        </tfoot>
+                    </table>
+            </div>
+        </div>
     </div>
-    </div>
-</div>
 
-<script>
-      //Enable tooltips everywhere
-      $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
-    })
-    var tablekaunter = $('#tablekaunter').DataTable({
-            "columnDefs": [ 
-                {
-                "targets": 0,
-                "orderable": false
-                }, 
-                {
-                "targets": 8,
-                "orderable": false
+    <script>
+        $(function() {
+            $('[data-toggle="tooltip"]').tooltip()
+        })
+        var tablekaunter = $('#tablekaunter').DataTable({
+            "columnDefs": [{
+                    "targets": 6,
+                    "orderable": false
                 },
                 {
-                "targets": 9,
-                "orderable": false
+                    "targets": 7,
+                    "orderable": false
                 },
                 {
-                "targets": 10,
-                "orderable": false
+                    "targets": 8,
+                    "orderable": false
+                },
+                {
+                    "targets": 9,
+                    "orderable": false
+                },
+                {
+                    "targets": 10,
+                    "orderable": false
                 }
             ],
-            order: [[0, 'asc']],
-            "info": false,
-            "lengthChange": false,
-            "pageLength": 15,
-            dom: 'Bfrtip',
-            // buttons: [
-            //     {
-            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
-            //         text: '<i class="fas fa-plus" id="test"></i>',
-            //         titleAttr: 'Tambah Cawangan',
-            //         action: function ( e, dt, node, config ) {
-            //             // alert( 'Button activated' );
-            //             // console.log('hye');
-                        
-            //             $('#myModal').modal("show");
-            //             $('#myModal').on('shown.bs.modal', function () {
-            //                 $('#rolename').trigger('focus')
-            //             })
-            //         }
-            //     },
-            //     {
-            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-            //         titleAttr: 'Export to CSV',
-            //         text: '<i class="fas fa-download"></i>',
-            //         action: function ( e, dt, node, config ) {
-            //             $("#exportform").submit();
-            //         }
-            //     }
-            // ]
-    });
-
-        // $('.addcaw').tooltip();
-        // $('.export').tooltip();
-        // // $( '.dt-buttons').addClass('btn-group');
-        // $( '.addcaw').removeClass('dt-button');
-        // $( '.export').removeClass('dt-button');
-</script>
-
-@endsection
+        });
+    </script>
 
+    @endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 61d12824..878b9ae2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -541,6 +541,7 @@ Route::post('/export',['as'=>'report.exportubahmarhun','uses'=>'ReportController
 
 Route::get('/showphotoresit',['as'=>'report.showphotoresit','uses'=>'PembidaController@showPhotoResit']);
 
+Route::get('/detailsbayaran/{lelong_id}/{user_id}/{kodcaw}',['as'=>'report.detailsbayaran','uses'=>'PembidaController@detailsbayaran']);
 });
 
 //Report by KALI