forked from TFMM/silent-auction
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 rlong
|
f75bdb6b4a | ||
|
rlong
|
31acaa23dd | ||
|
rlong
|
d4ea64007f | ||
|
rlong
|
7a05e73d52 | ||
|
rlong
|
9ed1765c73 | ||
|
rlong
|
4893550e2a | ||
|
rlong
|
7a6028c63d | ||
|
rlong
|
8d138e22b7 | ||
|
rlong
|
92da95bdff | ||
|
rlong
|
2e5454484f | ||
|
rlong
|
ad610633d1 |
@@ -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()
|
||||
@@ -163,7 +164,8 @@ class PagesController extends Controller
|
||||
public function editwinners(Request $edit_win_req)
|
||||
{
|
||||
if (!$edit_win_req->winid) {
|
||||
return view('editwinners');
|
||||
$winners = WinningBids::all();
|
||||
return view('editwinners', ['winners' => $winners]);
|
||||
}
|
||||
$winning_bid_id = $edit_win_req->winid;
|
||||
$winner_bidder = $edit_win_req->winnerbiddernum;
|
||||
@@ -318,7 +320,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;
|
||||
@@ -463,7 +467,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;
|
||||
@@ -519,7 +524,7 @@ 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()
|
||||
{
|
||||
@@ -528,7 +533,7 @@ class PagesController extends Controller
|
||||
->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()
|
||||
{
|
||||
@@ -543,7 +548,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()
|
||||
{
|
||||
@@ -585,3 +590,4 @@ class PagesController extends Controller
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
auction/home/sjcsauction/public_html/.well-known
|
||||
/home/sjcsauction/public_html/.well-known
|
||||
@@ -21,16 +21,20 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Last Name</th>
|
||||
<th>First Name</th>
|
||||
<th>Name</th>
|
||||
<th>Phone</th>
|
||||
<th>Email</th>
|
||||
<th>Address</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($bidderlist_results as $bidder)
|
||||
<tr>
|
||||
<td>{{ $bidder->bidder_assigned_number }}</td>
|
||||
<td>{{ $bidder->bidder_lname }}</td>
|
||||
<td>{{ $bidder->bidder_fname }}</td>
|
||||
<td>{{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</td>
|
||||
<td>{{ $bidder->bidder_phone }}</td>
|
||||
<td>{{ $bidder->bidder_email }}</td>
|
||||
<td>{{ $bidder->bidder_addr }}, {{ $bidder->bidder_city }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
<tbody>
|
||||
@foreach($winners as $winner)
|
||||
<tr>
|
||||
<td>{{ $winner->category->cat_name }}</td>
|
||||
<td>{{ $winner->vehicles->make }} {{ $winner->vehicles->model }}</td>
|
||||
<td>{{ $winner->awardCategory->cat_name }}</td>
|
||||
<td>{{ $winner->awardVehicle->make }} {{ $winner->awardVehicle->model }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
<tr>
|
||||
<th>Bidder #</th>
|
||||
<th>Name</th>
|
||||
<th>Items Won</th>
|
||||
<th>Total</th>
|
||||
<th>Payment</th>
|
||||
</tr>
|
||||
@@ -30,6 +31,11 @@
|
||||
<tr>
|
||||
<td>{{ $c->bidder_assigned_number }}</td>
|
||||
<td>{{ $c->bidder_fname }} {{ $c->bidder_lname }}</td>
|
||||
<td>
|
||||
@foreach(\App\Models\WinningBids::with('items')->where('winning_bidder_num', $c->bidder_num)->get() as $bid)
|
||||
{{ $bid->items->item_desc ?? 'N/A' }}<br>
|
||||
@endforeach
|
||||
</td>
|
||||
<td>${{ number_format($c->winnertotal, 2) }}</td>
|
||||
<td>{{ $c->payment_method == 1 ? 'Cash' : ($c->payment_method == 2 ? 'Check' : 'Credit') }}</td>
|
||||
</tr>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/* Ensure visibility in both light and dark themes */
|
||||
.ts-wrapper .ts-control {
|
||||
background-color: #ffffff !important;
|
||||
color: #1d273b !important; /* Dark text for white background */
|
||||
color: #1d273b !important;
|
||||
border: 1px solid #ced4da !important;
|
||||
padding: 0.5rem 0.75rem !important;
|
||||
border-radius: 4px !important;
|
||||
@@ -39,7 +39,13 @@
|
||||
dropdownParent: 'body',
|
||||
controlInput: '<input>',
|
||||
maxOptions: null,
|
||||
sortField: [] // Respect server-side order
|
||||
sortField: [{
|
||||
field: 'text',
|
||||
direction: 'asc',
|
||||
func: function(a, b) {
|
||||
return a.text.localeCompare(b.text, undefined, {numeric: true, sensitivity: 'base'});
|
||||
}
|
||||
}]
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
<form method="POST" action="/judges" class="row g-3">
|
||||
{{ csrf_field() }}
|
||||
<div class="col-md-6">
|
||||
<label for="judge_name" class="form-label">Judge Name</label>
|
||||
<input type="text" name="judge_name" id="judge_name" class="form-control" required>
|
||||
<label for="judgenum" class="form-label">Judge Number</label>
|
||||
<input type="text" name="judgenum" id="judgenum" class="form-control" required>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Add Judge</button>
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="score" class="form-label">Score</label>
|
||||
<input type="number" name="vehscore" id="score" class="form-control" required>
|
||||
<input type="text" name="score" id="score" class="form-control" required>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Submit Score</button>
|
||||
|
||||
@@ -20,12 +20,17 @@
|
||||
{{ csrf_field() }}
|
||||
<div class="col-md-6">
|
||||
<label for="vehicle_id" class="form-label">Vehicle</label>
|
||||
<select name="vehicle_id" id="vehicle_id" class="form-select" required>
|
||||
<select name="vehnum" id="vehicle_id" class="form-select" required>
|
||||
<option value="">Select Vehicle</option>
|
||||
@foreach($vehicles as $vehicle)
|
||||
<option value="{{ $vehicle->idvehicles }}">{{ $vehicle->make }} {{ $vehicle->model }}</option>
|
||||
<option value="{{ $vehicle->id }}">#{{ $vehicle->owner }} - {{ $vehicle->year }} {{ $vehicle->make }} {{ $vehicle->model }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label for="pc_count" class="form-label">Total Votes</label>
|
||||
<input type="number" name="pc_count" id="pc_count" class="form-control" required>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Submit Choice</button>
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
<div class="nav-item d-none d-md-flex me-3">
|
||||
<div class="btn-list">
|
||||
@include('tablar::partials.header.header-button')
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
<div class="nav-item d-none d-md-flex me-3">
|
||||
<div class="btn-list">
|
||||
@include('tablar::partials.header.header-button')
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
<div class="navbar-nav flex-row d-lg-none">
|
||||
<div class="nav-item d-none d-lg-flex me-3">
|
||||
<div class="btn-list">
|
||||
@include('tablar::partials.header.header-button')
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-none d-lg-flex">
|
||||
|
||||
Reference in New Issue
Block a user