From 0167637e27a72d9cf4e097bf5633eaa9192e8801 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 8 Feb 2022 12:52:20 +0800 Subject: [PATCH] commit --- .../Controllers/AuthMobile/AuthController.php | 22 ++- app/Http/Controllers/LelongController.php | 10 +- app/Http/Controllers/PembidaController.php | 93 ++++++++++++ .../2014_10_12_000000_create_users_table.php | 2 +- ...2022_01_25_010223_create_payment_table.php | 2 +- resources/views/includes/sidebar.blade.php | 3 + .../views/lelong/senarailelong.blade.php | 7 +- .../views/pembida/senaraipembida.blade.php | 134 ++++++++++++++++++ resources/views/pembida/show.blade.php | 83 +++++++++++ routes/web.php | 7 + 10 files changed, 357 insertions(+), 6 deletions(-) create mode 100644 app/Http/Controllers/PembidaController.php create mode 100644 resources/views/pembida/senaraipembida.blade.php create mode 100644 resources/views/pembida/show.blade.php diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index 5f2a1c3a..96d961e6 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -19,6 +19,7 @@ class AuthController extends Controller 'username' => 'required|string|unique:users', 'nokp' => 'required|string|unique:users', 'password' => 'required|string|min:8', + 'email' => 'required|string|unique:users|email', 'notelbimbit' => 'required|string|unique:users', 'register_agree' => 'required|integer' @@ -45,6 +46,7 @@ class AuthController extends Controller $user->username = $fields['username']; $user->nokp = $fields['nokp']; $user->password = bcrypt($fields['password']); + $user->email = $fields['email']; $user->notelbimbit = $fields['notelbimbit']; $user->register_agree = $fields['register_agree']; $user->t_daftar = $currentdate; @@ -85,7 +87,25 @@ class AuthController extends Controller //Check username $user = User::where('username', $fields['username'])->first(); - + + if($user->status != 'active') + { + if($user->status == 'banned') + { + return response([ + 'message' => 'User Banned' + ], 401); + } + else + { + return response([ + 'message' => 'Registration in progress,status wait for approval.' + ], 401); + } + return response([ + 'message' => 'Bad Creds' + ], 401); + } //Check Password if(!$user || !Hash::check($fields['password'], $user->password)){ return response([ diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index ceab41cf..eaa4bd7f 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -27,6 +27,9 @@ use App\Models\LelongBidMarhun; use App\Models\LelKarat; use App\Models\LelKarat_temp; + +use Carbon\Carbon; + class LelongController extends Controller { /** @@ -333,8 +336,13 @@ class LelongController extends Controller public function start($id) { + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + $lelong = Lelong::where('id','=',$id)->first(); - $lelong->masatamat_lelong = '2021-12-20 04:51:50'; + $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $endtime->toTimeString(); $lelong->sts_lelong = 1; $lelong->save(); diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php new file mode 100644 index 00000000..b37f6fdb --- /dev/null +++ b/app/Http/Controllers/PembidaController.php @@ -0,0 +1,93 @@ +middleware('auth'); + } + + /** + * Show the application dashboard. + * + * @return \Illuminate\Contracts\Support\Renderable + */ + public function index() + { + // $alluser = User::all(); + $alluser = User::doesntHave('roles')->where('user_type','=',2)->get(); + // $allroles = Role::all()->pluck('name'); + // $user = Auth::user(); + // $user->assignRole('admin'); + return view('pembida.senaraipembida',compact('alluser')); + } + + public function show($userid) + { + // dd($userid); + $user = User::where('id','=',$userid)->first(); + $files = File::where('user_id','=',$userid)->get()->toArray(); + + $array_ic = []; + foreach($files as $index=>$file) + { + $files[$index]['ic64']= 'data:image/' . $file['file_type'] . ';base64,' . base64_encode($file['filename']); + } + + // dd($files); + return view('pembida.show',compact('user','files')); + } + + + + public function delete(Request $request) + { + $user = User::where('id','=',$request->userid)->first(); + $user->note =$request->note; + $user->status = 'Fail'; + $user->save(); + + return redirect()->route('pembida.senaraipembida') + ->with('success','Padam Pengguna Berjaya'); + } + + public function sah($userid) + { + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateString(); + + $user = User::where('id','=',$userid)->first(); + $user->disahkan_pada = $currentdate; + $user->disahkan_oleh = Auth::user()->id; + $user->status = 'active'; + + if($user->save()) + { + $user->assignRole('pembida'); + } + + return redirect()->route('pembida.senaraipembida') + ->with('success','Pengesahan Berjaya'); + } + + + +} + \ No newline at end of file diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 64149651..ab6229ba 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -33,7 +33,7 @@ class CreateUsersTable extends Migration $table->datetime('email_verified_at')->nullable(); $table->string('password'); $table->datetime('disahkan_pada')->nullable(); - $table->datetime('disahkan_oleh')->nullable(); + $table->integer('disahkan_oleh')->nullable(); $table->string('user_type')->nullable(); //set 1,2 $table->rememberToken(); $table->timestamps(); 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 8b2c057e..60fcc5a4 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -24,7 +24,7 @@ class CreatePaymentTable extends Migration $table->string('bank_acc_no_pembeli')->nullable(); $table->string('nama_bank_acc_caw')->nullable(); $table->string('bank_no_acc_caw')->nullable(); - $table->integer('status_payment_opt')->nullable(); + $table->integer('status_payment_opt')->nullable(); //1=online,2=kaunter $table->integer('resit_id'); $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin $table->string('remark'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 14e1e662..bd5decd1 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -86,6 +86,9 @@ +
  • + Pengesahan Pembida Baharu +
    • @endhasrole @hasrole('account') {{--
  • diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 49b66163..ec39972a 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -36,14 +36,17 @@ {{ $lel->cajlelong }} @hasrole('jurulelong') - + @if(!$lel->masatamat_lelong) + + + @elseif ($lel->sts_lelong == 2) + @else @endif - @endhasrole diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php new file mode 100644 index 00000000..a5bd2cc3 --- /dev/null +++ b/resources/views/pembida/senaraipembida.blade.php @@ -0,0 +1,134 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + +
    + @csrf + + + + + + + + + + + + + + + @foreach ($alluser as $user) + + + + + + + + + @endforeach + + +
    NamaNumber PhoneEmailStatusAction
    {{ $user->name }}{{ $user->notelbimbit }}{{ $user->email }} + @if ($user->status =='active') + + @elseif ($user->status =='banned') + + @endif + + + + {{-- --}} +
    +
    +
    + +
    +
    + + +@endsection diff --git a/resources/views/pembida/show.blade.php b/resources/views/pembida/show.blade.php new file mode 100644 index 00000000..ce4a88da --- /dev/null +++ b/resources/views/pembida/show.blade.php @@ -0,0 +1,83 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + @csrf +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +

    Identity Card/Passport Picture

    +
    + @foreach ($files as $file) +
    + + + {{$file['ic64']}} +
    + @endforeach +
    +
    +
    + + Kembali + +
    + +
    + {{-- --}} +
    +
    +
    + +@endsection diff --git a/routes/web.php b/routes/web.php index 2dc0c6b7..fb02148c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -110,4 +110,11 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); +}); + +Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembida'], function () { + Route::get('/senaraipembida',['as'=>'pembida.senaraipembida','uses'=>'PembidaController@index']); + 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']); }); \ No newline at end of file