Merge branch 'faiqahzaman'

app/Http/Controllers/AuthMobile/AuthController.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\AuthMobile;
 
-use App\Http\Controllers\Controller;
+use Auth;
+use Carbon\Carbon;
 use App\Models\User;
 use App\Models\File;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
-use Carbon\Carbon;
-use Auth;
 use Illuminate\Support\Facades\Validator;
 
 class AuthController extends Controller
@@ -79,7 +79,7 @@ class AuthController extends Controller
         return response($response, 201);
     }
 
-    public function login(Request $request) {
+    public function loginUser(Request $request) {
         $fields = $request->validate([
             'username' => 'required|string',
             'password' => 'required|string'
@@ -108,6 +108,7 @@ class AuthController extends Controller
        }
        //Check Password
        if(!$user || !Hash::check($fields['password'], $user->password)){
+
             return response([
                 'message' => 'Bad Creds'
             ], 401);
@@ -123,7 +124,7 @@ class AuthController extends Controller
         return response($response, 201);
     }
 
-    public function logout(Request $request){
+    public function logoutUser(Request $request){
         auth()->user()->tokens()->delete();
 
         return [

app/Http/Controllers/AuthMobile/ForgotPasswordController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}

app/Http/Controllers/AuthMobile/NewPasswordController.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\AuthMobile;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Password;
-use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Validation\Rules\Password as RulesPassword;
-
-class NewPasswordController extends Controller
-{
-    public function forgotPassword(Request $request){
-
-        $request->validation([
-            'email' => 'required|email'
-        ]);
-
-        $status = User::sendResetLink(
-            $request->onlu('email')
-        );
-
-        if ($status == User::RESET_LINK_SENT){
-            return [
-                'status' => __($status)
-            ];
-        }
-
-        throw ValidationException::withMessage([
-            'email' => [trans($status)],
-        ]);
-    }
-
-    public function reset(Request $request){
-
-        $request->validation([
-            'token' => 'required',
-            'email' => 'required|email',
-            'password' => ['required', 'confirmed', RulesPassword::defaults()],
-        ]);
-
-        // $status = Password::reset(
-        //     $request->only('email', 'password_confirmation', 'token')
-        // )
-    }
-}

app/Http/Controllers/AuthMobile/ResetPasswordController.php

@@ -4,10 +4,8 @@ namespace App\Http\Controllers\AuthMobile;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use App\Models\Lelong;
-use App\Models\Users;
 
-class PaymentController extends Controller
+class ResetPasswordController extends Controller
 {
     //
 }

app/Http/Controllers/AuthMobile/VerificationController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\VerifiesEmails;
+
+class VerificationController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Email Verification Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling email verification for any
+    | user that recently registered with the application. Emails may also
+    | be re-sent if the user didn't receive the original email message.
+    |
+    */
+
+    use VerifiesEmails;
+
+    /**
+     * Where to redirect users after verification.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->middleware('signed')->only('verify');
+        $this->middleware('throttle:6,1')->only('verify', 'resend');
+    }
+}

app/Http/Controllers/LelongController.php

@@ -435,19 +435,35 @@ class LelongController extends Controller
 
     public function janapemenang(Request $request){
 
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateString();
+
         $lelongbidder = LelongBidder::join('users', 'lelongbidder.user_id', '=', 'users.id')
         ->select(
             'users.name',
             'users.nokp',
             'users.notelbimbit',
-            'lelongbidder.hargabida'
+            'lelongbidder.lelongbid_id',
+            'lelongbidder.masa_bidaan',
+            'lelongbidder.hargabida',
+            'lelongbidder.status_bidder'
         )
         ->where('lelongbid_id', '=', $request->id)
-        ->orderBy('masa_bidaan','desc')
-        ->orderBy('hargabida','desc')
+        ->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
         ->first();
 
-        // dd($lelongbidder);
+        // update table lelongbid status_jual = 1, t_jual current  
+        $updatelelong = LelongBidder::where('status_bidder', '=', $lelongbidder['status_bidder'])
+        ->where('hargabida', '=', $lelongbidder['hargabida'])
+        ->where('masa_bidaan', '=', $lelongbidder['masa_bidaan'])
+        ->update(array('status_bidder' => 1));
+        
+        // update table lelongbid status_jual = 1, t_jual current  
+        // $updatelelong = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        // ->update(array(
+        //     'lelongbid.status_jual' => 1,
+        //     'lelongbid.t_jual' => $currentdate
+        // ));
         
         return view('lelong.janapemenang',compact('lelongbidder'));
 
@@ -467,5 +483,28 @@ class LelongController extends Controller
                         ->with('success','Lelongan berhenti');
 
     }
+
+    public function lelongtaklaku(Request $request){
+
+        $lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
+        ->where('status_jual', 0)
+        ->whereNull('t_jual')
+        ->select(
+            'lelongbid.t_lelong',
+            'lelongbid.kodcaw',
+            'cawangan.caw_name',
+            'lelongbid.pinjaman',
+            'lelongbid.berat',
+            'lelongbid.nilaimarhun',
+            'lelongbid.hargaasas',
+            'lelongbid.upahsimpan',
+            'lelongbid.cajlelong',
+            'lelongbid.baki',
+            'lelongbid.status_jual',
+        )
+        ->get();
+        
+        return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
+    }
 }
        

app/Http/Controllers/Mobile/EmailVerificationController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers\Mobile;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Auth\Events\Verified;
+use Illuminate\Foundation\Auth\EmailVerificationRequest;
+
+class EmailVerificationController extends Controller
+{
+
+    public function sendVerificationEmail(Request $request)
+    {
+        if ($request->user()->hasVerifiedEmail()) {
+            return [
+                'message' => 'Already Verified'
+            ];
+        }
+
+        $request->user()->sendEmailVerificationNotification();
+
+        return ['status' => 'verification-link-sent'];
+    }
+
+    public function verify(EmailVerificationRequest $request)
+    {
+        if ($request->user()->hasVerifiedEmail()) {
+            return [
+                'message' => 'Email already verified'
+            ];
+        }
+
+        if ($request->user()->markEmailAsVerified()) {
+            event(new Verified($request->user()));
+        }
+
+        return [
+            'message'=>'Email has been verified'
+        ];
+    }
+}

app/Http/Controllers/Mobile/ForgotPasswordController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Mobile;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Illuminate\Http\Request;
+
+class ForgotPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
+
+    protected function sendResetLinkResponse(Request $request, $response)
+    {
+        return response(['message'=> $response]);
+
+    }
+
+
+    protected function sendResetLinkFailedResponse(Request $request, $response)
+    {
+        return response(['error'=> $response], 422);
+
+    }
+
+
+}

app/Http/Controllers/Mobile/LelongMobileController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\AuthMobile;
+namespace App\Http\Controllers\Mobile;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
@@ -24,7 +24,9 @@ class LelongMobileController extends Controller
         $currentdate = $currentdate->toDateString();
 
         // $arrayLelong = [];
-        $lelong = Lelong::where('tarikh_lelong','=',$currentdate)->where('sts_lelong','=',1)->get()->toArray();
+        $lelong = Lelong::where('tarikh_lelong','=',$currentdate)
+        ->where('sts_lelong','=',1)
+        ->get()->toArray();
 
         foreach($lelong as $index1=>$lel)
         {

app/Http/Controllers/Mobile/ResetPasswordController.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Controllers\Mobile;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Http\Request;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    protected function sendResetResponse(Request $request, $response)
+    {
+        return response(['message'=> trans($response)]);
+
+    }
+
+    protected function sendResetFailedResponse(Request $request, $response)
+    {
+        return response(['error'=> trans($response)], 422);
+    }
+
+
+}

app/Http/Controllers/Mobile/UserController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\AuthMobile;
+namespace App\Http\Controllers\Mobile;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Validator;

app/Http/Controllers/Mobile/VerificationController.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Http\Controllers\Mobile;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Auth\Events\Verified;
+use Illuminate\Foundation\Auth\VerifiesEmails;
+use Illuminate\Auth\Access\AuthorizationException;
+
+class VerificationController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Email Verification Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling email verification for any
+    | user that recently registered with the application. Emails may also
+    | be re-sent if the user didn't receive the original email message.
+    |
+    */
+
+    use VerifiesEmails;
+
+    /**
+     * Where to redirect users after verification.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:api')->only('resend');
+        $this->middleware('signed')->only('verify');
+        $this->middleware('throttle:6,1')->only('verify', 'resend');
+    }
+
+    /**
+     * Resend the email verification notification.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function resend(Request $request)
+    {
+        if ($request->user()->hasVerifiedEmail()) {
+
+            return response(['message'=>'Already verified']);
+        }
+
+        $request->user()->sendEmailVerificationNotification();
+
+        if ($request->wantsJson()) {
+            return response(['message' => 'Email Sent']);
+        }
+
+        return back()->with('resent', true);
+    }
+
+
+    /**
+     * Mark the authenticated user's email address as verified.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function verify(Request $request)
+    {
+        auth()->loginUsingId($request->route('id'));
+
+        if ($request->route('id') != $request->user()->getKey()) {
+            throw new AuthorizationException;
+        }
+
+        if ($request->user()->hasVerifiedEmail()) {
+
+            return response(['message'=>'Already verified']);
+
+            // return redirect($this->redirectPath());
+        }
+
+        if ($request->user()->markEmailAsVerified()) {
+            event(new Verified($request->user()));
+        }
+
+        return response(['message'=>'Successfully verified']);
+
+    }
+
+   
+}

app/Http/Controllers/PaymentController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\LelongBid;
+use App\Models\LelongBidder;
+use App\Models\Users;
+
+class PaymentController extends Controller
+{
+    public function SenaraiPemenang(Request $request){
+
+        $listwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        ->where('lelongbidder.status_bidder', 1)
+        ->get();
+
+        return view('pembayaran.kaunterpembayaran',compact('listwinner'));
+
+    }
+
+    public function SAGBidItem(Request $request){
+
+        $SAGBidItem = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        ->join('users', 'lelongbidder.user_id', '=', 'users.id')
+        ->where('lelongbidder.status_bidder', 1)
+        ->get();
+
+        return view('pembayaran.SAGBidItem',compact('SAGBidItem'));
+    }
+}

app/Http/Controllers/PembidaController.php

@@ -32,7 +32,12 @@ class PembidaController extends Controller
     public function index()
     {
         // $alluser = User::all();
-        $alluser = User::doesntHave('roles')->where('user_type','=',2)->get();
+        $alluser = User::doesntHave('roles')
+        ->where('user_type','=',2)
+        ->get();
+
+        // dd($alluser);
+
         // $allroles = Role::all()->pluck('name');
         // $user =  Auth::user();
         // $user->assignRole('admin');