diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
index 9cc22f7e..65f70a40 100644
--- a/app/Http/Controllers/ApiController.php
+++ b/app/Http/Controllers/ApiController.php
@@ -161,9 +161,9 @@ class ApiController extends Controller
Money::MYR($total_bayaran),
route('pay.callback'),
'Bayaran Borang',
- ['redirect_url' => 'http://192.168.0.10:8003/api/pembayaran/response']
+ ['redirect_url' => 'http://192.168.0.85:8003/api/pembayaran/response']
);
-
+ // dd($response);
$previous_siri = Resit::orderBy('id','desc')->first();
if($previous_siri){
$nosiri = $previous_siri->id + 1;
@@ -218,7 +218,7 @@ class ApiController extends Controller
}
public function callback(Request $request){
- dd('hye');
+ // dd('hye');
$http = new HttpMethodsClient(
new GuzzleHttpClient(),
new GuzzleMessageFactory()
@@ -261,7 +261,7 @@ class ApiController extends Controller
}
public function response(Request $request){
- // dd($request->all());
+ // dd('hye');
$http = new HttpMethodsClient(
new GuzzleHttpClient(),
new GuzzleMessageFactory()
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index f65ef22b..7e9158f1 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -92,7 +92,7 @@ class LelongController extends Controller
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
- $databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->get();
+ $databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
$packet = 0;
$berat = 0;
@@ -173,6 +173,7 @@ class LelongController extends Controller
}
array_push($arraycaw,[
+ 'id_cawangan'=> $cawangan->id,
'cawangan'=>$cawangan->caw_name,
't_lelong'=>$lelong->tarikh_lelong,
'bil_marhun'=>sizeof($databid),
@@ -433,39 +434,85 @@ class LelongController extends Controller
->with('success','Kemaskini Berjaya');
}
- public function janapemenang(Request $request){
+ public function janapemenang($id){
- $currentdate = Carbon::now();
- $currentdate = $currentdate->toDateString();
+ $lelong = Lelong::where('id','=',$id)->first();
+ $lelongbid = LelongBid::where('lelong_id','=',$id)->get();
+ foreach($lelongbid as $bid)
+ {
+ $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )->get();
+ if($bidders)
+ {
+ $count = 0;
+ foreach($bidders as $bidder)
+ {
+ $count = $count + 1;
+ if($count == 1)
+ {
+ $pemenang = LelongBidder::where('lelongbid_id','=',$bidder->lelongbid_id)
+ ->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
+ ->first();
+ $pemenang->status_bidder = 1;
+ $pemenang->save();
- $lelongbidder = LelongBidder::join('users', 'lelongbidder.user_id', '=', 'users.id')
- ->select(
- 'users.name',
- 'users.nokp',
- 'users.notelbimbit',
- 'lelongbidder.lelongbid_id',
- 'lelongbidder.masa_bidaan',
- 'lelongbidder.hargabida',
- 'lelongbidder.status_bidder'
- )
- ->where('lelongbid_id', '=', $request->id)
- ->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
- ->first();
+ $updatebid = LelongBid::where('id','=',$bid->id)->first();
+ $updatebid->hargajual = $bidder->hargabida;
+ $updatebid->nopembeli = $bidder->user_id;
+ $updatebid->status_jual = 1;
+ $updatebid->save();
+ }
+ else
+ {
+ $kalah = LelongBidder::where('lelongbid_id','=',$bidder->lelongbid_id)
+ ->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
+ ->first();
+ $kalah->status_bidder = 1;
+ $kalah->save();
+ }
+ }
+
+ }
+ else
+ { //xlaku
- // update table lelongbid status_jual = 1, t_jual current
- $updatelelong = LelongBidder::where('status_bidder', '=', $lelongbidder['status_bidder'])
- ->where('hargabida', '=', $lelongbidder['hargabida'])
- ->where('masa_bidaan', '=', $lelongbidder['masa_bidaan'])
- ->update(array('status_bidder' => 1));
+ }
+ }
+ $lelong->sts_lelong = 3; //siap jana pemenang
+ $lelong->save();
+ // $currentdate = Carbon::now();
+ // $currentdate = $currentdate->toDateString();
+
+ // $lelongbidder = LelongBidder::join('users', 'lelongbidder.user_id', '=', 'users.id')
+ // ->select(
+ // 'users.name',
+ // 'users.nokp',
+ // 'users.notelbimbit',
+ // 'lelongbidder.lelongbid_id',
+ // 'lelongbidder.masa_bidaan',
+ // 'lelongbidder.hargabida',
+ // 'lelongbidder.status_bidder'
+ // )
+ // ->where('lelongbid_id', '=', $request->id)
+ // ->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
+ // ->first();
+
+ // // update table lelongbid status_jual = 1, t_jual current
+ // $updatelelong = LelongBidder::where('status_bidder', '=', $lelongbidder['status_bidder'])
+ // ->where('hargabida', '=', $lelongbidder['hargabida'])
+ // ->where('masa_bidaan', '=', $lelongbidder['masa_bidaan'])
+ // ->update(array('status_bidder' => 1));
- // update table lelongbid status_jual = 1, t_jual current
- // $updatelelong = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
- // ->update(array(
- // 'lelongbid.status_jual' => 1,
- // 'lelongbid.t_jual' => $currentdate
- // ));
+ // // update table lelongbid status_jual = 1, t_jual current
+ // // $updatelelong = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+ // // ->update(array(
+ // // 'lelongbid.status_jual' => 1,
+ // // 'lelongbid.t_jual' => $currentdate
+ // // ));
- return view('lelong.janapemenang',compact('lelongbidder'));
+ // return view('lelong.janapemenang',compact('lelongbidder'));
+
+ return redirect()->route('lelong.senarailelong')
+ ->with('success','Selesai menjana pemenang');
}
@@ -506,5 +553,42 @@ class LelongController extends Controller
return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
}
+
+ public function senaraimarhun($lelongid, $cawid){
+ // $marhun = LelongBid::->get();
+
+ $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+ ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
+ ->select(
+ 'lelongbid.t_lelong',
+ 'lelongbid.kodcaw',
+ 'cawangan.caw_name',
+ 'lelongbid.norujukan',
+ 'lelongbid.pinjaman',
+ 'lelongbid.berat',
+ 'lelongbid.nilaimarhun',
+ 'lelongbid.hargaasas',
+ 'lelongbid.upahsimpan',
+ 'lelongbid.cajlelong',
+ 'lelongbid.baki',
+ 'lelongbid.status_jual',
+ )
+ ->get();
+
+ return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid'));
+ }
+
+ public function deletemarhun(Request $request){
+ dd($request->checkboxdata);
+ $data = $request->checkboxdata;
+ foreach($data as $index=>$norujukan)
+ {
+ $marhun = LelongBid::where('norujukan','=',$norujukan)->first();
+ $marhun->delete();
+ }
+
+ return redirect()->route('lelong.senaraimarhun',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid])
+ ->with('success','Delete Berjaya');
+ }
}
\ No newline at end of file
diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php
index 60fcc5a4..775bf72e 100644
--- a/database/migrations/2022_01_25_010223_create_payment_table.php
+++ b/database/migrations/2022_01_25_010223_create_payment_table.php
@@ -24,7 +24,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=online,2=kaunter
+ $table->integer('status_payment_opt')->nullable(); //1=kaunter,2=online
$table->integer('resit_id');
$table->integer('status'); //1 = fee RM10 , 2 = paybidifwin
$table->string('remark');
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 3c2abab5..9878ccd5 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -13,6 +13,7 @@
+
{{-- --}}
@@ -264,6 +265,8 @@
display: none;
}
}
+
+
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 2645bd1f..72a1cb10 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -38,26 +38,23 @@
@hasrole('jurulelong')
@if(!$lel->masatamat_lelong)
-
-
-
+
+
+
+
@elseif ($lel->sts_lelong == 2)
-
+
+ @elseif ($lel->sts_lelong == 3)
+
@else
-
+
@endif
-
@endhasrole
-
-
-
-
-
+
@endforeach
-
@@ -65,6 +62,10 @@
+@endsection
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 41118685..dfcfd4a8 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -76,7 +76,7 @@
@foreach ($arraycaw as $index=>$caw)
| {{$index+1}} |
- {{ $caw['cawangan'] }} |
+ {{ $caw['cawangan'] }} |
{{ $caw['t_lelong'] }} |
{{ $caw['bil_marhun'] }} |
{{ number_format($caw['berat'], 2, '.', ',') }} |
diff --git a/routes/web.php b/routes/web.php
index c0be7a4a..3e87cb59 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -82,9 +82,13 @@ Route::group(['prefix'=>'lelong'], function () {
Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']);
Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']);
- Route::get('/janapemenang', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
+ Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
Route::get('/kaunterpembayaran', ['as'=>'lelong.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']);
Route::get('/SAGBidItem', ['as'=>'lelong.SAGBidItem','uses'=>'PaymentController@SAGBidItem']);
+
+ Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']);
+ Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']);
+
});