diff --git a/.gitignore b/.gitignore index eb003b01..f46f91d3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ npm-debug.log yarn-error.log /.idea /.vscode +composer.lock diff --git a/app/Events/PaymentNotify.php b/app/Events/PaymentNotify.php new file mode 100644 index 00000000..162b1ecd --- /dev/null +++ b/app/Events/PaymentNotify.php @@ -0,0 +1,32 @@ +response = $response; + $this->userid = $userid; + } + + public function broadcastOn() + { + return ['payment-notify']; + } + + public function broadcastAs() + { + return 'trigger-payment'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 65f70a40..e10603b4 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Events\PaymentNotify; + use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; @@ -155,13 +157,13 @@ class ApiController extends Controller $collection_id = $this->collection_id; $response = $bill->create( $collection_id, - 'test@gmail.com', + $request->email, $request->notel, $request->name, Money::MYR($total_bayaran), route('pay.callback'), 'Bayaran Borang', - ['redirect_url' => 'http://192.168.0.85:8003/api/pembayaran/response'] + ['redirect_url' => 'http://192.168.0.88:8003/api/pembayaran/response'] ); // dd($response); $previous_siri = Resit::orderBy('id','desc')->first(); @@ -218,7 +220,7 @@ class ApiController extends Controller } public function callback(Request $request){ - // dd('hye'); + // dd('hye callback'); $http = new HttpMethodsClient( new GuzzleHttpClient(), new GuzzleMessageFactory() @@ -239,7 +241,8 @@ class ApiController extends Controller $resit->status = 'PAID'; $resit->paid_at = $data['billplz']['paid_at']; $resit->save(); - + + event(new PaymentNotify('PAID',$resit->user_id)); // $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[ // 'billplz_id' => $data['billplz']['id'] // ])->json(); @@ -253,6 +256,8 @@ class ApiController extends Controller $resit->status = 'UNSUCCESSFUL'; $resit->paid_at = null; $resit->save(); + + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); return response()->json([ 'success' => false, 'resit' => $resit @@ -261,7 +266,7 @@ class ApiController extends Controller } public function response(Request $request){ - // dd('hye'); + // dd('hye response'); $http = new HttpMethodsClient( new GuzzleHttpClient(), new GuzzleMessageFactory() @@ -287,6 +292,7 @@ class ApiController extends Controller // $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[ // 'billplz_id' => $data['billplz']['id'] // ])->json(); + event(new PaymentNotify('PAID',$resit->user_id)); return response()->json([ 'success' => true, 'resit' => $resit @@ -297,6 +303,8 @@ class ApiController extends Controller $resit->status = 'UNSUCCESSFUL'; $resit->paid_at = null; $resit->save(); + + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); return response()->json([ 'success' => false, 'resit' => $resit diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index 875a2d1f..4ef4bced 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -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([ diff --git a/app/Http/Controllers/DatabaseController.php b/app/Http/Controllers/DatabaseController.php index b7847258..00f654c3 100644 --- a/app/Http/Controllers/DatabaseController.php +++ b/app/Http/Controllers/DatabaseController.php @@ -8,6 +8,8 @@ use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; use App\Models\Cawangan; +use App\Events\PaymentNotify; + class DatabaseController extends Controller { /** @@ -27,6 +29,7 @@ class DatabaseController extends Controller */ public function index() { + event(new PaymentNotify('lulus','8')); $caw = Cawangan::all(); // $user = Auth::user(); // $user->assignRole('admin'); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 7e9158f1..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; @@ -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')); } diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index e77aa326..bd2a93f9 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -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') diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 57f261a3..b846638b 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -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'); + } + } 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/composer.json b/composer.json index c25ad304..d4d20a88 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "laravel/sanctum": "^2.13", "laravel/tinker": "^2.5", "php-http/guzzle7-adapter": "^1.0", + "pusher/pusher-php-server": "^7.0", "spatie/laravel-permission": "^5.3" }, "require-dev": { 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..2808a919 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,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') diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 87354b7c..101e3f16 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,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'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d55f4ddb..88fc44a0 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') @@ -105,8 +102,8 @@
  • Senarai Lelong
    • -
  • - Senarai Lelong Tak Laku +
  • + Senarai Lelong Tak Laku
    • 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 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 +
    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 + +
    + + + + + + + + + + + + + @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/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 1c93ec26..84a05a5e 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,325 @@ +
    + +
    + + + diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index ec1f9e6e..48311144 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -5,7 +5,12 @@
    - + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    @@ -39,4 +44,59 @@ -@endsection \ No newline at end of file + + +@endsection + diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php new file mode 100644 index 00000000..fe176589 --- /dev/null +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -0,0 +1,88 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    No
    + + + + + + + + + + @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/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 5e3ac8f4..fcaa5030 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']); @@ -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 () { @@ -147,8 +149,10 @@ 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']); });