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

Merge branch 'faiqahzaman'

Browse Source
This commit is contained in:
Azfar Arsyad
2022-02-24 09:32:51 +08:00
parent cab6deaacb 05a78c8a5e
commit c4e7695040
15 changed files with 924 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AuthMobile/AuthController.php
+6
View File
@@ -96,6 +96,12 @@ class AuthController extends Controller
'message' => 'User Banned'
], 401);
}
else if($user->status == 'rejected')
{
return response([
'message' => 'Permohonan Ditolak'
], 401);
}
else
{
return response([
app/Http/Controllers/LelongController.php
+51 -27
View File
@@ -6,8 +6,8 @@ use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use Illuminate\Support\Facades\Auth;
use App\Models\User;
use PDF;
use App\Models\User;
use App\Models\Cawangan;
use App\Models\JenisEmas;
use App\Models\JenisKarat;
@@ -440,34 +440,35 @@ class LelongController extends Controller
$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)
$highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderByRaw('lelongbidder.hargabida DESC' )->get();
if($highestprice)
{
$count = 0;
foreach($bidders as $bidder)
{
$count = $count + 1;
if($count == 1)
foreach($highestprice as $price){
$bidders = LelongBidder::where('hargabida','=',$price->hargabida)->MIN('lelongbidder.masa_bidaan' )->get();
$count = 0;
foreach($bidders as $bidder)
{
$pemenang = LelongBidder::where('lelongbid_id','=',$bidder->lelongbid_id)
->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
->first();
$pemenang->status_bidder = 1;
$pemenang->save();
$count = $count + 1;
if($count == 1)
{
$pemenang = LelongBidder::where('id','=',$bidder->id)
->first();
$pemenang->status_bidder = 1;
$pemenang->save();
$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();
$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('id','=',$bidder->id)
->first();
$kalah->status_bidder = 0;
$kalah->save();
}
}
}
@@ -531,10 +532,23 @@ class LelongController extends Controller
}
public function lelongtaklaku(Request $request){
public function senarailelongtaklaku(Request $request){
$user = Auth::user();
$senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->get();
return view('lelong.senarailelongtaklaku',compact('senarai'));
}
public function lelongtaklaku($lelong_id){
$lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('status_jual', 0)
->where('lelongbid.lelong_id', $lelong_id)
->whereNull('t_jual')
->select(
'lelongbid.t_lelong',
@@ -550,6 +564,16 @@ class LelongController extends Controller
'lelongbid.status_jual',
)
->get();
foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){
$suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
->where('lelongbid.lelong_id', $lelong_id)
->whereNull('t_jual')
->get();
$lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku);
}
return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
}
app/Http/Controllers/PaymentController.php
+113 -19
View File
@@ -3,16 +3,37 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\Cawangan;
use App\Models\Resit;
use App\Models\LelongBid;
use App\Models\LelongBidder;
use App\Models\LelongBidMarhun;
use App\Models\Payment;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Support\Facades\Auth;
class PaymentController extends Controller
{
public function SenaraiPemenang(Request $request){
public function SenaraiLelongBayar(Request $request){
$user = Auth::user();
$senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->get();
// dd($senarai);
return view('pembayaran.senarailelongbayaran',compact('senarai'));
}
public function SenaraiPemenang($lelong_id){
$lelong_id = 1;
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
@@ -21,8 +42,6 @@ class PaymentController extends Controller
->groupBy('lelongbidder.user_id')
->get()->toArray();
// dd($listwinner);
foreach($listwinner as $index1=>$winner){
$userdetails = User::where('id', $winner['user_id'])->first();
@@ -31,24 +50,10 @@ class PaymentController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// $totalBid = 0;
// foreach($SAGWin as $SAG){
// $totalBid = $totalBid + $SAG->hargabida;
// }
$listwinner[$index1]['details'] = $userdetails;
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
$listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
// $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
// ->join('users', 'lelongbidder.user_id', '=', 'users.id')
// ->where('lelongbidder.status_bidder', 1)
// ->where('lelongbid.lelong_id', $lelongId)
// ->get();
// $totalBid = LelongBidder::where('status_bidder', 1)->sum('hargabida');
}
return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id'));
@@ -63,6 +68,7 @@ class PaymentController extends Controller
->where('users.id', $user_id)
->where('lelongbid.lelong_id', $lelong_id)
->select(
'users.id',
'users.name',
'users.nokp',
'users.alamat'
@@ -78,7 +84,9 @@ class PaymentController extends Controller
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan')
'lelongbid.norujukan',
'lelongbidder.lelongbid_id'
)
->get();
}
@@ -86,6 +94,92 @@ class PaymentController extends Controller
return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid'));
}
public function paymentdenokaunter(Request $request){
// dd($request->all());
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateString();
$current = Carbon::now();
$current = new Carbon();
$day = $current->day;
$month = $current->month;
$year = $current->format('y');
$user = Auth::user();
$bid_id = explode(",", $request->eachbid);
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'
)
->first();
$previous_siri = Resit::orderBy('id','desc')->first();
if($previous_siri){
$nosiri = $previous_siri->id + 1;
}else{
$nosiri = 1;
}
$reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
$resit = new Resit;
$resit->user_id = $request->user_id;
$resit->lelongbid_id = $bid;
$resit->reference_no = $reference_no;
$resit->billplz_id = '';
$resit->total_payment = $request->amaunkiraan;
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->status = 'PAID';
$resit->paid_at = $currentdate;
$resit->save();
$payment = Payment::create([
'user_id' => $request->user_id,
'lelongbidder_id' => $eachbid->lelongbidder_id,
'lelongbid_id' => $bid,
'kodcaw' => $user->kodcaw,
'status_payment_opt' => 1,
'status' => 2,
'remark' => 'BAYARAN DI KAUNTER',
'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
]);
$updatelelbidbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->update(array(
'lelongbid.status_jual' => 1,
'lelongbid.t_jual' => $currentdate
));
}
return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}
public function pengesahanPembayaran(Request $request){
$pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
app/Http/Controllers/PembidaController.php
+18
View File
@@ -34,6 +34,7 @@ class PembidaController extends Controller
// $alluser = User::all();
$alluser = User::doesntHave('roles')
->where('user_type','=',2)
->where('status', '!=', 'rejected')
->get();
// dd($alluser);
@@ -92,6 +93,23 @@ class PembidaController extends Controller
->with('success','Pengesahan Berjaya');
}
public function reject(Request $request)
{
// dd($request->all());
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateString();
$user = User::where('id','=',$request->user_id)->first();
$user->disahkan_pada = $currentdate;
$user->disahkan_oleh = Auth::user()->id;
$user->note = $request->note;
$user->status = 'rejected';
$user->save();
return redirect()->route('pembida.senaraipembida')
->with('unsuccessful','Pengesahan Ditolak');
}
}
app/Models/payment.php
+15 -2
View File
@@ -16,7 +16,6 @@ class payment extends Model
'lelongbidder_id',
'lelongbid_id',
'kodcaw',
'total_payment',
'back_acc_pembeli',
'bank_acc_no_pembeli',
'nama_bank_acc_caw',
@@ -24,6 +23,20 @@ class payment extends Model
'status_payment_opt',
'resit_id',
'status',
'remark'
'remark',
'1sen',
'5sen',
'10sen',
'20sen',
'50sen',
'rm1',
'rm5',
'rm10',
'rm20',
'rm50',
'rm100',
'total_payment',
'disahkan_pada',
'disahkan_oleh'
];
}
database/migrations/2022_01_25_010223_create_payment_table.php
+14 -1
View File
@@ -19,7 +19,6 @@ class CreatePaymentTable extends Migration
$table->unsignedBigInteger('lelongbidder_id')->unsigned()->nullable();
$table->unsignedBigInteger('lelongbid_id')->unsigned();
$table->string('kodcaw')->nullable();
$table->decimal('total_payment')->nullable();
$table->string('back_acc_pembeli')->nullable();
$table->string('bank_acc_no_pembeli')->nullable();
$table->string('nama_bank_acc_caw')->nullable();
@@ -28,6 +27,20 @@ class CreatePaymentTable extends Migration
$table->integer('resit_id');
$table->integer('status'); //1 = fee RM10 , 2 = paybidifwin
$table->string('remark');
$table->integer('1sen')->nullable();
$table->integer('5sen')->nullable();
$table->integer('10sen')->nullable();
$table->integer('20sen')->nullable();
$table->integer('50sen')->nullable();
$table->integer('rm1')->nullable();
$table->integer('rm5')->nullable();
$table->integer('rm10')->nullable();
$table->integer('rm20')->nullable();
$table->integer('rm50')->nullable();
$table->integer('rm100')->nullable();
$table->decimal('total_payment', $precision = 11, $scale = 2);
$table->datetime('disahkan_pada')->nullable();
$table->integer('disahkan_oleh')->nullable();
$table->timestamps();
$table->foreign('user_id')
database/seeders/RolesSeeder.php
+14 -8
View File
@@ -49,10 +49,10 @@ class RolesSeeder extends Seeder
]);
//teller
Permission::create([
'name' => 'pengesahanbayarancash',
'description' => 'Pengesahan bayaran pembida di cawangan (cash)'
]);
// Permission::create([
// 'name' => 'pengesahanbayarancash',
// 'description' => 'Pengesahan bayaran pembida di cawangan (cash)'
// ]);
//pengurus cawangan
Permission::create([
@@ -64,8 +64,12 @@ class RolesSeeder extends Seeder
'description' => 'Jana Notis Lelong'
]);
Permission::create([
'name' => 'pengesahanpembayaranpc',
'description' => 'Pengesahan Pembayaran Bagi PC'
'name' => 'pengesahanbayarancash',
'description' => 'Pengesahan bayaran pembida di cawangan (cash)'
]);
Permission::create([
'name' => 'serahan',
'description' => 'Penyerahan Marhun Kepada Pembida Yang Menang'
]);
//jurulelong
@@ -132,12 +136,14 @@ class RolesSeeder extends Seeder
$role2->givePermissionTo('kemaskinimarhun');
$role3 = Role::create(['name' => 'teller']);
$role3->givePermissionTo('pengesahanbayarancash');
// $role3->givePermissionTo('pengesahanbayarancash');
$role4 = Role::create(['name' => 'pengurus-cawangan']);
$role4->givePermissionTo('pendaftaranpembida');
$role4->givePermissionTo('jananotis');
$role4->givePermissionTo('pengesahanpembayaranpc');
$role4->givePermissionTo('pengesahanbayarancash');
$role4->givePermissionTo('serahan');
$role5 = Role::create(['name' => 'jurulelong']);
$role5->givePermissionTo('pendaftaranbatch');
resources/views/includes/sidebar.blade.php
+4 -7
View File
@@ -50,9 +50,6 @@
<!-- <li class="{{ (request()->is('home')) ? 'active' : '' }}">
<a href="/home">Home</a>
</li> -->
<li class="{{ ( request()->is('pembayaran/kaunter/*')) ? 'active' : '' }}">
<a href="{{url('pembayaran/kaunterpembayaran')}}">Pembayaran Pemenang</a>
</li>
@endhasrole
@hasrole('pengurus-cawangan')
@@ -73,8 +70,8 @@
</li>
</ul>
</li>
<li class="{{ (request()->is('pengurus-cawangan/*')) ? 'active' : '' }}">
<a href="{{url('lelong/pengesahanPembayaran')}}">Pengesahan Pembayaran</a>
<li class="{{ ( request()->is('pembayaran/kaunter/*')) ? 'active' : '' }}">
<a href="{{url('pembayaran/SenaraiLelongBayar')}}">Pembayaran Pemenang</a>
</li>
@endhasrole
@hasrole('jurulelong')
@@ -105,8 +102,8 @@
<li class="{{ (request()->is('lelong/senarailelong/*') || request()->is('lelong/senarailelong') ) ? 'active' : '' }}">
<a href="{{url('lelong/senarailelong')}}">Senarai Lelong</a>
</li>
<li class="{{ (request()->is('lelong/lelongtaklaku/*') || request()->is('lelong/lelongtaklaku') ) ? 'active' : '' }}">
<a href="{{url('lelong/lelongtaklaku')}}">Senarai Lelong Tak Laku</a>
<li class="{{ (request()->is('lelong/senarailelongtaklaku/*') || request()->is('lelong/senarailelongtaklaku') ) ? 'active' : '' }}">
<a href="{{url('lelong/senarailelongtaklaku')}}">Senarai Lelong Tak Laku</a>
</li>
</ul>
</li>
resources/views/lelong/lelongtaklaku.blade.php
+74 -6
View File
@@ -5,7 +5,6 @@
<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>
@@ -13,9 +12,10 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="lelong" style="width:100%">
<table class="table table-striped table-xl text-center" id="lelongtaklaku" 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>
@@ -30,30 +30,45 @@
<th>Baki Lelong (RM)</th>
<th>Status Lelong (RM)</th>
<th>Status Laporan Lelong (RM)</th>
<th>Action</th>
</tr>
</thead>
<tbody>
@foreach ($lelongtaklaku as $leltaklaku)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $leltaklaku->t_lelong }}</td>
<td class="text-center">{{ $leltaklaku->kodcaw }}</td>
<td>{{ $leltaklaku->caw_name }}</td>
<td></td>
<td> {{ $leltaklaku['suratlelongtaklaku'] }} </td>
<td>{{ $leltaklaku->pinjaman }}</td>
<td>{{ $leltaklaku->berat }}</td>
<td>{{ $leltaklaku->nilaimarhun }}</td>
<td>{{ $leltaklaku->hargaasas }}</td>
<td>{{ $leltaklaku->upahsimpan }}</td>
<td>{{ $leltaklaku->cajlelong }}</td>
<td></td>
<td>{{ $leltaklaku->baki }}</td>
<?php
$rugi = '';
$baki = '';
if(strpos($leltaklaku->baki, '-') !== false)
{
$rugi = $leltaklaku->baki;
}
else {
$baki = $leltaklaku->baki;
}
?>
<td>{{$rugi}}</td>
<td>{{$baki}}</td>
@if($leltaklaku->status_jual == 0)
<td style = "color:red" ><b>TIDAK LAKU</b> </td>
@endif
<td class="text-center">
<a href=" # " target = "blank" ><i class="fas fa-download"></i></a>
</td>
<td>
<input type="checkbox" aria-label="Checkbox for following text input" >
</td>
</tr>
@endforeach
@@ -66,4 +81,57 @@
</div>
</div>
<script>
var tablelelongtaklaku = $('#lelongtaklaku').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 14,
"orderable": false
},
{
"targets": 15,
"orderable": false
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// 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();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
@endsection
resources/views/lelong/senarailelongtaklaku.blade.php
+94
View File
@@ -0,0 +1,94 @@
@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
<table class="table table-striped table-xl text-center" id="senarailelongtaklaku" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<th>Tarikh Lelong</th>
<th>Masa Tamat Lelong</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Caj Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($senarai as $data)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $data->lelong_id }}"></td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->masatamat_lelong }}</td>
<td>{{ $data->harga_emas_asas }}</td>
<td>{{ $data->jbg }}</td>
<td>{{ $data->cajlelong }}</td>
<td><a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['lelong_id']]) }} "><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
<script>
var tablesenarailelongtaklaku = $('#ssenarailelongtaklaku').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 3,
"orderable": false
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// 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();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
@endsection
resources/views/pembayaran/SAGBidItem.blade.php
+303 -2
View File
@@ -36,7 +36,7 @@
<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"><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}"></td>
<td class="text-center"><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 }}"></td>
</tr>
@endforeach
<tr>
@@ -46,24 +46,325 @@
</tr>
</tbody>
</table>
<div class="text-right">
<button type="button" class="btn btn-danger" style="width:15%" onclick="functerima()">Terima</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="denominasiHQModal" tabindex="-1" data-backdrop="static" data-keyboard="false" role="dialog" aria-labelledby="denominasiHQModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<form action="{{ route('pembayaran.paymentdenokaunter') }}" method="POST" id="formpaymentdenokaunter">
@csrf
<input type="hidden" name="user_id" value="{{ $SAGBidItem->id }}" />
<input type="hidden" name="eachbid" id="eachbid" value="" />
<div class="modal-content">
<div class="modal-header justify-content-center" style="text-align: center;">
<div class="d-flex justify-content-center">
<div class="col-2">
<ul class="nav nav-pills">
<li class="nav-item" style="margin-top: 21px;">
<!-- <a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Keping</a> -->
</li>
</ul>
</div>
<div class="col" style="margin: 11px;">
<label>Amaun Sebenar</label>
<input type="text" class="form-control" id="amaundiminta" placeholder="0.00" readonly>
</div>
<div class="col" style="margin: 11px;">
<label>Amaun Kiraan</label>
<input type="text" class="form-control" name="amaunkiraan" id="amaunkiraan" placeholder="0.00" readonly>
</div>
</div>
</div>
<div class="modal-body">
<div class="tab-content">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
<table class="table text-center">
<tr>
<th></th>
<th>Ambilan</th>
<th>Jumlah (RM)</th>
<th></th>
<th>Ambilan</th>
<th>Jumlah (RM)</th>
</tr>
<tr>
<td>RM0.01</td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly /> </td>
<td>RM1</td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly /> </td>
<td>RM5</td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly /> </td>
<td>RM10</td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.20</td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly /> </td>
<td> RM20</td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly /> </td>
<td>RM50</td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td td style="display:none;" name="denominasi" class="denominasi"></td>
<td>RM100 </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring100" id="totalring100" class="form-control" value="0.00" readonly /> </td>
</tr>
</table>
</div>
</div>
<!-- <input type="hidden" id="jenisjenis" /> -->
<!-- <input type="hidden" id="kodcawangan" /> -->
<!-- <input type="hidden" id="tellerla" /> -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" onclick="funcbatal()">Batal</button>
<button type="button" class="btn btn-success" data-toggle="modal" data-target=".bd-example-modal-sm" onclick="terimadeno()" >Terima</button>
</div>
</div>
</form>
</div>
</div>
<script>
var arraylelongbid = [];
function terimadeno() {
$('#eachbid').val(arraylelongbid);
$("#formpaymentdenokaunter").submit();
}
function funcbatal(){
$('#denominasiHQModal').modal('hide');
}
function functerima(){
$('#denominasiHQModal').modal('show');
var total_sum = parseFloat($('#total').val());
$('#amaundiminta').val(parseFloat(total_sum).toFixed(2));
}
function sum(val, e){ //e = get all data
let bid_id = $(e).data('bid_id');
console.log(bid_id);
if(e.checked==true) //checkbox
{
arraylelongbid.push(bid_id);
var total_sum = parseFloat($('#total').val());
total_sum = total_sum + parseFloat(val);
$('#total').val(parseFloat(total_sum).toFixed(2)); //get access to selected total and display total_sum with decimal of 2
}
else{
var index = arraylelongbid.findIndex(function(item) {return item == bid_id});
console.log(index);
arraylelongbid.splice(index, 1);
var total_sum = parseFloat($('#total').val());
total_sum = total_sum - parseFloat(val);
$('#total').val(parseFloat(total_sum).toFixed(2));
}
console.log(arraylelongbid);
}
function totalamount(idwang,bilangan)
{
var amount = 0;
switch (idwang) {
case 'bundle1':
amount += (bilangan * 100);
break;
case 'bundle20':
amount += (bilangan * 1000);
break;
case 'bundle5':
amount += (bilangan * 500);
break;
case 'bundle50':
amount += (bilangan * 5000);
break;
case 'bundle10':
amount += (bilangan * 1000);
break;
case 'bundle100':
amount += (bilangan * 5000);
break;
case 'sen1':
amount += (bilangan * 0.01);
break;
case 'sen5':
amount += (bilangan * 0.05);
break;
case 'sen10':
amount += (bilangan * 0.10);
break;
case 'sen20':
amount += (bilangan * 0.20);
break;
case 'sen50':
amount += (bilangan * 0.50);
break;
case 'ringgit1':
amount += (bilangan * 1);
break;
case 'ringgit5':
amount += (bilangan * 5);
break;
case 'ringgit10':
amount += (bilangan * 10);
break;
case 'ringgit20':
amount += (bilangan * 20);
break;
case 'ringgit50':
amount += (bilangan * 50);
break;
case 'ringgit100':
amount += (bilangan * 100);
break;
}
return amount;
}
var arrayambilan = [
["sen1",0],["sen5",0],["sen10",0],
["sen20",0],["sen50",0],["ringgit1",0],
["ringgit5",0],["ringgit10",0],["ringgit20",0],
["ringgit50",0],["ringgit100",0]
];
function kiraan(datakeyin)
{
var idkey = $(datakeyin).attr('id');
var valkey = $(datakeyin).val();
var amount = 0;
let amountkiraan = 0;
// var totalkiraan= parseFloat($('#amaunkiraan').val()).toFixed(2);
// var id = $('#jenisjenis').val();
var validate = parseFloat($('#amaundiminta').val());
$.each(arrayambilan, function( index, arr ){
if(arr[0] == idkey)
{
arrayambilan[index][1] = totalamount(idkey,valkey);
}
amount += arr[1];
});
// if(id === 'serahan')
// {
// var deno = $(datakeyin).data('deno');
// if(valkey > deno)
// {
// $.alert({
// title: 'Alert!',
// content: 'Simple alert!',
// });
// return false;
// }
// }
if(amount > validate)
{
$.alert({
title: 'Perhatian!',
content: 'Amaun Kiraan Melebihi Amaun Sebenar',
});
}
else
{
$('#amaunkiraan').val(amount);
}
switch(idkey) {
case 'sen1':
amountkiraan += (valkey * 0.01);
$('#totalsen1').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'sen5':
amountkiraan += (valkey * 0.05);
$('#totalsen5').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'sen10':
amountkiraan += (valkey * 0.10);
$('#totalsen10').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'sen20':
amountkiraan += (valkey * 0.20);
$('#totalsen20').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'sen50':
amountkiraan += (valkey * 0.50);
$('#totalsen50').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'ringgit1':
amountkiraan += (valkey * 1);
$('#totalring1').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'ringgit5':
amountkiraan += (valkey * 5);
$('#totalring5').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'ringgit10':
amountkiraan += (valkey * 10);
$('#totalring10').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'ringgit20':
amountkiraan += (valkey * 20);
$('#totalring20').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'ringgit50':
amountkiraan += (valkey * 50);
$('#totalring50').val(parseFloat(amountkiraan).toFixed(2));
break;
case 'ringgit100':
amountkiraan += (valkey * 100);
$('#totalring100').val(parseFloat(amountkiraan).toFixed(2));
break;
}
}
</script>
resources/views/pembayaran/kaunterpembayaran.blade.php
+62 -2
View File
@@ -5,7 +5,12 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<table class="table table-striped table-xl text-center" style="width:100%">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="tablekaunter" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -39,4 +44,59 @@
</div>
</div>
@endsection
<script>
var tablekaunter = $('#tablekaunter').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
},
{
"targets": 6,
"orderable": false
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// 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();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
@endsection
resources/views/pembayaran/senarailelongbayaran.blade.php
+88
View File
@@ -0,0 +1,88 @@
@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
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($senarai as $data)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->sts_lelong }}</td>
<td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['id']]) }} "><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
<script>
var tablesenarailelongonline = $('#senarailelongonline').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 3,
"orderable": false
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// 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();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
@endsection
resources/views/pembida/show.blade.php
+62 -2
View File
@@ -49,14 +49,54 @@
<input type="hidden" name="userid" value="{{$user->id}}">
<a href="{{url('pembida/senaraipembida')}}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-success" onclick="confirm()">Sah</button>
<button type="button" class="btn btn-danger" data-user_id="{{$user->id}}" onclick="reject(this)">Tolak</button>
</div>
</form>
{{-- <button class="btn btn-primary" onclick="confirm()">Simpan</button> --}}
</div>
</div>
<div class="modal fade" tabindex="-1" id="modaltolak">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">New Connection</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form action="{{ route('pembida.reject') }}" method="POST" id="formtolakpembida">
@csrf
<input type="hidden" name="user_id" id="user_id" value="" />
<div class="form-row">
<div class="form-group col-md-12">
<label for="caw_name">Nota</label>
<input type="text" class="form-control" name="nota" id="nota" >
</div>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
<button type="button" class="btn btn-primary" onclick="simpantolak()">Simpan</button>
</div>
</div>
</div>
</div>
</div>
<script>
function simpantolak() {
$('#modaltolak').modal('hide');
$("#formtolakpembida").submit();
}
function reject(e) {
var userid= $(e).data('user_id');
// console.log(userid);
$('#user_id').val(userid);
$('#modaltolak').modal('show');
}
function confirm() {
$.confirm({
title: 'Confirmation',
@@ -75,8 +115,28 @@
action: function () {}
}
}
});
});
}
// function reject() {
// $.reject({
// title: 'Confirmation',
// content: 'Anda pasti?',
// type: 'green',
// typeAnimated: true,
// buttons: {
// Sah: {
// btnClass: 'btn-success',
// action: function () {
// $("#formpengguna").submit();
// }
// },
// Batal: {
// btnClass: 'btn-default',
// action: function () {}
// }
// }
// });
// }
</script>
@endsection
routes/web.php
+6 -2
View File
@@ -77,7 +77,8 @@ Route::group(['prefix'=>'lelong'], function () {
Route::group(['middleware' => ['permission:pendaftaranbatch']], function () {
Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']);
Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']);
Route::get('/lelongtaklaku',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']);
Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']);
Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']);
Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']);
Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']);
Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']);
@@ -133,6 +134,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
Route::get('/pembida/{id}',['as'=>'pembida.show','uses'=>'PembidaController@show']);
Route::get('/deletepembida/{id}',['as'=>'pembida.delete','uses'=>'PembidaController@delete']);
Route::get('/sahkanpembida/{id}',['as'=>'pembida.sah','uses'=>'PembidaController@sah']);
Route::post('/reject',['as'=>'pembida.reject','uses'=>'PembidaController@reject']);
});
Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {
@@ -144,7 +146,9 @@ Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], funct
});
Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pembayaran'], function () {
Route::get('/kaunterpembayaran', ['as'=>'pembayaran.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']);
Route::get('/kaunterpembayaran/{lelong_id}', ['as'=>'pembayaran.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']);
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']);
});