Merge branch 'amirah' into 'main'

update resit dan penyata

See merge request online-sistem1/lelong!64

app/Http/Controllers/PaymentController.php

@@ -27,7 +27,7 @@ class PaymentController extends Controller
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->where('lelong.sts_lelong', 3)
         ->where('cawangan.caw_code', $user->kodcaw)
         ->groupBy('lelong_id')

app/Http/Controllers/ReportCawanganController.php

@@ -292,7 +292,8 @@ class ReportCawanganController extends Controller
         }
 
         $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
-        ->where('lelongbid.lelong_id','=',$lelong_id)        
+        ->where('lelongbid.lelong_id','=',$lelong_id)      
+        ->where('lelongbid.kodcaw','=',$user['kodcaw']) 
         ->where('lelongbidder.status_bidder','=','1')
         ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
         'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')

app/Http/Controllers/SerahanController.php

@@ -139,7 +139,7 @@ class SerahanController extends Controller
 
         $invois = Payment::join('resit','payment.resit_id','=','resit.id')
         ->where('resit.id',$lelong_id)
-        ->first();      
+        ->get();      
         // dd($invois);  
         
 

resources/views/pdf/jananotis.blade.php

@@ -43,7 +43,7 @@
 
         <div class="row">
             <div class="first-prgph">
-                <img src="{{ asset('img/icon_pkb.png') }}" alt="PKB LOGO" width="100" height="100">
+                {{-- <img src="{{ asset('img/icon_pkb.png') }}" alt="PKB LOGO" width="100" height="100"> --}}
             </div>      
 
             <div class="first-prgph1">

resources/views/pdf/penyatabayaran.blade.php

@@ -52,7 +52,7 @@
                           </tr>
                           <tr>
                             <td>{{$caw['alamat1']}}</td>
-                            <td align="right">No.Invois: :{{$invois->reference_no}} </td>
+                            {{-- <td align="right">No.Invois: :{{$invois->reference_no}} </td> --}}
                           </tr>
 
 

resources/views/pdf/resitpembayaran.blade.php

@@ -55,7 +55,7 @@
                             </tr>
                             <tr>
                               <td>{{$caw['alamat1']}}</td>
-                              <td align="right">No.Slip: {{$invois['reference_no']}}</td>
+                              {{-- <td align="right">No.Slip: {{$invois['reference_no']}}</td> --}}
                             </tr>
                             <tr>
                               <td>{{$caw['alamat2']}}</td>

resources/views/pembayaran/kaunterpembayaran.blade.php

@@ -35,10 +35,12 @@
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ $winner['totalBid']}}</td>
                             <td>{{ $winner['totalPay']}}</td>
-                            <td></td>
                             <td>
                                 <a 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 href="{{ route('serahan.resitpembayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Resit Bayaran" ><i class="fas fa-download"></i></a>
+                            </td>
                             <td>
                                 {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )     --}}
                                     <a 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>