Merge branch 'atie' into 'main'

update payment

See merge request online-sistem1/lelong!230
This commit is contained in:
Nur Izzati Zulkifli
2022-10-16 02:29:56 +00:00
2 changed files with 10 additions and 53 deletions
+9 -53
View File
@@ -223,33 +223,20 @@ class PaymentController extends Controller
$year = $current->format('y');
$user = Auth::user();
$total_hargabida = 0;
// $bid_id = implode(",", $request->eachbid);
// $bid_id = $request->eachbid;
$bidid = implode(",", $request->eachbid);
$bid_id = explode(",", $bidid);
$norujukanid = implode(",", $request->norujukan);
$norujukan_id = explode(",", $norujukanid);
// dd($norujukan_id);
// $resit = Resit::where('lelong_id', $request->lelong_id)
// ->where('user_id',$request->user_id)
// ->where('resit_type', 2)
// ->first();
$getinvoice = Invoice::where('lelong_id',$request->lelong_id)
->where('user_id','=',$request->user_id)
->first();
$previous_siri = Resit::orderBy('id','desc')->first();
$checkdata = Resit::where('user_id', $request->user_id)
->where('lelong_id', $request->lelong_id)
->where('resit_type', 2)
->first();
if(!$checkdata){
if($previous_siri){
$nosiri = $previous_siri->id + 1;
}else{
@@ -268,41 +255,16 @@ class PaymentController extends Controller
$resit->total_payment = $request->amaunkiraan;
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->save();
}
// dd($checkdata->id);
$total_hargabida = 0;
// $payment = Payment::create([
// 'user_id' => $request->user_id,
// 'lelong_id' => $request->lelong_id,
// 'kodcaw' => $user->kodcaw,
// 'norujukan' => $norujukan_id,
// 'status_payment_opt' => 1,
// 'status' => 2,
// 'remark' => 'TUNAI',
// 'resit_id' => $resit->id,
// 'total_payment' => $request->amaunkiraan,
// '1sen' => $request->ambilansen1,
// '5sen' => $request->ambilansen5,
// '10sen' => $request->ambilansen10,
// '20sen' => $request->ambilansen20,
// '50sen' => $request->ambilansen50,
// 'rm1' => $request->ambilanring1,
// 'rm5' => $request->ambilanring5,
// 'rm10' => $request->ambilanring10,
// 'rm20' => $request->ambilanring20,
// 'rm50' => $request->ambilanring50,
// 'rm100' => $request->ambilanring100,
// 'disahkan_oleh' => $user->id,
// 'disahkan_pada' => $currentdate
// ]);
foreach($bid_id as $bid)
foreach($bid_id as $index1=>$bid)
{
// dd($norujukan_id[$index1]);
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.lelongbid_id', $bid)
->where('lelongbidder.user_id', $request->user_id)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
@@ -311,25 +273,19 @@ class PaymentController extends Controller
'lelongbid.lelong_id as lelong_id'
)
->first();
// dd($eachbid);
$total_hargabida = $total_hargabida + $eachbid->hargabida;
// $resit = Resit::where('lelong_id', $request->lelong_id)
// ->where('user_id',$request->user_id)
// ->where('resit_type', 2)
// ->first();
// dd($resit->id);
$payment = Payment::create([
'user_id' => $request->user_id,
'lelong_id' => $request->lelong_id,
'kodcaw' => $user->kodcaw,
'norujukan' => $norujukanid,
'norujukan' => $norujukan_id[$index1],
'status_payment_opt' => 1,
'status' => 2,
'remark' => 'TUNAI',
'resit_id' => $resit->id,
'total_payment' => $request->amaunkiraan,
'total_payment' => $eachbid->hargabida,
'1sen' => $request->ambilansen1,
'5sen' => $request->ambilansen5,
'10sen' => $request->ambilansen10,
+1
View File
@@ -17,6 +17,7 @@ class Payment extends Model
'lelongbid_id',
'lelong_id',
'kodcaw',
'norujukan',
'back_acc_pembeli',
'bank_acc_no_pembeli',
'nama_bank_acc_caw',