diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 154430db..045eefc0 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -52,6 +52,7 @@ class MarhunController extends Controller
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
->where('caw_id','=', $caw->id)
->get();
+ // dd($lelongbid->toArray());
$sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak
->where('caw_id', $caw->id)
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index 470efb50..a7bed2f9 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -15,6 +15,7 @@ use App\Models\Cart;
use Carbon\Carbon;
use App\Models\Cawangan;
use App\Models\Resit;
+use Illuminate\Support\Facades\Auth;
class LelongMobileController extends Controller
{
@@ -274,6 +275,55 @@ class LelongMobileController extends Controller
// dd($winner);
return response()->json($data);
}
+
+ public function bidresults($user_id, $lelong_id)
+ {
+ $sag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+ ->where('lelongbid.lelong_id', $lelong_id)
+ ->where('lelongbidder.user_id',$user_id)
+ ->where('lelongbidder.status_bidder',1)
+ ->whereNull('lelongbidder.status_payment')
+ ->select(
+ 'lelongbid.kodcaw'
+ )
+ ->groupBy('lelongbid.kodcaw')
+ ->get();
+
+ $data = [];
+
+ foreach($sag as $index1=>$kodcaw)
+ {
+ // dd($kodcaw);
+ $groupBycaw = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+ ->where('lelongbid.lelong_id', $lelong_id)
+ ->where('lelongbidder.user_id',$user_id)
+ ->where('lelongbidder.status_bidder',1)
+ ->whereNull('lelongbidder.status_payment')
+ ->where('lelongbid.kodcaw', $kodcaw['kodcaw'])
+ ->get();
+
+ $sag[$index1]['kodcaw'] = $groupBycaw;
+
+ $total_hargabida = 0;
+ foreach($groupBycaw as $hargabida)
+ {
+ $totalbida = Lelongbidder::where('id', $hargabida['id'])
+ ->select('hargabida')
+ ->first();
+
+ $total_hargabida = $total_hargabida + $totalbida['hargabida'];
+ }
+
+ array_push($data,[
+ 'sag'=> $kodcaw,
+ 'total_hargabida'=> $total_hargabida
+ ]);
+
+ }
+
+ // dd($winner);
+ return response()->json($data);
+ }
public function updatebiditem(Request $request)
{
@@ -437,4 +487,120 @@ class LelongMobileController extends Controller
]);
}
}
+
+ public function bayarCdm(Request $request)
+ {
+ $validator = Validator::make($request->all(), [
+ 'lelong_id' => 'required|string',
+ 'lelongbid_id' => 'required|string|unique:users',
+ 'user_id' => 'required|string|unique:users'
+
+ ]);
+
+ if ($validator->fails()) {
+ $errors = [
+ 'success' => "error",
+ 'message' => $validator->errors()
+ ];
+ return response($errors, 201);
+ }
+
+ $paymentexist = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
+ ->where('payment.lelong_id', $request->lelong_id)
+ ->where('payment.user_id', $request->user_id)
+ ->first();
+
+ if($paymentexist)
+ {
+ $getpayment = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
+ ->where('payment.lelong_id', $request->lelong_id)
+ ->where('payment.user_id', $request->user_id)
+ ->select('payment.id as payment_id',
+ 'payment.lelong_id',
+ 'payment.user_id',
+ 'fileresit.id as fileresit_id',
+ 'fileresit.file_type',
+ 'fileresit.filename'
+ )
+ ->first();
+
+ $updatepayment = FileResit::where('payment_id', $getpayment['payment_id'])
+ ->where('id', $getpayment['fileresit_id'])
+ ->first();
+ $updatepayment->id;
+ $updatepayment->user_id = $request->user_id;
+ $updatepayment->payment_id = $updatepayment->payment_id;
+ $updatepayment->file_type = $request->file_type;
+ $updatepayment->filename = $request->filename;
+ $updatepayment->update();
+
+ return response($response, 201);
+ }
+ else
+ {
+ $currentdate = Carbon::now();
+ $currentdate = $currentdate->toDateTimeString();
+
+ $user = Auth::user();
+
+ // $imageName = time().'.'.$request->resit->extension();
+ $data = base64_encode($request->resit->get());
+ $file_type = $request->resit->extension();
+
+ $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 = $request->total_payment;
+ $payment->diminta_pada = $currentdate;
+ $payment->diminta_oleh = $user->id;
+ // $payment->save();
+
+ $addfile = new FileResit;
+ $addfile->user_id = $request->user_id;
+ $addfile->payment_id = $payment->id;
+ $addfile->file_type = $file_type;
+ $addfile->filename = $data;
+ // $addfile->save();
+
+ foreach($bid_id as $bid)
+ {
+ $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+ ->join('users', 'lelongbidder.user_id', '=', 'users.id')
+ ->where('lelongbidder.lelongbid_id', $bid)
+ ->select('lelongbidder.hargabida',
+ 'lelongbid.hargaasas',
+ 'lelongbid.norujukan',
+ 'lelongbidder.lelongbid_id',
+ 'lelongbidder.id as lelongbidder_id',
+ 'lelongbid.lelong_id as lelong_id'
+ )
+ ->first();
+
+ $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
+ ->where('user_id',$request->user_id)
+ ->first();
+ $updatelelbidbidder->status_payment = 2;
+ $updatelelbidbidder->payment_id = $payment->id;
+ // $updatelelbidbidder->save();
+
+ $eachbidupdate = LelongBid::where('id',$bid)->first();
+ $eachbidupdate->hargajual = $eachbid->hargabida;
+ // $eachbidupdate->save();
+
+ }
+
+ return response($response, 201);
+
+ }
+ }
}
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 465ac1b6..a4c88e34 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -174,8 +174,10 @@ class PaymentController extends Controller
$user = Auth::user();
// $bid_id = implode(",", $request->eachbid);
- $bid_id = $request->eachbid;
- // dd($bid_id);
+ // $bid_id = $request->eachbid;
+ $bidid = implode(",", $request->eachbid);
+ $bid_id = explode(",", $bidid);
+
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
@@ -276,7 +278,7 @@ class PaymentController extends Controller
{
// dd($request->all());
//eachbid = lelongbid_id
- $bid_id = implode(",", $request->eachbid);
+ // $bid_id = implode(",", $request->eachbid);
// dd($bid_id);
$paymentexist = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
@@ -316,7 +318,9 @@ class PaymentController extends Controller
}
else
{
- $bid_id = $request->eachbid;
+ // $bid_id = $request->eachbid;
+ $bidid = implode(",", $request->eachbid);
+ $bid_id = explode(",", $bidid);
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 0cb2997e..0021f2b2 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -835,7 +835,7 @@ class SimulasiController extends Controller
}
- return view('simulasi.senaraimarhunlel',compact('marhuns','simulasi_id','cawid','keuntungan','cal'));
+ return view('simulasi.senaraimarhunlel',compact('marhuns','simulasi_id','cawid','keuntungan'));
}
public function deletemarhunlel(Request $request){
diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index efd0a0c9..60ad2c88 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -172,6 +172,8 @@ class TangguhLelongController extends Controller
$lelbidmarhun = $request->checkboxdata;
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
+
+ $arraynorujukan = [];
foreach($lelbidmarhun as $bidmarhun)
{
@@ -240,9 +242,14 @@ class TangguhLelongController extends Controller
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->remark;
$tangguhlelong->save();
+
+ array_push($arraynorujukan,['norujukan'=>$tangguhlelong['norujukan']]);
+ // $norujukan = implode(",", $arraynorujukan);
}
- return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya');
+
+ return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya, Norujukan:')
+ ->with('norujukan', $arraynorujukan );
}
}
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index c0af3dd3..d4e77aea 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -22,12 +22,13 @@
-
+
+
| - | No. Rujukan | +Barang | Marhun | Karat | Berat | @@ -42,8 +43,7 @@ @foreach ($marhun as $item)
|---|---|---|---|---|---|
| - | {{ $lelongbid->norujukan }} | +{{ $loop->iteration }} | {{ $item->marhun }} |
@if($item->karat != null)
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index 4635075d..2e8276e5 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -11,20 +11,21 @@
@endif
-
-
-
+ Bilangan SAG {{ $caw['caw_name'] }} - Keseluruhan : {{ sizeof($lelongbid) }} -Belum Disemak : {{ sizeof($sag) }} -Dalam Proses : {{ sizeof($dalamproses) }} -Sudah Disemak : {{ sizeof($sdhdisemak) }} -Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }} -- Tangguh Lelong Oleh Pengurus Cawangan -Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }} -Dalam Proses : {{ sizeof($dalamprosestangguhlel) }} -Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkantangguhlel) }} -
+
+
+ Bilangan SAG : + Keseluruhan : {{ sizeof($lelongbid) }} +Belum Disemak : {{ sizeof($sag) }} +Dalam Proses : {{ sizeof($dalamproses) }} +Sudah Disemak : {{ sizeof($sdhdisemak) }} +Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }} +
+
Tangguh Lelong Oleh Pengurus Cawangan +Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }} +Dalam Proses : {{ sizeof($dalamprosestangguhlel) }} +Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkantangguhlel) }} + |