Dropdown for users, products, events, committees replaced with search…

… fields. (Fixes #655)

* Initial ajax search functionality. (Refs #655)

* Further search field functionalit. (Refs #655)

* Further search field functionalit. (Refs #655)

* Finalized search fields! (Fixes #655)

app/Console/Commands/FeeCron.php

@@ -113,7 +113,7 @@ public function handle()
             $charged->count++;
 
             $product = Product::findOrFail($fee);
-            $product->buyForUser($member->user, 1, $product->price);
+            $product->buyForUser($member->user, 1);
 
             Mail::to($member->user)->queue((new FeeEmail($member->user, $email_fee, $product->price, $email_remmitance_reason))->onQueue('high'));
 

app/Http/Controllers/AliasController.php

@@ -103,7 +103,7 @@ public function store(Request $request)
             return Redirect::route('alias::index');
 
 
-        } elseif ($request->input('user') != 'off') {
+        } elseif ($request->input('user') != '') {
 
             $user = User::findOrFail($request->input('user'));
 

app/Http/Controllers/ApiController.php

@@ -19,29 +19,6 @@
 
 class ApiController extends Controller
 {
-    public function members(Request $request)
-    {
-
-        if (!Auth::check() || !Auth::user()->member) {
-            abort(403);
-        }
-
-        $users = User::all();
-        $data = array();
-
-        foreach ($users as $user) {
-            if (!$user->member) continue;
-            if ($request->has('term') && strpos(strtolower($user->name), strtolower($request->term)) === false) continue;
-
-            $member = new \stdClass();
-            $member->name = $user->name;
-            $member->id = $user->id;
-            $data[] = $member;
-        }
-
-        return $data;
-
-    }
 
     public function train(Request $request)
     {

app/Http/Controllers/EventController.php

@@ -317,7 +317,7 @@ public function finclose(Request $request, $id)
         $product->save();
 
         foreach ($activity->users as $user) {
-            $product->buyForUser($user, 1, $product->price);
+            $product->buyForUser($user, 1);
         }
 
         $activity->closed = true;

app/Http/Controllers/OrderLineController.php

@@ -114,21 +114,47 @@ public function adminindex(Request $request)
      */
     public function bulkStore(Request $request)
     {
+
         for ($i = 0; $i < count($request->input('user')); $i++) {
 
             $user = User::findOrFail($request->input('user')[$i]);
             $product = Product::findOrFail($request->input('product')[$i]);
             $price = ($request->input('price')[$i] != "" ? floatval(str_replace(",", ".", $request->input('price')[$i])) : $product->price);
             $units = $request->input('units')[$i];
 
-            $product->buyForUser($user, $units, $price * $units);
+            $product->buyForUser($user, $units);
 
         }
 
         $request->session()->flash('flash_message', 'Your manual orders have been added.');
         return Redirect::back();
     }
 
+    /**
+     * Store (a) simple orderline(s).
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request)
+    {
+
+        for ($u = 0; $u < count($request->input('user')); $u++) {
+            for ($p = 0; $p < count($request->input('product')); $p++) {
+
+                $user = User::findOrFail($request->input('user')[$u]);
+                $product = Product::findOrFail($request->input('product')[$p]);
+
+                $product->buyForUser($user, 1);
+
+            }
+        }
+
+        $request->session()->flash('flash_message', 'Your manual orders have been added.');
+        return Redirect::back();
+
+    }
+
     /**
      * Remove the specified resource from storage.
      *

app/Http/Controllers/SearchController.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Request;
 
+use Proto\Models\Product;
 use Proto\Models\User;
 use Proto\Models\Event;
 use Proto\Models\Page;
@@ -254,4 +255,43 @@ public function openSearch()
         return Response::make(View::make('website.opensearch'))->header('Content-Type', 'text/xml');
     }
 
+    public function getUserSearch(Request $request)
+    {
+        $search_attributes = ['id', 'name', 'calling_name', 'email', 'phone', 'edu_username'];
+        return $this->getGenericSearch(User::class, $request->get('q'), $search_attributes);
+    }
+
+    public function getEventSearch(Request $request)
+    {
+        $search_attributes = ['id', 'title', 'description'];
+        return $this->getGenericSearch(Event::class, $request->get('q'), $search_attributes);
+    }
+
+    public function getCommitteeSearch(Request $request)
+    {
+        $search_attributes = ['id', 'name', 'slug', 'description'];
+        return $this->getGenericSearch(Committee::class, $request->get('q'), $search_attributes);
+    }
+
+    public function getProductSearch(Request $request)
+    {
+        $search_attributes = ['id', 'name', 'nicename'];
+        return $this->getGenericSearch(Product::class, $request->get('q'), $search_attributes);
+    }
+
+    private function getGenericSearch($model, $query, $attributes)
+    {
+        $terms = explode(' ', $query);
+        $results = collect([]);
+        foreach ($terms as $term) {
+            $query = $model::query();
+            $t = sprintf('%%%s%%', $term);
+            foreach ($attributes as $attr) {
+                $query = $query->orWhere($attr, 'LIKE', $t);
+            }
+            $results = $results->merge($query->get());
+        }
+        return $results->unique();
+    }
+
 }

app/Models/Committee.php

@@ -20,7 +20,7 @@ class Committee extends Model
      * @var string
      */
     protected $table = 'committees';
-    protected $hidden = ['id', 'image_id'];
+    protected $hidden = ['image_id'];
 
     public function getPublicId()
     {

app/Models/Event.php

@@ -20,6 +20,8 @@ class Event extends Model
      */
     protected $table = 'events';
 
+    protected $appends = ['is_future', 'formatted_date'];
+
     public function getPublicId()
     {
         return Hashids::connection('event')->encode($this->id);
@@ -165,4 +167,19 @@ public function shouldShowDietInfo()
         return $this->involves_food && $this->end > strtotime('-1 week');
     }
 
+    public function getIsFutureAttribute()
+    {
+        return date('U') < $this->start;
+    }
+
+    public function getFormattedDateAttribute()
+    {
+        return (object)[
+            'simple' => date('M d, Y', $this->start),
+            'year' => date('Y', $this->start),
+            'month' => date('M Y', $this->start),
+            'time' => date('H:i', $this->start)
+        ];
+    }
+
 }

app/Models/Product.php

@@ -44,12 +44,14 @@ public function ticket()
         return $this->hasOne('Proto\Models\Ticket', 'product_id');
     }
 
-    public function buyForUser(User $user, $amount, $total, $withCash = false)
+    public function buyForUser(User $user, $amount, $total = null, $withCash = false)
     {
 
         $this->stock -= $amount;
         $this->save();
 
+        $total = ($total ? $total : $this->price * $amount);
+
         $orderline = OrderLine::create([
             'user_id' => ($withCash ? null : $user->id),
             'cashier_id' => ($withCash || $total == 0 ? $user->id : null),

app/Models/User.php

@@ -42,12 +42,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     protected $guarded = ['password', 'remember_token'];
 
+    protected $appends = ['is_member', 'photo_preview'];
+
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['id', 'password', 'remember_token', 'personal_key', 'deleted_at', 'created_at', 'image_id', 'tfa_totp_key', 'updated_at'];
+    protected $hidden = ['password', 'remember_token', 'personal_key', 'deleted_at', 'created_at', 'image_id', 'tfa_totp_key', 'updated_at', 'diet'];
 
     public function getPublicId()
     {
@@ -440,4 +442,12 @@ public function helperReminderSubscriptions()
         return $this->belongsTo('Proto\Models\HelperReminder');
     }
 
+    public function getIsMemberAttribute() {
+        return $this->member !== null;
+    }
+
+    public function getPhotoPreviewAttribute() {
+        return $this->generatePhotoPath();
+    }
+
 }

bower.json

@@ -27,7 +27,8 @@
     "Croppie": "croppie#^2.3.0",
     "jquery-dateFormat": "^1.0.2",
     "angular": "^1.6.4",
-    "TheaterJS": "theaterjs#^3.1.0"
+    "TheaterJS": "theaterjs#^3.1.0",
+    "select2": "~4.0"
   },
   "devDependencies": {
     "font-awesome": "^4.6.3",