From 5289f4df8b88a86b69b13dbe8e1a92567e484413 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 17 Nov 2022 15:48:58 +0800 Subject: [PATCH] update bunag checkbox bayaran tunai pada pag pc dan operasi --- app/Http/Controllers/PaymentController.php | 77 ++- app/Http/Controllers/PembidaController.php | 106 ++-- ...2021_12_14_041557_create_lelongs_table.php | 1 + .../views/pembayaran/SAGBidItem.blade.php | 83 +++- .../views/pembida/SAGBidItembycaw.blade.php | 462 ++++-------------- 5 files changed, 285 insertions(+), 444 deletions(-) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 426431fe..b238817a 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -176,18 +176,21 @@ class PaymentController extends Controller } // dd(); } - // foreach($gettunai as $index1=>$cash) - // { - // // dd($cash); - // $remarktunai = Payment::where('id', $cash['payment_id']) - // ->where('remark', '=', 'TUNAI') - // ->select('remark') - // ->first(); - // // dd($remarktunai); - - // $eachbid[$index1]['cash_only'] = $remarktunai; - // } - + $statuspayment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.status_bidder', 1) + ->where('users.id', $user_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.kodcaw', $user->kodcaw) + ->select('lelongbidder.hargabida', + 'lelongbidder.user_id', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.status_payment', + 'lelongbid.opencash' + ) + ->first(); $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id') ->where('payment.lelong_id', $lelong_id) ->where('payment.user_id', $user_id) @@ -205,8 +208,10 @@ class PaymentController extends Controller { $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']); } + $datacaw = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); - return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit','getinvoice','totalbidaan')); + return view('pembayaran.SAGBidItem',compact('statuspayment','datacaw','SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit','getinvoice','totalbidaan')); } public function paymentdenokaunter(Request $request){ @@ -225,12 +230,16 @@ class PaymentController extends Controller $user = Auth::user(); $total_hargabida = 0; + // dd($request->lelong_id); - $bidid = implode(",", $request->eachbid); - $bid_id = explode(",", $bidid); + // $bidid = implode(",", $request->eachbid); + // $bid_id = explode(",", $bidid); - $norujukanid = implode(",", $request->norujukan); - $norujukan_id = explode(",", $norujukanid); + // $norujukanid = implode(",", $request->norujukan); + // $norujukan_id = explode(",", $norujukanid); + + + // dd($eachbid); $getinvoice = Invoice::where('lelong_id',$request->lelong_id) ->where('user_id','=',$request->user_id) @@ -284,23 +293,39 @@ class PaymentController extends Controller ]); - + $sagmenang = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbid.status_jual', 1) + ->where('users.id', $request->user_id) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->where('lelongbid.kodcaw', $user->kodcaw) + ->select('lelongbidder.hargabida', + 'lelongbidder.user_id', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.status_payment' + ) + ->get(); - foreach($bid_id as $index1=>$bid) + foreach($sagmenang as $index1=>$bid) { - // dd($norujukan_id[$index1]); + // dd($bid->lelongbid_id); $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') - ->where('lelongbidder.lelongbid_id', $bid) + ->where('lelongbidder.lelongbid_id', $bid->lelongbid_id) ->where('lelongbidder.user_id', $request->user_id) + ->where('lelongbid.kodcaw', $user->kodcaw) ->select('lelongbidder.hargabida', 'lelongbid.hargaasas', + 'lelongbid.kodcaw', 'lelongbid.norujukan', 'lelongbidder.lelongbid_id', 'lelongbidder.id as lelongbidder_id', 'lelongbid.lelong_id as lelong_id' ) ->first(); + // dd($eachbid); $total_hargabida = $total_hargabida + $eachbid->hargabida; @@ -308,7 +333,8 @@ class PaymentController extends Controller 'user_id' => $request->user_id, 'lelong_id' => $request->lelong_id, 'kodcaw' => $user->kodcaw, - 'norujukan' => $norujukan_id[$index1], + // 'norujukan' => $norujukan_id[$index1], + 'norujukan' => $bid->norujukan, 'status_payment_opt' => 1, 'status' => 2, 'remark' => 'TUNAI', @@ -328,7 +354,7 @@ class PaymentController extends Controller $updatelelbidbidder->payment_id = $payment->id; $updatelelbidbidder->save(); - $eachbidupdate = LelongBid::where('id',$bid)->first(); + $eachbidupdate = LelongBid::where('id',$bid->lelongbid_id)->first(); $eachbidupdate->status_jual = 1; $eachbidupdate->status_payment = '1'; $eachbidupdate->t_jual = $currentdate; @@ -354,7 +380,10 @@ class PaymentController extends Controller $resit->save(); } - return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya'); + // return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya'); + return redirect()->route('pembayaran.kaunterpembayaran', $request->lelong_id) + ->with('success','Pembayaran Berjaya'); + } public function pengesahanPembayaran(Request $request){ diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index d5812e0e..4b0856fc 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -635,43 +635,33 @@ class PembidaController extends Controller 'lelongbidder.status_payment' ) ->get(); + // dd($eachbid); foreach($eachbid as $bid) { - // dd($bid); - $paymentstatus = Payment::where('lelong_id', $lelong_id) - ->where('user_id', $bid['user_id']) - ->where('status', 2) - ->where('status_payment_opt', 2) - ->orWhere('status_payment_opt', 3) - ->get(); - - if($paymentstatus) - { - $total_payment = 0; - foreach($paymentstatus as $index1=>$payemnt) - { - $payment = Payment::where('id', $payemnt->payment_id) - ->first(); - - if($payment){ - $total_payment = $total_payment + $payment->total_payment; - } - $listwinner[$index1]['totalPay'] = $total_payment; - } - } + $totalbidaan = $bid->sum('hargabida'); + // dd($totalbidaan); } - // foreach($gettunai as $index1=>$cash) - // { - // // dd($cash); - // $remarktunai = Payment::where('id', $cash['payment_id']) - // ->where('remark', '=', 'TUNAI') - // ->select('remark') - // ->first(); - // // dd($remarktunai); + $totalbidaan = $eachbid->SUM('hargabida'); + // dd($totalbidaan); - // $eachbid[$index1]['cash_only'] = $remarktunai; - // } + + $statuspayment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.status_bidder', 1) + ->where('users.id', $user_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.kodcaw', $kodcaw) + ->select('lelongbidder.hargabida', + 'lelongbidder.user_id', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.status_payment', + 'lelongbid.opencash' + ) + ->first(); + // dd($statuspayment); $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id') ->where('payment.lelong_id', $lelong_id) @@ -691,7 +681,11 @@ class PembidaController extends Controller $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']); } - return view('pembida.SAGBidItembycaw',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit', 'getinvoice')); + $datacaw = Cawangan::where('caw_code','=',$kodcaw) + ->get(); + // dd($datacaw); + + return view('pembida.SAGBidItembycaw',compact('statuspayment','totalbidaan','datacaw','SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit', 'getinvoice','kodcaw')); } public function benarkantunai(Request $request) @@ -703,24 +697,44 @@ class PembidaController extends Controller $idpembida = $request->user_id; $lelong_id = $request->lelong_id; + $kodcaw = $request->kodcaw; - $opencash = Invoice::where('lelong_id',$lelong_id) - ->where('user_id','=',$idpembida) - ->first(); - $opencash->opencash = 1; - $opencash->save(); + // $opencash = Invoice::where('lelong_id',$lelong_id) + // ->where('user_id','=',$idpembida) + // ->first(); + // $opencash->opencash = 1; + // $opencash->save(); + + $lelongbid = LelongBid::where('lelong_id',$lelong_id) + ->where('nopembeli','=',$idpembida) + ->where('kodcaw','=',$kodcaw) + ->get(); + // dd($opencashlelongbid); + foreach($lelongbid as $lelbid) + { + $opencashlelongbid = LelongBid::where('lelong_id',$lelong_id) + ->where('nopembeli','=',$idpembida) + ->where('kodcaw','=',$kodcaw) + ->where('norujukan','=',$lelbid->norujukan) + ->first(); + // dd($opencashlelongbid); + $opencashlelongbid->opencash = 1; + $opencashlelongbid->save(); + + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $lelbid->norujukan; + $loguser->nota = 'Benarkan Bayaran Tunai'; + $loguser->save(); + } //audit trail - $loguser = new LogUser; - $loguser->user_id = $user->id; - $loguser->date = $currentdate; - $loguser->username = $user->username; - $loguser->nama_user = $user->name; - $loguser->norujukan = $opencash->invoice_no; - $loguser->nota = 'Benarkan Bayaran Tunai'; - $loguser->save(); + return redirect()->route('pembida.kebenaranbayarantunai')->with('success','Kebenaran Berjaya'); diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 71f81c2f..82311997 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -107,6 +107,7 @@ class CreateLelongsTable extends Migration $table->datetime('diserahkan_pada')->nullable(); $table->string('mora_upah'); $table->integer('fasa')->default(0); + $table->integer('opencash')->default(0); $table->timestamps(); $table->foreign('caw_id') diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index d74a5dfd..4b50df8d 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -1,19 +1,71 @@ @extends('layouts.app') @section('content') - -
-
-
-

Nama : {{ $SAGBidItem->name }}

-

No Kad Pengenalan : {{ $SAGBidItem->nokp }}

-

No.Telefon : {{ $SAGBidItem->notelbimbit }}

-

No.Invoice : {{ $getinvoice->invoice_no }}

+
+
+
+
+
+ + + +
+ Cawangan : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
RM
+
+ +
+
+
+
-
-
+ + +
@@ -57,7 +109,7 @@ @elseif($biditem->status_payment == 2) TUNGGU PENGESAHAN @else - + {{-- --}} BELUM BAYAR @endif @@ -65,8 +117,8 @@ @endforeach Jumlah Bayaran - RM - + RM + @if($getresit)
--}}
- @elseif($getinvoice->opencash == '0' && $biditem->status_payment == '') + @elseif($statuspayment->opencash == '0')

Sila Hubungi Operasi Untuk Kebenaran

@@ -107,7 +159,6 @@
-
    diff --git a/resources/views/pembida/SAGBidItembycaw.blade.php b/resources/views/pembida/SAGBidItembycaw.blade.php index ce520d7f..1985fe33 100644 --- a/resources/views/pembida/SAGBidItembycaw.blade.php +++ b/resources/views/pembida/SAGBidItembycaw.blade.php @@ -2,328 +2,120 @@ @section('content') -
    - -
    - -
    -

    Nama : {{ $SAGBidItem->name }}

    -

    No Kad Pengenalan : {{ $SAGBidItem->nokp }}

    -

    No.Telefon : {{ $SAGBidItem->notelbimbit }}

    -

    No.Invoice : {{ $getinvoice->invoice_no }}

    -
    -
    -
    - -
    +
    +
    +
    +
    + @csrf + + + +
    + + + +
    + Cawangan : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
    +
    +
    - - @csrf - - - - - - - - - - - - - - - @foreach($eachbid as $biditem) - - - - - - - - @endforeach - {{-- - - - - --}} - -
    NoNo rujukanHarga Asas (RM)Harga Bida (RM)Tindakan
    {{ $loop->iteration }} - {{ $biditem->norujukan}} - {{ number_format($biditem->hargaasas, 2, '.', ',')}}{{ number_format($biditem->hargabida, 2, '.', ',')}} - @if($biditem->status_payment == 1) - - PAID - @elseif($biditem->status_payment == 2) - TUNGGU PENGESAHAN - @else - BELUM BAYAR - @endif -
    Jumlah BayaranRM - @if($getresit) - - @else - @endif -
    - - {{--
    - Kembali - - -
    --}} -
    - {{-- Kembali --}} - @if($biditem->status_payment == 0) - +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    RM
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    + {{--
    RM
    --}} +
    + @if($statuspayment->opencash == 0) + + @elseif($statuspayment->opencash == 1) + @endif +
    +
    - {{--
    - Kembali -
    --}} +
    + + +
    - -
    - - - @endsection \ No newline at end of file