From d6d61ab8a4cdd0b831c03f0bf372910e483ed09a Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 22 Feb 2022 12:49:31 +0800 Subject: [PATCH 1/6] update kaunter pembayaran add deno --- app/Http/Controllers/PaymentController.php | 85 +++-- ...2022_01_25_010223_create_payment_table.php | 13 +- resources/views/includes/sidebar.blade.php | 7 +- .../views/pembayaran/SAGBidItem.blade.php | 304 +++++++++++++++++- .../pembayaran/senarailelongbayaran.blade.php | 32 ++ routes/web.php | 4 +- 6 files changed, 418 insertions(+), 27 deletions(-) create mode 100644 resources/views/pembayaran/senarailelongbayaran.blade.php diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index e77aa326..87f2ed38 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use App\Models\Lelong; use App\Models\LelongBid; use App\Models\LelongBidder; use App\Models\LelongBidMarhun; @@ -10,9 +11,18 @@ use App\Models\User; class PaymentController extends Controller { - public function SenaraiPemenang(Request $request){ + public function SenaraiLelongBayar(Request $request){ + + $senarai = Lelong::all(); + + // 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,7 +31,6 @@ class PaymentController extends Controller ->groupBy('lelongbidder.user_id') ->get()->toArray(); - // dd($listwinner); foreach($listwinner as $index1=>$winner){ @@ -31,24 +40,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 +58,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 +74,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 +84,57 @@ class PaymentController extends Controller return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid')); } + public function paymentdenokaunter(Request $request){ + //status_payment = 1 ->update deno into payment + dd($request->all()); + + $user = Auth::user(); + + $bid_id = explode(",", $request->eachbid); + // dd($bid_id); + 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(); + // dd($eachbid); + $payment = Payment::create([ + 'user_id' => $request->user_id, + 'lelongbidder_id' => $eachbid->lelongbidder_id, + 'lelongbid_id' => $bid, + 'kodcaw' => $user->kodcaw, + 'status_payment_opt' => 1, + 'status' => 'PAID', + 'remark' => 'BAYARAN DI KAUNTER', + '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, + ]); + + + } + // $payment = new Payment; + // $payment->ambilan + // + + } + public function pengesahanPembayaran(Request $request){ $pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') 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 775bf72e..8497ce96 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -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,18 @@ class CreatePaymentTable extends Migration $table->integer('resit_id'); $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin $table->string('remark'); + $table->integer('1sen'); + $table->integer('5sen'); + $table->integer('10sen'); + $table->integer('20sen'); + $table->integer('50sen'); + $table->integer('rm1'); + $table->integer('rm5'); + $table->integer('rm10'); + $table->integer('rm20'); + $table->integer('rm50'); + $table->integer('rm100'); + $table->decimal('total_payment', $precision = 11, $scale = 2); $table->timestamps(); $table->foreign('user_id') diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index a5a565c7..ba2aacf8 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -50,9 +50,6 @@ -
  • - Pembayaran Pemenang -
    • @endhasrole @hasrole('pengurus-cawangan') @@ -73,8 +70,8 @@ -
  • - Pengesahan Pembayaran +
  • + Pembayaran Pemenang
    • @endhasrole @hasrole('jurulelong') diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 1c93ec26..f0fe981b 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -36,7 +36,7 @@ {{ $biditem->norujukan}} {{ $biditem->hargaasas}} {{ $biditem->hargabida}} - + @endforeach @@ -46,24 +46,324 @@ +
    + +
    + + diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php new file mode 100644 index 00000000..9bd40667 --- /dev/null +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -0,0 +1,32 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + + + + + + + + + + + @foreach($senarai as $data) + + + + + + + @endforeach + +
    NoTarikh LelongStatus LelongAction
    {{$loop->iteration}}{{ $data->tarikh_lelong }}{{ $data->sts_lelong }}
    +
    +
    +
    + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 189e8707..41a562f1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -144,7 +144,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']); }); \ No newline at end of file From 5106b3de97bea582714e70a7f97e24e6b8689681 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 23 Feb 2022 09:22:00 +0800 Subject: [PATCH 2/6] update pembayaran di kaunter --- app/Http/Controllers/PaymentController.php | 27 +++++++++++++------ app/Models/payment.php | 17 ++++++++++-- ...2022_01_25_010223_create_payment_table.php | 24 +++++++++-------- database/seeders/RolesSeeder.php | 17 ++++++------ .../views/pembayaran/SAGBidItem.blade.php | 9 ++++++- 5 files changed, 64 insertions(+), 30 deletions(-) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 87f2ed38..b76dfd01 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -7,7 +7,10 @@ use App\Models\Lelong; 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 { @@ -85,13 +88,15 @@ class PaymentController extends Controller } public function paymentdenokaunter(Request $request){ - //status_payment = 1 ->update deno into payment - dd($request->all()); + // dd($request->all()); + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateString(); $user = Auth::user(); $bid_id = explode(",", $request->eachbid); - // dd($bid_id); + foreach($bid_id as $bid){ $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') @@ -104,15 +109,16 @@ class PaymentController extends Controller 'lelongbidder.id as lelongbidder_id' ) ->first(); - // dd($eachbid); + $payment = Payment::create([ 'user_id' => $request->user_id, 'lelongbidder_id' => $eachbid->lelongbidder_id, 'lelongbid_id' => $bid, 'kodcaw' => $user->kodcaw, 'status_payment_opt' => 1, - 'status' => 'PAID', + 'status' => 2, 'remark' => 'BAYARAN DI KAUNTER', + 'resit_id' => 1, 'total_payment' => $request->amaunkiraan, '1sen' => $request->ambilansen1, '5sen' => $request->ambilansen5, @@ -125,14 +131,19 @@ class PaymentController extends Controller '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 + )); } - // $payment = new Payment; - // $payment->ambilan - // + return redirect()->route('pembayaran.SenaraiLelongBayar'); } public function pengesahanPembayaran(Request $request){ diff --git a/app/Models/payment.php b/app/Models/payment.php index c15ecd7a..08a23d51 100644 --- a/app/Models/payment.php +++ b/app/Models/payment.php @@ -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' ]; } 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 8497ce96..2808a919 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -27,18 +27,20 @@ class CreatePaymentTable extends Migration $table->integer('resit_id'); $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin $table->string('remark'); - $table->integer('1sen'); - $table->integer('5sen'); - $table->integer('10sen'); - $table->integer('20sen'); - $table->integer('50sen'); - $table->integer('rm1'); - $table->integer('rm5'); - $table->integer('rm10'); - $table->integer('rm20'); - $table->integer('rm50'); - $table->integer('rm100'); + $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') diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 87354b7c..925d8758 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -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,8 @@ 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)' ]); //jurulelong @@ -132,12 +132,13 @@ 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'); + $role5 = Role::create(['name' => 'jurulelong']); $role5->givePermissionTo('pendaftaranbatch'); diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index f0fe981b..00956dd2 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -158,12 +158,19 @@
    - +
    + + @endsection \ No newline at end of file diff --git a/resources/views/pembida/show.blade.php b/resources/views/pembida/show.blade.php index 9f602658..3ea15637 100644 --- a/resources/views/pembida/show.blade.php +++ b/resources/views/pembida/show.blade.php @@ -49,14 +49,54 @@ Kembali + - {{-- --}} + + + @endsection diff --git a/routes/web.php b/routes/web.php index 41a562f1..73d3a65c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -133,6 +133,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 () { From b3f003730203479ba4e7db7ceb7cec3bf1ff95e5 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 23 Feb 2022 16:32:54 +0800 Subject: [PATCH 4/6] update kaunter pembayaran --- app/Http/Controllers/LelongController.php | 60 +++++++++-------- app/Http/Controllers/PaymentController.php | 42 ++++++++++-- .../views/pembayaran/SAGBidItem.blade.php | 8 +-- .../pembayaran/kaunterpembayaran.blade.php | 64 ++++++++++++++++++- 4 files changed, 136 insertions(+), 38 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 7e9158f1..1e88947a 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -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(); + } } } @@ -550,6 +551,15 @@ class LelongController extends Controller 'lelongbid.status_jual', ) ->get(); + + foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ + + $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') + ->whereNull('t_jual') + ->get(); + + $lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku); + } return view('lelong.lelongtaklaku',compact('lelongtaklaku')); } diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index b76dfd01..bd2a93f9 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -4,6 +4,9 @@ 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; @@ -16,7 +19,12 @@ class PaymentController extends Controller { public function SenaraiLelongBayar(Request $request){ - $senarai = Lelong::all(); + $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); @@ -34,7 +42,6 @@ class PaymentController extends Controller ->groupBy('lelongbidder.user_id') ->get()->toArray(); - foreach($listwinner as $index1=>$winner){ $userdetails = User::where('id', $winner['user_id'])->first(); @@ -93,6 +100,13 @@ class PaymentController extends Controller $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); @@ -110,6 +124,26 @@ class PaymentController extends Controller ) ->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, @@ -118,7 +152,7 @@ class PaymentController extends Controller 'status_payment_opt' => 1, 'status' => 2, 'remark' => 'BAYARAN DI KAUNTER', - 'resit_id' => 1, + 'resit_id' => $resit->id, 'total_payment' => $request->amaunkiraan, '1sen' => $request->ambilansen1, '5sen' => $request->ambilansen5, @@ -143,7 +177,7 @@ class PaymentController extends Controller } - return redirect()->route('pembayaran.SenaraiLelongBayar'); + return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya'); } public function pengesahanPembayaran(Request $request){ diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 00956dd2..84a05a5e 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -164,13 +164,7 @@ - + + +@endsection + From 9e987e28026991fc29580cd7fb7f79986d6e4510 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Feb 2022 09:29:04 +0800 Subject: [PATCH 5/6] update senarai lelong tak laku --- app/Http/Controllers/LelongController.php | 18 +++- resources/views/includes/sidebar.blade.php | 4 +- .../lelong/senarailelongtaklaku.blade.php | 94 +++++++++++++++++++ routes/web.php | 3 +- 4 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 resources/views/lelong/senarailelongtaklaku.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1e88947a..eda9ba9d 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -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; @@ -532,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', @@ -555,6 +568,7 @@ class LelongController extends Controller foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') + ->where('lelongbid.lelong_id', $lelong_id) ->whereNull('t_jual') ->get(); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index ba2aacf8..c7f3d5fe 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -102,8 +102,8 @@
  • Senarai Lelong
    • -
  • - Senarai Lelong Tak Laku +
  • + Senarai Lelong Tak Laku
    • diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php new file mode 100644 index 00000000..2e68ffba --- /dev/null +++ b/resources/views/lelong/senarailelongtaklaku.blade.php @@ -0,0 +1,94 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + @foreach($senarai as $data) + + + + + + + + + + @endforeach + +
    Tarikh LelongMasa Tamat LelongHarga Emas AsasJBGCaj LelongAction
    {{ $data->tarikh_lelong }}{{ $data->masatamat_lelong }}{{ $data->harga_emas_asas }}{{ $data->jbg }}{{ $data->cajlelong }}
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 73d3a65c..1d0c7647 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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']); From 05a78c8a5e4275a80a65f02d18ef6a847d934fd7 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Feb 2022 09:29:20 +0800 Subject: [PATCH 6/6] add senarai lelong tak laku --- .../views/lelong/lelongtaklaku.blade.php | 80 +++++++++++++++++-- 1 file changed, 74 insertions(+), 6 deletions(-) diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index 2ad30f6d..82d12758 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -5,7 +5,6 @@
    - @if ($message = Session::get('success'))

    {{ $message }}

    @@ -13,9 +12,10 @@ @endif
    - +
    + @@ -30,30 +30,45 @@ + @foreach ($lelongtaklaku as $leltaklaku) + - + - - - + baki, '-') !== false) + { + $rugi = $leltaklaku->baki; + } + else { + $baki = $leltaklaku->baki; + } + ?> + + @if($leltaklaku->status_jual == 0) @endif + @endforeach @@ -66,4 +81,57 @@ + @endsection
    No Tarikh Lelong Kod Cawangan Nama CawanganBaki Lelong (RM) Status Lelong (RM) Status Laporan Lelong (RM)Action
    {{ $loop->iteration }} {{ $leltaklaku->t_lelong }} {{ $leltaklaku->kodcaw }} {{ $leltaklaku->caw_name }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }} {{ $leltaklaku->berat }} {{ $leltaklaku->nilaimarhun }} {{ $leltaklaku->hargaasas }} {{ $leltaklaku->upahsimpan }} {{ $leltaklaku->cajlelong }}{{ $leltaklaku->baki }}{{$rugi}}{{$baki}}TIDAK LAKU + +