From e5a5de6a0dd2f23cce542bbdcbcfdb966aa683f1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 22 Jun 2016 15:59:00 -0700
Subject: [PATCH] Just use inline validation instead of form request, since
 it's a one-off

---
 app/Http/Controllers/ComponentsController.php | 25 ++++++++++++---
 .../Requests/ComponentCheckoutRequest.php     | 31 -------------------
 resources/views/components/checkout.blade.php |  7 ++---
 3 files changed, 23 insertions(+), 40 deletions(-)
 delete mode 100644 app/Http/Requests/ComponentCheckoutRequest.php

diff --git a/app/Http/Controllers/ComponentsController.php b/app/Http/Controllers/ComponentsController.php
index 6315012c23..c455ec3de2 100644
--- a/app/Http/Controllers/ComponentsController.php
+++ b/app/Http/Controllers/ComponentsController.php
@@ -8,7 +8,6 @@ use App\Models\Component;
 use App\Models\Setting;
 use App\Models\User;
 use App\Models\Asset;
-use App\Http\Requests\ComponentCheckoutRequest;
 use Auth;
 use Config;
 use DB;
@@ -19,6 +18,8 @@ use Redirect;
 use Slack;
 use Str;
 use View;
+use Validator;
+use Illuminate\Http\Request;
 
 /**
  * This class controls all actions related to Components for
@@ -302,9 +303,12 @@ class ComponentsController extends Controller
     * @param int $componentId
     * @return Redirect
     */
-    public function postCheckout(ComponentCheckoutRequest $request, $componentId)
+    public function postCheckout(Request $request, $componentId)
     {
-      // Check if the component exists
+
+
+
+        // Check if the component exists
         if (is_null($component = Component::find($componentId))) {
             // Redirect to the component management page with error
             return redirect()->to('components')->with('error', trans('admin/components/message.not_found'));
@@ -312,6 +316,19 @@ class ComponentsController extends Controller
             return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
         }
 
+
+        $max_to_checkout = $component->numRemaining();
+        $validator = Validator::make($request->all(),[
+            "asset_id"          => "required",
+            "assigned_qty"      => "required|numeric|between:1,$max_to_checkout"
+        ]);
+
+        if ($validator->fails()) {
+            return redirect()->back()
+                ->withErrors($validator)
+                ->withInput();
+        }
+
         $admin_user = Auth::user();
         $asset_id = e(Input::get('asset_id'));
 
@@ -320,7 +337,7 @@ class ComponentsController extends Controller
             // Redirect to the component management page with error
             return redirect()->to('admin/components')->with('error', trans('admin/components/message.asset_does_not_exist'));
         }
-
+        
       // Update the component data
         $component->asset_id =   $asset_id;
 
diff --git a/app/Http/Requests/ComponentCheckoutRequest.php b/app/Http/Requests/ComponentCheckoutRequest.php
deleted file mode 100644
index 66860b0632..0000000000
--- a/app/Http/Requests/ComponentCheckoutRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Http\Requests\Request;
-
-class ComponentCheckoutRequest extends Request
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            "asset_id"   => 'required',
-            "assigned_qty"   => 'required|numeric|min:1',
-        ];
-    }
-}
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php
index 24207b2cd8..2c641e7924 100644
--- a/resources/views/components/checkout.blade.php
+++ b/resources/views/components/checkout.blade.php
@@ -54,13 +54,10 @@
           <div class="form-group {{ $errors->has('assigned_qty') ? ' has-error' : '' }}">
               <label for="assigned_qty" class="col-md-3 control-label">{{ trans('general.qty') }}
                <i class='icon-asterisk'></i></label>
-              <div class="col-md-1">
-                <input class="form-control" type="text" name="assigned_qty" id="assigned_qty"  value="{{ Input::old('assigned_qty') }}" />
+              <div class="col-md-9">
+                <input class="form-control" type="text" name="assigned_qty" id="assigned_qty" style="width: 70px;" value="{{ Input::old('assigned_qty') }}" />
                 {!! $errors->first('assigned_qty', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
               </div>
-              <div class="col-md-8">
-                  {{ $component->numRemaining()  }} Max
-              </div>
           </div>
 
         </div>