cdm pc & sah account

2022-04-06 12:17:27 +08:00
parent e19b839ab5
commit 8582c460e1
9 changed files with 159 additions and 67 deletions
@@ -37,7 +37,8 @@ class AccountController extends Controller
        ->join('payment', 'lelongbidder.payment_id', 'payment.id')
        ->where('lelongbidder.status_bidder', 1)
        ->where('lelongbid.lelong_id', $lelong_id)
-        ->where('payment.status_payment_opt',2)
+        ->where('payment.status_payment_opt','=', '3,2')
+        ->where('lelongbidder.status_payment', 2)
        ->whereNull('payment.disahkan_pada')
        ->select('.lelongbidder.user_id'
        )
@@ -48,12 +49,6 @@ class AccountController extends Controller
        foreach($listwinner as $index1=>$winner){

            $userdetails = User::where('id', $winner['user_id'])->first();
-            // $SAGWin = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id')
-            // ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id')
-            // ->where('payment.user_id', $winner['user_id'])
-            // ->where('lelongbidder.status_bidder', 1)
-            // ->where('lelongbid.lelong_id', $lelong_id)
-            // ->get();

            $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
            ->where('lelongbidder.user_id', $winner['user_id'])
@@ -62,7 +57,6 @@ class AccountController extends Controller
            ->get();
            // dd($SAGWin->sum('hargabida'));

-
            $id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
            ->where('lelongbidder.user_id', $winner['user_id'])
            ->where('lelongbidder.status_bidder', 1)
@@ -98,7 +92,8 @@ class AccountController extends Controller
        ->where('lelongbid.lelong_id', $lelong_id)
        ->where('lelongbidder.user_id', $user_id)
        ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', 2)
+        ->where('payment.status_payment_opt', '=', '3,2')
+        ->where('lelongbidder.status_payment', 2)
        ->get()->toArray();

        $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -106,7 +101,8 @@ class AccountController extends Controller
        ->where('lelongbid.lelong_id', $lelong_id)
        ->where('lelongbidder.user_id', $user_id)
        ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', 2)
+        ->where('payment.status_payment_opt', '=', '3,2')
+        ->where('lelongbidder.status_payment', 2)
        ->select(
            'lelongbidder.payment_id as payment_id'
            )
@@ -126,21 +122,21 @@ class AccountController extends Controller
        $currentdate = $currentdate->toDateTimeString();

        $user = Auth::user();
-
        
        $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
        ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
        ->where('lelongbid.lelong_id', $request->lelong_id)
        ->where('lelongbidder.user_id', $request->user_id)
        ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', 2)
+        ->where('payment.status_payment_opt', '3,2')
+        ->where('lelongbidder.status_payment', 2)
        ->select(
            'lelongbid.id as lelongbid_id',
            'payment.id as payment_id',
            'lelongbid.lelong_id',
            'lelongbidder.user_id',
            )
-            ->get();    
+        ->get();    

        $total_payment = 0;
        $paymentid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -148,7 +144,8 @@ class AccountController extends Controller
        ->where('lelongbid.lelong_id', $request->lelong_id)
        ->where('lelongbidder.user_id', $request->user_id)
        ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', 2)
+        ->where('payment.status_payment_opt', '3,2')
+        ->where('lelongbidder.status_payment', 2)
        ->select(
            'lelongbidder.payment_id as payment_id'
            )
@@ -169,8 +166,16 @@ class AccountController extends Controller
            $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
            $eachbid->status_payment = 1;
            $eachbid->status_jual = 1;
+            $eachbid->status_semak = 1;
            $eachbid->t_jual = $currentdate;
            $eachbid->save();
+
+            $bidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
+                                  ->where('payment_id', $sag->payment_id)
+                                  ->where('user_id', $sag->user_id)
+                                  ->first();
+            $bidder->status_payment = 1;
+            $bidder->update();
        }

        $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
@@ -41,7 +41,6 @@ class PaymentController extends Controller
        )
        ->groupBy('lelongbidder.user_id')
        ->get()->toArray();
-        // dd($listwinner);

        foreach($listwinner as $index1=>$winner){

@@ -52,13 +51,20 @@ class PaymentController extends Controller
            ->where('lelongbid.lelong_id', $lelong_id)
            ->get();

-  
-            $payment_id = $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('user_id', $winner['user_id'])
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.lelong_id', $lelong_id)
+            ->select('lelongbidder.status_payment')
+            ->get();
+            // dd($sts_payment[0]['status_payment']);
+
+            $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
            ->where('user_id', $winner['user_id'])
            ->where('lelongbidder.status_bidder', 1)
            ->where('lelongbid.lelong_id', $lelong_id)
            ->select('payment_id')->groupBy('payment_id')->get();
-            // dd($payment_id);
+            
            $total_payment = 0;
            foreach($payment_id as $id){
                $payment = Payment::where('id', $id->payment_id)
@@ -73,6 +79,7 @@ class PaymentController extends Controller
            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
            $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
            $listwinner[$index1]['totalPay'] = $total_payment;
+            $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];

        }

@@ -108,7 +115,6 @@ class PaymentController extends Controller
                    )
        ->get();

-
        return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id'));
    }

@@ -125,7 +131,7 @@ class PaymentController extends Controller
        $resit = Resit::where('lelong_id', $request->lelong_id)
        ->where('user_id',$request->user_id)
        ->where('resit_type', 2)
-            ->first();
+        ->first();
            
        $total_hargabida = 0;
        $payment = Payment::create([
@@ -212,4 +218,47 @@ class PaymentController extends Controller

        return view('pembayaran.pengesahanPembayaran',compact('pengesahanPembayaran'));
    }
+
+    public function banktransfer(Request $request)
+    {
+        // dd($request->all());
+
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+
+        $user = Auth::user();
+        // dd($user);
+        
+        $totalcheck = implode(",", $request->checkboxdata);
+
+        $resit = Resit::where('lelong_id', $request->lelong_id)
+        ->where('user_id',$request->user_id)
+        ->where('resit_type', 2)
+        ->first();
+
+        $payment = new Payment;
+        $payment->user_id = $request->user_id;
+        $payment->lelong_id = $request->lelong_id;
+        $payment->kodcaw = $user->kodcaw;
+        $payment->status_payment_opt = 3;
+        $payment->status = 2;
+        $payment->remark = 'BAYARAN CDM';
+        $payment->resit_id = $resit->id;
+        $payment->total_payment = $totalcheck;
+        $payment->diminta_pada = $currentdate;
+        $payment->diminta_oleh = $user->id;
+        $payment->save();
+
+        $sts_payment = LelongBidder::where('user_id', $request->user_id)
+        ->where('lelongbid_id', $request->eachbid)
+        ->first();
+        
+        $sts_payment->payment_id = $payment->id;
+        $sts_payment->status_payment = 2; //Menunggu pengesahan account
+        $sts_payment->update();
+
+        return redirect()->route('pembayaran.SenaraiLelongBayar')
+                         ->with('success','Menunggu Pengesahan Account');
+
+    }
 }
@@ -23,7 +23,7 @@ class CreateLelongsTable extends Migration
            $table->string('harga_emas_asas');
            $table->string('jbg');
            $table->integer('cajlelong');
-            $table->integer('sts_lelong')->default(0);
+            $table->integer('sts_lelong')->default(0); //1= start, 2 = jana pemenang, 3 = senarai pemenang
            $table->timestamps();
        });

@@ -22,7 +22,7 @@ class CreatePaymentTable extends Migration
            $table->string('bank_acc_no_pembeli')->nullable();
            $table->string('nama_bank_acc_caw')->nullable();
            $table->string('bank_no_acc_caw')->nullable();
-            $table->integer('status_payment_opt')->nullable();  //1=kaunter,2=online    
+            $table->integer('status_payment_opt')->nullable();  //1=kaunter,2=online,3=CDM
            $table->integer('resit_id');
            $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin 
            $table->string('remark');
@@ -40,6 +40,8 @@ class CreatePaymentTable extends Migration
            $table->decimal('total_payment', $precision = 11, $scale = 2);
            $table->datetime('disahkan_pada')->nullable();
            $table->integer('disahkan_oleh')->nullable();
+            $table->datetime('diminta_pada')->nullable();
+            $table->integer('diminta_oleh')->nullable();
            $table->timestamps();

            $table->foreign('user_id')
@@ -159,7 +159,7 @@
        <a href="/home">Home</a>
      </li> --}}
      <li class="{{ (request()->is('account/*')) ? 'active' : '' }}">
-        <a href="{{url('account/senarailelongan')}}">List Bayaran Online</a>
+        <a href="{{url('account/senarailelongan')}}">Bayaran Online</a>
      </li>
      @endhasrole
      @hasrole('pembida')
@@ -14,49 +14,55 @@

 <div class="container">
    <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-        <table class="table table-border table-hover table-xl" style="width:100%">
-            <thead class="bg-primary text-white">
-                    <tr>
-                        <th class="text-center">No</th>
-                        <th class="text-center">No. rujukan</th>
-                        <th class="text-center">Harga Asas (RM)</th>
-                        <th class="text-center">Harga Bida (RM)</th>
-                        <th class="text-center">Action</th>
-                    </tr>
-            </thead>
-            <tbody>
+            <div class="col-md-11 mx-auto card p-4">
+            <form action="{{ route('pembayaran.banktransfer') }}" method="POST" id="formbanktransfer">
+                    @csrf
+                <input type="hidden" name="user_id" value="{{ $user_id }}" />
+                <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
+                <input type="hidden" name="eachbid" id="eachbid" value="" />
+                    <table class="table table-border table-hover table-xl" style="width:100%">
+                        <thead class="bg-primary text-white">
+                                <tr>
+                                    <th class="text-center">No</th>
+                                    <th class="text-center">No. rujukan</th>
+                                    <th class="text-center">Harga Asas (RM)</th>
+                                    <th class="text-center">Harga Bida (RM)</th>
+                                    <th class="text-center">Action</th>
+                                </tr>
+                        </thead>
+                        <tbody>
+                            @foreach($eachbid as $biditem)
+                                <tr>
+                                    <td class="text-center">{{ $loop->iteration }}</td>
+                                    <td class="text-center">{{ $biditem->norujukan}}</td>
+                                    <td class="text-center">{{ $biditem->hargaasas}}</td>
+                                    <td class="text-center">{{ $biditem->hargabida}}</td>
+                                    <td class="text-center">
+                                        @if($biditem->status_payment == 0)
+                                            <input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}">
+                                        @elseif($biditem->status_payment == 2)
+                                            <span class="btn btn-warning btn-sm hovernone-warning">MENUNGGU PENGESAHAN</span>
+                                        @else
+                                            <span class="btn btn-danger btn-sm hovernone-danger">PAID</span>

-            <!-- $a= (string)$eachbid['hargabida'];
-            $Total_Payment = sum($a); -->
-
-                @foreach($eachbid as $biditem)
-                    <tr>
-                        <td class="text-center">{{ $loop->iteration }}</td>
-                        <td class="text-center">{{ $biditem->norujukan}}</td>
-                        <td class="text-center">{{ $biditem->hargaasas}}</td>
-                        <td class="text-center">{{ $biditem->hargabida}}</td>
-                        <td class="text-center">
-                            @if($biditem->status_payment == 0)
-                                <input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}">
-                            @else
-                                <span class="btn btn-danger btn-sm hovernone-danger">PAID</span>
-                            @endif
-                        </td>
-                    </tr>
-                @endforeach
-                <tr>
-                    <td colspan="3"><b> Jumlah Bayaran</b></td>
-                    <td class="text-center"><b>RM<input type="text" id="total" value="0" style="border: none;" readonly></b></td>
-                    <td> </td>
-                </tr>
-            </tbody>
-        </table>
-        <div class="text-right">
-            <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary" style="width:15%" >Kembali</a>
-        <button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Terima</button>
-        </div>
-        </div>
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endforeach
+                            <tr>
+                                <td colspan="3"><b> Jumlah Bayaran</b></td>
+                                <td class="text-center"><b>RM<input type="text" id="total" value="0" style="border: none;" readonly></b></td>
+                                <td> </td>
+                            </tr>
+                        </tbody>
+                    </table>
+            </form>
+                <div class="text-right">
+                    <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary" style="width:15%; margin-right:53%;" >Kembali</a>
+                    <button type="button" class="btn btn-info" style="width:15%" id="btnbanktransfer" onclick="confirm()">CDM</button>
+                    <button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Tunai</button>
+                </div>
+            </div>
    </div>
 </div>

@@ -177,6 +183,7 @@
 <script>
    var arraylelongbid = [];
    $("#btnterima").prop("disabled", true);
+    $("#btnbanktransfer").prop("disabled", true);
    function terimadeno() {
        $('#eachbid').val(arraylelongbid);
        $("#formpaymentdenokaunter").submit();
@@ -191,6 +198,28 @@
        $('#amaundiminta').val(parseFloat(total_sum).toFixed(2));
        $('#amaunkiraan').val(parseFloat(0).toFixed(2));
    }
+    function confirm() {
+        $.confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'blue',
+        typeAnimated: true,
+        buttons: {
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            },
+            Sahkan: {
+                btnClass: 'btn-info',
+                action: function () {
+                    $('#eachbid').val(arraylelongbid);
+                    $("#formbanktransfer").submit();
+                    var total_sum = parseFloat($('#total').val());
+                }
+            }
+        }
+    });
+    }
    function sum(val, e){ //e = get all data
    console.log(arraylelongbid.length);
  
@@ -215,10 +244,12 @@
        if(arraylelongbid.length != 0)
        {
            $("#btnterima").prop("disabled", false);
+            $("#btnbanktransfer").prop("disabled", false);
        }
        else
        {
            $("#btnterima").prop("disabled", true);
+            $("#btnbanktransfer").prop("disabled", true);
        }
    }

@@ -38,7 +38,7 @@
                                <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>
-                                @if( $winner['totalPay'] < $winner['totalBid'] )    
+                                @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>
                                @endif
                            </td>
@@ -24,7 +24,11 @@
                <tr>
                    <td>{{$loop->iteration}}</td>
                    <td>{{ $data->tarikh_lelong }}</td>
-                    <td>{{ $data->sts_lelong }}</td>
+                    <td>
+                        @if($data->sts_lelong == 3)
+                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                        @endif
+                    </td>
                    <td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
                </tr>
                @endforeach
@@ -199,6 +199,7 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe
    Route::get('/SAGBidItem/{user_id}/{lelong_id}', ['as'=>'pembayaran.SAGBidItem','uses'=>'PaymentController@SAGBidItem']);
    Route::get('/SenaraiLelongBayar', ['as'=>'pembayaran.SenaraiLelongBayar','uses'=>'PaymentController@SenaraiLelongBayar']);
    Route::post('/paymentdenokaunter', ['as'=>'pembayaran.paymentdenokaunter','uses'=>'PaymentController@paymentdenokaunter']);
+    Route::post('/banktransfer', ['as'=>'pembayaran.banktransfer','uses'=>'PaymentController@banktransfer']);

 });
 // Pengurus Cawangan