From 46322e5202ba3940829a8681e12d19bc3f5f6e75 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 19 Oct 2022 15:24:16 +0800 Subject: [PATCH] update slip serahan dan penyata --- app/Http/Controllers/SerahanController.php | 36 +++++++++++-- resources/views/pdf/penyatabayaran.blade.php | 53 ++++++-------------- resources/views/pdf/slipserahan.blade.php | 6 ++- 3 files changed, 52 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index 8e4e0eed..ba45ee34 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -1,6 +1,10 @@ where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbid.kodcaw','=',$user->kodcaw) + ->select('lelongbid.norujukan','lelongbid.id','lelongbid.hargajual') ->get(); + foreach($SAGWin as $index1=>$lelong2){ + + // dd($SAGWin); + $marhun= LelongBidMarhun::join('jenisemas','jenisemas.marhun','=','lelongbidmarhun.marhun') + ->where('lelongbid_id','=',$lelong2['id']) + // ->where('kodcaw','=',$user['kodcaw']) + ->get(); + + $total_berat = $total_berat + ($marhun->sum('berat')); + + $SAGWin[$index1]['detailmarhun']=$marhun; + + } + $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') // ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik ->where('lelongbid.kodcaw','=',$user->kodcaw) @@ -298,11 +318,17 @@ class SerahanController extends Controller $lelong = Lelong::where('id',$lelong_id) ->first(); + // dd($lelong); $invois = Invoice::where('user_id',$user_id) ->where('lelong_id',$lelong_id) ->get(); // dd($invois); + + $khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'khazanah' + ])->json(); + // dd($roles_harian_khazanah); $SAGWin = LelongBid::join('scan_semak','lelongbid.norujukan','=','scan_semak.norujukan') @@ -311,14 +337,16 @@ class SerahanController extends Controller ->where('scan_semak.serahkpdpembida', 1) ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbid.kodcaw',$user->kodcaw) + ->select('lelongbid.id','lelongbid.norujukan','lelongbid.hargajual') // ->where('payment.resit_id',$resit_id) ->get(); // dd($SAGWin); if($SAGWin->isNotEmpty()){ - foreach($SAGWin as $index1=>$lelong){ + foreach($SAGWin as $index1=>$lelong2){ + // dd($SAGWin); $marhun= LelongBidMarhun::join('jenisemas','jenisemas.marhun','=','lelongbidmarhun.marhun') - ->where('lelongbid_id','=',$lelong['id']) + ->where('lelongbid_id','=',$lelong2['id']) // ->where('kodcaw','=',$user['kodcaw']) ->get(); @@ -328,7 +356,7 @@ class SerahanController extends Controller // $total_hargaasas = $total_hargaasas + ($marhun->sum('hargaasas')); $SAGWin[$index1]['detailmarhun']=$marhun; - + } $senaraisag = LelongBid::where('lelongbid.kodcaw',$user->kodcaw) @@ -341,7 +369,7 @@ class SerahanController extends Controller $caw['total_bidaan'] = $senaraisag->sum('hargajual'); - $pdf = PDF::loadView('pdf.slipserahan',compact('userdetails','SAGWin','caw','user','lelong','invois','total_berat')) + $pdf = PDF::loadView('pdf.slipserahan',compact('userdetails','SAGWin','caw','user','lelong','invois','total_berat','khazanah')) ->setPaper('a4', 'potrait'); return $pdf->download('Slip Serahan.pdf'); diff --git a/resources/views/pdf/penyatabayaran.blade.php b/resources/views/pdf/penyatabayaran.blade.php index ea4c1526..55556c55 100644 --- a/resources/views/pdf/penyatabayaran.blade.php +++ b/resources/views/pdf/penyatabayaran.blade.php @@ -58,7 +58,12 @@ {{$caw['alamat2']}} - Tarikh Lelong :{{$lelong->tarikh_lelong}} + Tarikh: @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong->tarikh_lelong); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @@ -120,52 +125,26 @@ {{$index+1}} {{$info['norujukan']}} - {{$info['marhun']}} - {{ number_format($info['berat'], 2, '.', ',') }} - {{ number_format($info['hargabida'], 2, '.', ',') }} + @foreach ($info['detailmarhun'] as $item) + {{ "-".$item['descpt'] }}
+ @endforeach + @foreach ($info['detailmarhun'] as $item) + {{ $item['berat'] }}
+ @endforeach + {{ number_format($info['hargajual'], 2, '.', ',') }} @endforeach Jumlah - {{ number_format($caw['total_berat'], 2, '.', ',') }} - {{ number_format($caw['total_bidaan'], 2, '.', ',') }} + {{ number_format($caw['total_berat'], 2, '.', ',') }} + {{ number_format($caw['total_bidaan'], 2, '.', ',') }} -{{-- - -

- - - - - - - - - - - - - - - - - - - - - - - - - -
BAYARAN MENGIKUT AKAUN
Berat(g)Bayaran(RM)Nama BankPemegang AkaunNo.Akaun
{{ number_format($caw['total_berat'], 2, '.', ',') }}{{ number_format($caw['total_bidaan'], 2, '.', ',') }}{{$caw['nama_bank']}}{{$caw['bank_acc']}}{{$caw['bank_acc_no']}}
*Sila Buat Pembayaran Mengikut Akaun
- - --}} + diff --git a/resources/views/pdf/slipserahan.blade.php b/resources/views/pdf/slipserahan.blade.php index 80b7467a..59791236 100644 --- a/resources/views/pdf/slipserahan.blade.php +++ b/resources/views/pdf/slipserahan.blade.php @@ -63,7 +63,7 @@ {{$caw['alamat2']}} Tarikh: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong->t_lelong); + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong->tarikh_lelong); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp @@ -166,7 +166,9 @@ Tandatangan Pembeli - Nama: {{$user->name}} + @foreach ($khazanah as $k) + Nama: {{$k['name']}} + @endforeach                                                  Nama: {{$userdetails->name}}