KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Azfar Arsyad
2022-02-21 14:27:48 +08:00
parent 3849a8bf06
commit 754d502455
8 changed files with 309 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ApiController.php
+4 -4
View File
@@ -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()
app/Http/Controllers/LelongController.php
+113 -29
View File
@@ -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');
}
}
database/migrations/2022_01_25_010223_create_payment_table.php
+1 -1
View File
@@ -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');
resources/views/layouts/app.blade.php
+3
View File
@@ -13,6 +13,7 @@
<script src="{{ asset('js/app.js') }}" ></script>
<script src="{{ asset('js/jquery-confirm.min.js') }}" ></script>
<script src="{{ asset('js/dataTables.buttons.min.js') }}" ></script>
{{-- <script src="{{ asset('js/dataTables.select.min.js') }}" ></script> --}}
<!-- Fonts -->
@@ -264,6 +265,8 @@
display: none;
}
}
</style>
</head>
resources/views/lelong/senarailelong.blade.php
+13 -12
View File
@@ -38,26 +38,23 @@
@hasrole('jurulelong')
@if(!$lel->masatamat_lelong)
<a href="{{ route('lelong.refresh',$lel->id) }}"><i class="fas fa-sync-alt"></i></a>
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}"><i class="fa fa-play"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}"><i class="far fa-trash-alt"></i></a>
<a href="{{ route('lelong.refresh',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data"><i class="fas fa-sync-alt"></i></a>
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Start Lelong"><i class="fa fa-play"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Delete"><i class="far fa-trash-alt"></i></a>
<a href="{{ route('lelong.show',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Show"><i class="far fa-edit"></i></a>
@elseif ($lel->sts_lelong == 2)
<a href="{{ route('lelong.janapemenang',$lel->id) }}"><i class="fas fa-trophy"></i></a>
<a href="{{ route('lelong.janapemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
@elseif ($lel->sts_lelong == 3)
<a href="{{ route('lelong.janapemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
@else
<a class="stoplelong" href="{{ route('lelong.stop',$lel->id) }}"><i class="fa fa-stop"></i></a>
<a class="stoplelong" href="{{ route('lelong.stop',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
@endif
<a href="{{ route('lelong.show',$lel->id) }}"><i class="far fa-edit"></i></a>
@endhasrole
<a href="{{ route('lelong.exportnotis',$lel->id) }}"><i class="fas fa-download"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
@@ -65,6 +62,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
resources/views/lelong/senaraimarhun.blade.php
+169
View File
@@ -0,0 +1,169 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="deletesag" action="{{route('lelong.deletemarhun')}}" method="POST">
@csrf
<input type="hidden" name="lelongid" value="{{$lelongid}}">
<input type="hidden" name="cawid" value="{{$cawid}}">
<table class="table table-striped table-xl" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No.</th>
<th>Tarikh Lelong</th>
<th>Kod Cawangan</th>
<th>Nama Cawangan</th>
<th>Norujukan</th>
<th>Pinjaman (RM)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Upah Simpan (RM)</th>
<th>Caj Lelong (%)</th>
<th>Rugi Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Action</th>
</tr>
</thead>
<tbody>
@foreach ($marhuns as $index=> $marhun)
<tr>
<td>{{$index+1}}</td>
<td>{{ $marhun->t_lelong }}</td>
<td class="text-center">{{ $marhun->kodcaw }}</td>
<td>{{ $marhun->caw_name }}</td>
<td>{{ $marhun->norujukan}}</td>
<td>{{ $marhun->pinjaman }}</td>
<td>{{ $marhun->berat }}</td>
<td>{{ $marhun->nilaimarhun }}</td>
<td>{{ $marhun->hargaasas }}</td>
<td>{{ $marhun->upahsimpan }}</td>
<td>{{ $marhun->cajlelong }}</td>
<?php
$rugi = '';
$baki = '';
if(strpos($marhun->baki, '-') !== false)
{
$rugi = $marhun->baki;
}
else {
$baki = $marhun->baki;
}
?>
<td>{{$rugi}}</td>
<td>{{$baki}}</td>
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun->norujukan }}">
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="text-right pt-4">
<a href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Delete</button>
</div>
{{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
</form>
</div>
</div>
</div>
<script>
$("#btndelete").prop("disabled", true);
function btnDelete(e) {
var count = 0;
tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
if($(this).prop('checked') === true)
{
count = count + 1;
}
// $(this).prop('checked', e.checked);
})
if(count != 0)
{
$("#btndelete").prop("disabled", false);
}
else
{
$("#btndelete").prop("disabled", true);
}
// let checkbox = $('#checkboxdata').val();
// console.log(checkbox)
// $("#btndelete").prop("disabled", checkboxdata.length === 0);
}
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'red',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-danger',
action: function () {
$("#deletesag").submit();
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
}
var tablemarhun = $('#marhun').DataTable( {
"columnDefs": [
{
"targets": 13,
"orderable": false
},
// {
// "targets": 4,
// "orderable": false
// }
],
// order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 25,
dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm adduser',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Pengguna',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
</script>
@endsection
resources/views/lelong/showlelong.blade.php
+1 -1
View File
@@ -76,7 +76,7 @@
@foreach ($arraycaw as $index=>$caw)
<tr>
<td>{{$index+1}}</td>
<td>{{ $caw['cawangan'] }}</td>
<td><a href=" {{ route('lelong.senaraimarhun',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
<td>{{ $caw['t_lelong'] }}</td>
<td>{{ $caw['bil_marhun'] }}</td>
<td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
routes/web.php
+5 -1
View File
@@ -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']);
});