fix: sort winnersbyitem by item number numerically

Reviewed-on: #7

.gitignore

@@ -12,3 +12,4 @@ npm-debug.log
 /public/rldbadm
 /stats
 /.well-known
+.DS_Store

app/Filament/Resources/WinningBidsResource.php

@@ -49,8 +49,7 @@ class WinningBidsResource extends Resource
                     ->searchable(),
                 TextInput::make('winning_cost')
                     ->label('Winning Bid')
-                    ->prefix('$')
-                    ->numeric(),
+                    ->prefix('$'),
             ]);
     }
 

app/Http/Controllers/Controller.php

@@ -7,7 +7,7 @@ use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
-class Controller extends BaseController
+class Controller extends \Illuminate\Routing\Controller
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 }

app/Http/Controllers/PagesController.php

@@ -20,6 +20,7 @@ use App\Models\Types;
 use App\Models\Vehicles;
 use App\Models\VehicleScores;
 use Dompdf\Dompdf;
+
 class PagesController extends Controller
 {
     public function home()
@@ -81,7 +82,8 @@ class PagesController extends Controller
     public function checkout(Request $checkout_req)
     {
         if (!$checkout_req->checkoutbiddernum) {
-            return view('checkout_select_form');
+            $bidders = \App\Models\Bidders::orderByRaw('CAST(bidder_assigned_number AS UNSIGNED) ASC')->get();
+            return view('checkout_select_form', ['bidders' => $bidders]);
         } elseif (!$checkout_req->checkout_payment_method) {
             $checkout_bidder = $checkout_req->checkoutbiddernum;
             $checkout_list_results = DB::select("SELECT
@@ -161,20 +163,32 @@ class PagesController extends Controller
 
     public function editwinners(Request $edit_win_req)
     {
-        if (!$edit_win_req->winid) {
-            return view('editwinners');
+        if ($edit_win_req->id) {
+            $winner = WinningBids::with(['items', 'bidders'])->find($edit_win_req->id);
+            $bidders = Bidders::all();
+            $items = Items::all();
+            return view('editwinners', ['winner' => $winner, 'bidders' => $bidders, 'items' => $items]);
         }
+        
+        if (!$edit_win_req->winid) {
+            $winners = WinningBids::with(['items', 'bidders'])->get();
+            return view('winnersbyitem', ['winnersbyitem_results' => $winners]);
+        }
+        
         $winning_bid_id = $edit_win_req->winid;
         $winner_bidder = $edit_win_req->winnerbiddernum;
+        $winner_item = $edit_win_req->winneritemnum;
         $winner_cost = $edit_win_req->winnerbid;
+        
         $winner_insert = WinningBids::where('idwinning_bids', $winning_bid_id)
                     ->update(
                         [
                         'winning_bidder_num' => $winner_bidder,
+                        'winning_item_num' => $winner_item,
                         'winning_cost' => $winner_cost
                         ]
                       );
-        return redirect('editwinners');
+        return redirect('winnersbyitem');
     }
 
     public function finaltally()
@@ -296,7 +310,8 @@ class PagesController extends Controller
     public function reprintReceipt(Request $reprint_receipt_req)
     {
         if (!$reprint_receipt_req->reprintbiddernum) {
-            return view('reprint_receipt_form');
+            $bidders = Bidders::has('checkout')->get();
+            return view('reprint_receipt_form', ['bidders' => $bidders]);
         } else {
             $bidnum=$reprint_receipt_req->reprintbiddernum;
             $checkout_result = Checkout::where('bidder_num', '=', $bidnum)
@@ -317,7 +332,9 @@ class PagesController extends Controller
     public function winners(Request $winners_req)
     {
         if (!$winners_req->winnerbid) {
-            return view('winners');
+            $bidders = Bidders::all();
+            $items = Items::all();
+            return view('winners', ['bidders' => $bidders, 'items' => $items]);
         }
         $winner_item = $winners_req->winneritemnum;
         $winner_bidder = $winners_req->winnerbiddernum;
@@ -334,22 +351,19 @@ class PagesController extends Controller
 
     public function winnersbyitem()
     {
-        $winnersbyitem_results = DB::select("SELECT
-      *
-      FROM winning_bids
-      INNER JOIN items as items
-      ON winning_bids.winning_item_num=items.iditems
-      INNER JOIN bidders AS bidders
-      ON winning_bids.winning_bidder_num=bidders.idbidders
-      ORDER BY item_assigned_num ASC
-    ");
+        $winnersbyitem_results = WinningBids::with(['items', 'bidders'])
+            ->join('items', 'winning_bids.winning_item_num', '=', 'items.iditems')
+            ->orderByRaw('CAST(items.item_assigned_num AS UNSIGNED) ASC')
+            ->select('winning_bids.*')
+            ->get();
         return view('winnersbyitem', ['winnersbyitem_results' => $winnersbyitem_results]);
     }
 
     public function winnertotal(Request $winnertotal_req)
     {
         if (!$winnertotal_req->winnerbiddernum) {
-            return view('winnertotalform');
+            $bidders = Bidders::all();
+            return view('winnertotalform', ['bidders' => $bidders]);
         }
         $winner_total_bidder = $winnertotal_req->winnerbiddernum;
         $winnertotal_list_results = DB::select("SELECT
@@ -377,37 +391,41 @@ class PagesController extends Controller
 
     public function winningbidderlist()
     {
-        $winnerlist_results = WinningBids::join('bidders', 'winning_bids.winning_bidder_num', '=', 'bidders.idbidders')
-                                          ->groupBy('winning_bidder_num')
-                                          ->orderBy('bidders.bidder_assigned_number')
+        $winnerlist_results = Bidders::whereHas('winningBids')
+                                          ->orderBy('bidder_assigned_number')
                                           ->get();
-        return view('winningbidderlist', ['winnerlist_results' => $winnerlist_results]);
+        return view('winningbidderlist', ['winning_bidders' => $winnerlist_results]);
     }
+
     public function judgingentry(Request $judgingentry_req)
     {
-        if (!$judgingentry_req->vehnum) {
-            return view('judgingentry');
-        }
+        $judges = \App\Models\Judges::all();
+        $vehicles = \App\Models\Vehicles::select('vehicles.*')
+            ->leftJoin('bidders', 'vehicles.owner', '=', 'bidders.bidder_assigned_number')
+            ->orderByRaw('CAST(bidders.bidder_assigned_number AS UNSIGNED) ASC')
+            ->get();
+
+        if ($judgingentry_req->isMethod('post')) {
             $vehicle = $judgingentry_req->vehnum;
             $judge = $judgingentry_req->judgenum;
             $score = $judgingentry_req->vehscore;
-        $bidder_insert = VehicleScores::updateOrCreate(
-            [
-            'vehicle' => $vehicle,
-            'judge' => $judge 
-            ],
-            [
-            'overall_score' => $score
-            ]
+            
+            VehicleScores::updateOrCreate(
+                ['vehicle' => $vehicle, 'judge' => $judge],
+                ['overall_score' => $score]
             );
 
             return redirect('judgingentry');
         }
 
+        return view('judgingentry', ['judges' => $judges, 'vehicles' => $vehicles]);
+    }
+
     public function showcars(Request $showcar_req)
     {
         if (!$showcar_req->bidderlname) {
-            return view('showcars');
+            $vehicles = \App\Models\Vehicles::with('vehicleOwner')->get();
+            return view('showcars', ['vehicles' => $vehicles]);
         }
         $bidder_lname = $showcar_req->bidderlname;
         $bidder_fname = $showcar_req->bidderfname;
@@ -466,7 +484,8 @@ class PagesController extends Controller
     public function pcentry(Request $pcentry_req)
     {
         if (!$pcentry_req->vehnum) {
-            return view('pcentry');
+            $vehicles = Vehicles::all();
+            return view('pcentry', ['vehicles' => $vehicles]);
         }
         $vehicle=$pcentry_req->vehnum;
         $pc_count=$pcentry_req->pc_count;
@@ -500,7 +519,8 @@ class PagesController extends Controller
    public function awardcategories(Request $category_req)
     {
         if (!$category_req->category) {
-            return view('awardcategories');
+            $categories = CarShowCategory::all();
+            return view('awardcategories', ['categories' => $categories]);
         }
         $category = $category_req->category;
         if ($category_req->has('vehtype')) {
@@ -522,20 +542,20 @@ class PagesController extends Controller
    public function showwinners()
     {
         $carshowwinner_results = CarShowWinner::with(['awardCategory', 'awardVehicle', 'awardVehicle.vehicleOwner'])->get();
-        return view('carshowwinners', ['carshowwinner_results' => $carshowwinner_results]);
+        return view('carshowwinners', ['winners' => $carshowwinner_results]);
     }
    public function showscores()
     {
-        $carshowscore_results = VehicleScores::with(['scoredVehicle'])
+        $carshowscore_results = VehicleScores::with(['scoredVehicle', 'scoredVehicle.vehicleOwner'])
             ->groupBy('vehicle')
             ->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
             ->orderBy('totalscore', 'desc')
             ->get();
-        return view('carshowscores', ['carshowscore_results' => $carshowscore_results]);
+        return view('carshowscores', ['scores_results' => $carshowscore_results]);
     }
    public function showscoresbycar()
     {
-        $carshowscore2_results = VehicleScores::with(['scoredVehicle'])
+        $carshowscore2_results = VehicleScores::with(['scoredVehicle', 'scoredVehicle.vehicleOwner'])
             ->groupBy('vehicle')
             ->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
             //->orderBy('scoredVehicle.vehicleOwner.bidder_assigned_number')
@@ -546,7 +566,7 @@ class PagesController extends Controller
                 LIMIT 1
             ) AS UNSIGNED) ASC')
             ->get();
-        return view('carshowscores', ['carshowscore_results' => $carshowscore2_results]);
+        return view('carshowscores', ['scores_results' => $carshowscore2_results]);
     }    
     public function showcarlist()
     {
@@ -588,3 +608,4 @@ class PagesController extends Controller
         ]);
     }
 }
+

app/Models/CarShowWinner.php

@@ -24,11 +24,11 @@ class CarShowWinner extends Model
 
   public function awardVehicle()
   {
-    return $this->hasMany('App\Models\Vehicles', 'id', 'vehicle');
+    return $this->belongsTo('App\Models\Vehicles', 'vehicle', 'id');
   }
 
   public function awardCategory()
   {
-    return $this->hasMany('App\Models\CarShowCategory', 'id', 'category');
+    return $this->belongsTo('App\Models\CarShowCategory', 'category', 'id');
   }
 }

app/Models/VehicleScores.php

@@ -30,6 +30,6 @@ class VehicleScores extends Model
 
   public function scoredVehicle()
   {
-      return $this->hasMany('App\Models\Vehicles', 'id', 'vehicle');
+      return $this->belongsTo('App\Models\Vehicles', 'vehicle', 'id');
   }
 }

composer.json

@@ -16,7 +16,8 @@
         "laravel/tinker": "^2.9",
         "laravel/ui": "^4.2",
         "socialiteproviders/manager": "^4.9",
-        "spatie/laravel-pdf": "^2.8"
+        "spatie/laravel-pdf": "^2.8",
+        "takielias/tablar": "^13.02"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.8",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6a8c1dbed78b92e966ff11684e8bb902",
+    "content-hash": "9f3b5396da1f090c9cab4f086f23f776",
     "packages": [
         {
             "name": "barryvdh/laravel-snappy",
@@ -9312,6 +9312,70 @@
             ],
             "time": "2026-03-30T13:44:50+00:00"
         },
+        {
+            "name": "takielias/tablar",
+            "version": "13.02",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/takielias/tablar.git",
+                "reference": "bb38f4f12482a41297ca5f19667cb1fdc6d5e0ef"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/takielias/tablar/zipball/bb38f4f12482a41297ca5f19667cb1fdc6d5e0ef",
+                "reference": "bb38f4f12482a41297ca5f19667cb1fdc6d5e0ef",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": ">=10.0"
+            },
+            "conflict": {
+                "laravel/breeze": "*"
+            },
+            "require-dev": {
+                "orchestra/testbench": ">=9.0",
+                "phpunit/phpunit": ">=10.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "TakiElias\\Tablar\\TablarServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "TakiElias\\Tablar\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taki Elias",
+                    "email": "taki.elias@gmail.com"
+                }
+            ],
+            "description": "Tablar: A Laravel Dashboard Preset Featuring Dark Mode and Dynamic Menu Generation for Effortless Navigation and Fast Development.",
+            "keywords": [
+                "bootstrap",
+                "laravel",
+                "preset",
+                "tabler",
+                "vite"
+            ],
+            "support": {
+                "issues": "https://github.com/takielias/tablar/issues",
+                "source": "https://github.com/takielias/tablar/tree/13.02"
+            },
+            "time": "2026-03-26T09:58:14+00:00"
+        },
         {
             "name": "thecodingmachine/safe",
             "version": "v3.4.0",

config/tablar.php

@@ -0,0 +1,145 @@
+<?php
+
+return [
+    'title' => 'Silent Auction Dashboard',
+    'logo' => '/assets/tablar-logo.png',
+    'menu' => [
+        [
+            'text' => 'Home',
+            'route' => 'home',
+            'icon' => 'ti ti-home',
+        ],
+        [
+            'text' => 'Bidders',
+            'icon' => 'ti ti-users',
+            'submenu' => [
+                [
+                    'text' => 'Add Bidder',
+                    'route' => 'bidders',
+                ],
+                [
+                    'text' => 'List Bidders',
+                    'route' => 'bidderlist',
+                ],
+            ],
+        ],
+        [
+            'text' => 'Items',
+            'icon' => 'ti ti-box',
+            'submenu' => [
+                [
+                    'text' => 'Add Item',
+                    'route' => 'items',
+                ],
+                [
+                    'text' => 'List Items',
+                    'route' => 'itemlist',
+                ],
+            ],
+        ],
+        [
+            'text' => 'Winners',
+            'icon' => 'ti ti-trophy',
+            'submenu' => [
+                [
+                    'text' => 'Add Winner',
+                    'route' => 'winners',
+                ],
+                [
+                    'text' => 'Edit Winner',
+                    'route' => 'editwinners',
+                ],
+                [
+                    'text' => 'List Winners',
+                    'route' => 'winnerlist',
+                ],
+                [
+                    'text' => 'Winners by Item',
+                    'route' => 'winnersbyitem',
+                ],
+                [
+                    'text' => 'Check My Winnings',
+                    'route' => 'mywinnings',
+                ],
+            ],
+        ],
+        [
+            'text' => 'CarShow',
+            'icon' => 'ti ti-car',
+            'submenu' => [
+                [
+                    'text' => 'Add Car',
+                    'route' => 'showcars',
+                ],
+                [
+                    'text' => 'List Show Cars',
+                    'route' => 'showcarlist',
+                ],
+                [
+                    'text' => 'Judging Entry',
+                    'route' => 'judgingentry',
+                ],
+                [
+                    'text' => 'People\'s Choice Entry',
+                    'route' => 'pcentry',
+                ],
+                [
+                    'text' => 'Add Judge',
+                    'route' => 'judges',
+                ],
+                [
+                    'text' => 'Car Show Winners',
+                    'route' => 'showwinners',
+                ],
+                [
+                    'text' => 'Vehicle Total Scores',
+                    'route' => 'showscores',
+                ],
+                [
+                    'text' => 'Scores by Car',
+                    'route' => 'showscoresbycar',
+                ],
+                [
+                    'text' => 'Tabulate Winners',
+                    'route' => 'tabulateshowwinners',
+                ],
+            ],
+        ],
+        [
+            'text' => 'Reports',
+            'icon' => 'ti ti-file-text',
+            'submenu' => [
+                [
+                    'text' => 'Bidder List',
+                    'route' => 'bidderlist',
+                ],
+                [
+                    'text' => 'Completed Checkouts',
+                    'route' => 'checkout_complete_list',
+                ],
+                [
+                    'text' => 'Items',
+                    'route' => 'itemlist',
+                ],
+                [
+                    'text' => 'Winners',
+                    'route' => 'winnerlist',
+                ],
+            ],
+        ],
+        [
+            'text' => 'Checkout',
+            'icon' => 'ti ti-credit-card',
+            'submenu' => [
+                [
+                    'text' => 'Checkout Bidder',
+                    'route' => 'checkout',
+                ],
+                [
+                    'text' => 'Re-Print Receipt',
+                    'route' => 'reprint_receipt',
+                ],
+            ],
+        ],
+    ],
+];

package.json

@@ -1,21 +1,43 @@
 {
     "private": true,
+    "type": "module",
     "scripts": {
-    "dev": "npm run development",
-    "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch-poll": "npm run watch -- --watch-poll",
-    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "prod": "npm run production",
-    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "dev": "vite",
+        "build": "vite build"
     },
     "devDependencies": {
-    "axios": "^0.15.3",
+        "@melloware/coloris": "^0.25.0",
+        "@popperjs/core": "^2.11.8",
+        "@tabler/core": "1.4.0",
+        "@tabler/icons": "^3.35.0",
+        "@tabler/icons-webfont": "^3.35.0",
+        "apexcharts": "^3.54.1",
+        "autosize": "^6.0.1",
+        "axios": "^1.7.4",
+        "bootstrap": "5.3.8",
         "bootstrap-sass": "^3.3.7",
-    "cross-env": "^3.2.3",
-    "jquery": "^3.1.1",
-    "laravel-mix": "0.*",
-    "lodash": "^4.17.4",
-    "vue": "^2.1.10"
+        "choices.js": "^11.1.0",
+        "countup.js": "^2.9.0",
+        "cross-env": "^7.0.3",
+        "dropzone": "^6.0.0-beta.2",
+        "fslightbox": "^3.7.4",
+        "fullcalendar": "^6.1.19",
+        "imask": "^7.6.1",
+        "jquery": "^3.7.1",
+        "jsvectormap": "^1.7.0",
+        "laravel-vite-plugin": "^1.0",
+        "list.js": "^2.3.1",
+        "litepicker": "^2.0.12",
+        "lodash": "^4.17.21",
+        "nouislider": "^15.8.1",
+        "plyr": "^3.8.3",
+        "sass": "~1.64.2",
+        "sass-loader": "^16.0.1",
+        "signature_pad": "^5.1.1",
+        "star-rating.js": "^4.3.1",
+        "tom-select": "^2.4.3",
+        "typed.js": "^2.1.0",
+        "vite": "^5.0.0",
+        "vite-plugin-static-copy": "~3.0.0"
     }
 }

public/.well-known

@@ -1 +1 @@
-/home/sjcsauction/public_html/.well-known
+auction/home/sjcsauction/public_html/.well-known