forked from TFMM/silent-auction
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bd6b83ad13 | |||
| 39a181e013 | |||
| ebfbee5296 | |||
| 39ffca777c | |||
| c76a8ed04a | |||
| 896c96e1a4 | |||
| f9590c7814 | |||
| 2935d84671 | |||
| a1ef5686e3 | |||
| ce5b69f362 | |||
| a95aa04cb9 | |||
| 935c7ba31b | |||
| 700d2f0741 | |||
| 4ef20cba50 | |||
| f35624cc6d | |||
| 6a911ba76c | |||
| d1c03b927e | |||
| bbea9e51c8 | |||
| 17b2224490 | |||
| c2ec8464ba | |||
| 1dbf0c51bb | |||
| 2b5046b077 | |||
| a2ce8a51fe | |||
| 2512c27904 | |||
| 4fdd41e9b8 | |||
| e79d6174f8 |
@@ -12,3 +12,4 @@ npm-debug.log
|
||||
/public/rldbadm
|
||||
/stats
|
||||
/.well-known
|
||||
.DS_Store
|
||||
@@ -49,8 +49,7 @@ class WinningBidsResource extends Resource
|
||||
->searchable(),
|
||||
TextInput::make('winning_cost')
|
||||
->label('Winning Bid')
|
||||
->prefix('$')
|
||||
->numeric(),
|
||||
->prefix('$'),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -163,21 +163,32 @@ class PagesController extends Controller
|
||||
|
||||
public function editwinners(Request $edit_win_req)
|
||||
{
|
||||
if (!$edit_win_req->winid) {
|
||||
$winners = WinningBids::all();
|
||||
return view('editwinners', ['winners' => $winners]);
|
||||
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()
|
||||
@@ -299,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)
|
||||
@@ -346,7 +358,8 @@ class PagesController extends Controller
|
||||
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
|
||||
@@ -502,7 +515,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')) {
|
||||
@@ -528,7 +542,7 @@ class PagesController extends Controller
|
||||
}
|
||||
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')
|
||||
@@ -537,7 +551,7 @@ class PagesController extends Controller
|
||||
}
|
||||
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')
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 353 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
@@ -52,6 +52,26 @@ The Laravel framework is open-sourced software licensed under the [MIT license](
|
||||
|
||||
## Changelog
|
||||
|
||||
### [tablar-theme] - 2026-05-02
|
||||
|
||||
#### Added
|
||||
- **Searchable Dropdowns:** Integrated `TomSelect` across various forms (Checkout, Reprint Receipt, etc.) for enhanced usability.
|
||||
- **Self-Checkout Flow:** Added a prominent self-checkout link for bidders, integrated with North Embedded Checkout.
|
||||
- **Pickup Instructions:** Added clear instructions for bidders on the checkout completion page to proceed to the Item Pickup Table.
|
||||
- **North Checkout Fallback:** Restored the manual "Verify Payment Status" button and enhanced error reporting for digital wallet payments (Google Pay).
|
||||
|
||||
#### Fixed
|
||||
- **Logo Integration:** Corrected logo sizing issues using inline styles to override theme constraints.
|
||||
- **User Menu:** Restored "Admin" and "Link OIDC Account" entries to match the legacy theme.
|
||||
- **Manual Checkout:** Fixed broken `/checkout` route by aligning form field names with controller expectations and restoring payment method logic.
|
||||
- **Data Restoration:** Re-added bidder information and itemized winning lists to the checkout completion views.
|
||||
|
||||
#### Changed
|
||||
- **Expanded Reports:** Standardized `bidderlist`, `showcarlist`, and `checkout_complete_list` to show full contact details (Address, City, State, Zip, Phone, Email).
|
||||
- **Reporting Enhancements:** Added Year, Make, and Model to the `showcarlist` and included item numbers in the `checkout_complete_list` for improved tracking.
|
||||
- **UI Cleanup:** Disabled default Tablar footers and notifications across all layout templates to maintain a focused auction interface.
|
||||
- **Theme Consistency:** Updated various partials to ensure a seamless transition from the previous custom theme to Tablar.
|
||||
|
||||
### [bidder-facing-checkout] - 2026-04-24
|
||||
|
||||
#### Added
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<tbody>
|
||||
@foreach($categories as $category)
|
||||
<tr>
|
||||
<td>{{ $category->cat_name }}</td>
|
||||
<td>{{ $category->category_name }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -17,24 +17,32 @@
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-vcenter card-table">
|
||||
<table class="table table-vcenter card-table text-nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Name</th>
|
||||
<th>Last Name</th>
|
||||
<th>First Name</th>
|
||||
<th>Address</th>
|
||||
<th>City</th>
|
||||
<th>State</th>
|
||||
<th>Zip</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_fname }} {{ $bidder->bidder_lname }}</td>
|
||||
<td>{{ $bidder->bidder_phone }}</td>
|
||||
<td>{{ $bidder->bidder_lname }}</td>
|
||||
<td>{{ $bidder->bidder_fname }}</td>
|
||||
<td>{{ $bidder->bidder_addr }}</td>
|
||||
<td>{{ $bidder->bidder_city }}</td>
|
||||
<td>{{ $bidder->bidder_state }}</td>
|
||||
<td>{{ $bidder->bidder_zip }}</td>
|
||||
<td>{{ \App\Helpers\PhoneHelper::format($bidder->bidder_phone) }}</td>
|
||||
<td>{{ $bidder->bidder_email }}</td>
|
||||
<td>{{ $bidder->bidder_addr }}, {{ $bidder->bidder_city }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -20,17 +20,23 @@
|
||||
<table class="table table-vcenter card-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Vehicle Name</th>
|
||||
<th>Judge</th>
|
||||
<th>Score</th>
|
||||
<th>#</th>
|
||||
<th>Owner</th>
|
||||
<th>Year</th>
|
||||
<th>Make</th>
|
||||
<th>Model</th>
|
||||
<th>Total Score</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($scores_results as $score)
|
||||
<tr>
|
||||
<td>{{ $score->vehicles->make }} {{ $score->vehicles->model }}</td>
|
||||
<td>{{ $score->judges->judge_name }}</td>
|
||||
<td>{{ $score->score }}</td>
|
||||
<td>{{ $score->scoredVehicle->owner }}</td>
|
||||
<td>{{ $score->scoredVehicle->vehicleOwner->bidder_fname ?? '' }} {{ $score->scoredVehicle->vehicleOwner->bidder_lname ?? '' }}</td>
|
||||
<td>{{ $score->scoredVehicle->year }}</td>
|
||||
<td>{{ $score->scoredVehicle->make }}</td>
|
||||
<td>{{ $score->scoredVehicle->model }}</td>
|
||||
<td>{{ $score->totalscore }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -20,14 +20,24 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Category</th>
|
||||
<th>Winner</th>
|
||||
<th>Place</th>
|
||||
<th>#</th>
|
||||
<th>Owner</th>
|
||||
<th>Year</th>
|
||||
<th>Make</th>
|
||||
<th>Model</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($winners as $winner)
|
||||
<tr>
|
||||
<td>{{ $winner->awardCategory->cat_name }}</td>
|
||||
<td>{{ $winner->awardVehicle->make }} {{ $winner->awardVehicle->model }}</td>
|
||||
<td>{{ $winner->awardCategory->category_name }}</td>
|
||||
<td>{{ $winner->place }}</td>
|
||||
<td>{{ $winner->awardVehicle->owner }}</td>
|
||||
<td>{{ $winner->awardVehicle->vehicleOwner->bidder_fname ?? '' }} {{ $winner->awardVehicle->vehicleOwner->bidder_lname ?? '' }}</td>
|
||||
<td>{{ $winner->awardVehicle->year }}</td>
|
||||
<td>{{ $winner->awardVehicle->make }}</td>
|
||||
<td>{{ $winner->awardVehicle->model }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -16,33 +16,67 @@
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
@foreach($checkout_info_results as $info)
|
||||
<form method="POST" action="/checkout" class="row g-3">
|
||||
{{ csrf_field() }}
|
||||
<input type="hidden" name="bidder_num" value="{{ $bidder->idbidders }}">
|
||||
<input type="hidden" name="checkoutbiddernum" value="{{ $info->idbidders }}">
|
||||
<input type="hidden" name="winnertotal" value="{{ $info->total_cost }}">
|
||||
|
||||
<h3 class="mb-3">Winning Items for {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</h3>
|
||||
<ul class="list-group mb-4">
|
||||
@foreach($winnings as $item)
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
{{ $item->items->item_desc }}
|
||||
<span class="badge bg-primary rounded-pill">${{ number_format($item->winning_cost, 2) }}</span>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
<h3 class="mb-3">Winning Items for {{ $info->bidder_fname }} {{ $info->bidder_lname }} (Bidder #{{ $info->bidder_assigned_number }})</h3>
|
||||
|
||||
<div class="table-responsive mb-4">
|
||||
<table class="table table-vcenter">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Item #</th>
|
||||
<th>Description</th>
|
||||
<th class="text-end">Amount</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($checkout_list_results as $item)
|
||||
<tr>
|
||||
<td>{{ $item->item_assigned_num }}</td>
|
||||
<td>{{ $item->item_desc }}</td>
|
||||
<td class="text-end">${{ number_format($item->winning_cost, 2) }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th colspan="2" class="text-end">Total Due</th>
|
||||
<th class="text-end h3">${{ number_format($info->total_cost, 2) }}</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="payment_method" class="form-label">Payment Method</label>
|
||||
<select name="payment_method" id="payment_method" class="form-select" required>
|
||||
@foreach($paymentMethods as $pm)
|
||||
<option value="{{ $pm->pm_id }}">{{ $pm->pm_name }}</option>
|
||||
@endforeach
|
||||
<select name="checkout_payment_method" id="payment_method" class="form-select" required onchange="togglePaymentFields()">
|
||||
{!! \App\Helpers\PaymentMethodSelectList::paymentShowMethods() !!}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div id="check_fields" class="col-md-4" style="display:none;">
|
||||
<label for="check_number" class="form-label">Check Number</label>
|
||||
<input type="text" name="check_number" id="check_number" class="form-control">
|
||||
</div>
|
||||
|
||||
<div id="cc_fields" class="col-md-4" style="display:none;">
|
||||
<label for="cc_transaction" class="form-label">Transaction ID / Last 4</label>
|
||||
<input type="text" name="cc_transaction" id="cc_transaction" class="form-control">
|
||||
<input type="hidden" name="cc_amount" value="{{ $info->total_cost }}">
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-success">Complete Checkout</button>
|
||||
<div class="col-12 mt-4">
|
||||
<button type="submit" class="btn btn-success">
|
||||
<i class="ti ti-check me-2"></i>Complete Checkout
|
||||
</button>
|
||||
<a href="/checkout" class="btn btn-link">Cancel and Start Over</a>
|
||||
</div>
|
||||
</form>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -50,5 +84,22 @@
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@push('js')
|
||||
<script>
|
||||
function togglePaymentFields() {
|
||||
const method = document.getElementById('payment_method').value;
|
||||
const checkFields = document.getElementById('check_fields');
|
||||
const ccFields = document.getElementById('cc_fields');
|
||||
|
||||
checkFields.style.display = 'none';
|
||||
ccFields.style.display = 'none';
|
||||
|
||||
if (method === '2') { // Check
|
||||
checkFields.style.display = 'block';
|
||||
} else if (method === '3') { // Credit Card
|
||||
ccFields.style.display = 'block';
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@endpush
|
||||
|
||||
@@ -14,13 +14,79 @@
|
||||
<div class="container-xl">
|
||||
<div class="row row-cards">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body text-center">
|
||||
<h2 class="card-title">Success!</h2>
|
||||
<div class="card mb-3">
|
||||
<div class="card-body text-center py-4">
|
||||
<h2 class="text-success mb-2">Success!</h2>
|
||||
<p class="text-muted">The checkout has been successfully processed.</p>
|
||||
<a href="{{ route('receiptpdf', ['checkout_id' => $checkout_result]) }}" class="btn btn-primary" target="_blank">Print Receipt</a>
|
||||
<a href="{{ route('download_receipt', ['checkout_id' => $checkout_result]) }}" class="btn btn-success">Save PDF Receipt</a>
|
||||
<a href="/home" class="btn btn-secondary">Back to Dashboard</a>
|
||||
<p class="strong text-azure">Please proceed to the Item Pickup Table and show the page below or the pdf receipt on your device!</p>
|
||||
<div class="mt-3">
|
||||
<a href="{{ route('receiptpdf', ['checkout_id' => $checkout_result]) }}" class="btn btn-primary" target="_blank">
|
||||
<i class="ti ti-printer me-2"></i>Print Receipt
|
||||
</a>
|
||||
<a href="{{ route('download_receipt', ['checkout_id' => $checkout_result]) }}" class="btn btn-success">
|
||||
<i class="ti ti-download me-2"></i>Save PDF Receipt
|
||||
</a>
|
||||
<a href="/home" class="btn btn-secondary">
|
||||
<i class="ti ti-dashboard me-2"></i>Back to Dashboard
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@foreach($checkout_info_results as $info)
|
||||
<div class="card mb-3">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">Bidder Information</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<p><strong>Name:</strong> {{ $info->bidder_fname }} {{ $info->bidder_lname }}</p>
|
||||
<p><strong>Bidder Number:</strong> {{ $info->bidder_assigned_number }}</p>
|
||||
</div>
|
||||
<div class="col-md-6 text-md-end">
|
||||
<p><strong>Total Paid:</strong> <span class="h2 text-primary">${{ number_format($info->total_cost, 2) }}</span></p>
|
||||
<p><strong>Payment Method:</strong>
|
||||
@if($payment_method == 1) Cash
|
||||
@elseif($payment_method == 2) Check ({{ $check_number }})
|
||||
@else Credit Card ({{ $cc_transaction }})
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">Items Won</h3>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-vcenter card-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Item #</th>
|
||||
<th>Description</th>
|
||||
<th class="text-end">Amount</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($checkout_list_results as $item)
|
||||
<tr>
|
||||
<td>{{ $item->item_assigned_num }}</td>
|
||||
<td>{{ $item->item_desc }}</td>
|
||||
<td class="text-end">${{ number_format($item->winning_cost, 2) }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th colspan="2" class="text-end">Total</th>
|
||||
<th class="text-end">${{ number_format($info->total_cost ?? 0, 2) }}</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -16,28 +16,47 @@
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-vcenter card-table">
|
||||
<table class="table table-vcenter card-table text-nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Bidder #</th>
|
||||
<th>Name</th>
|
||||
<th>Items Won</th>
|
||||
<th>#</th>
|
||||
<th>Last Name</th>
|
||||
<th>First Name</th>
|
||||
<th>Address</th>
|
||||
<th>City</th>
|
||||
<th>State</th>
|
||||
<th>Zip</th>
|
||||
<th>Phone</th>
|
||||
<th>Email</th>
|
||||
<th>Total</th>
|
||||
<th>Payment</th>
|
||||
<th>Payment Method</th>
|
||||
<th>Items Won</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($checkout_complete_results as $c)
|
||||
<tr>
|
||||
<td>{{ $c->bidder_assigned_number }}</td>
|
||||
<td>{{ $c->bidder_fname }} {{ $c->bidder_lname }}</td>
|
||||
<td>{{ $c->bidder_lname }}</td>
|
||||
<td>{{ $c->bidder_fname }}</td>
|
||||
<td>{{ $c->bidder_addr }}</td>
|
||||
<td>{{ $c->bidder_city }}</td>
|
||||
<td>{{ $c->bidder_state }}</td>
|
||||
<td>{{ $c->bidder_zip }}</td>
|
||||
<td>{{ \App\Helpers\PhoneHelper::format($c->bidder_phone) }}</td>
|
||||
<td>{{ $c->bidder_email }}</td>
|
||||
<td>${{ number_format($c->winnertotal, 2) }}</td>
|
||||
<td>
|
||||
@if($c->payment_method == 1) Cash
|
||||
@elseif($c->payment_method == 2) Check ({{ $c->check_number }})
|
||||
@else Credit ({{ $c->cc_transaction }})
|
||||
@endif
|
||||
</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>
|
||||
<strong>#{{ $bid->items->item_assigned_num ?? '?' }}</strong> - {{ $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>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -1,34 +1,6 @@
|
||||
@extends('tablar::page')
|
||||
|
||||
@section('content')
|
||||
<script src="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/js/tom-select.complete.min.js"></script>
|
||||
<link href="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.min.css" rel="stylesheet">
|
||||
<style>
|
||||
.ts-wrapper .ts-control, .ts-wrapper .ts-control input { background-color: #ffffff !important; border: 1px solid #ced4da !important; }
|
||||
.ts-dropdown { background-color: #ffffff !important; }
|
||||
</style>
|
||||
<script>
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
document.querySelectorAll('select').forEach((el) => {
|
||||
if (el.tomselect) return;
|
||||
new TomSelect(el, {
|
||||
copyClassesToDropdown: false,
|
||||
dropdownParent: 'body',
|
||||
controlInput: '<input>',
|
||||
sortField: {
|
||||
field: 'text',
|
||||
direction: 'asc',
|
||||
func: function(a, b) {
|
||||
const numA = parseInt(a.text, 10);
|
||||
const numB = parseInt(b.text, 10);
|
||||
return numA - numB;
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="page-header d-print-none">
|
||||
<div class="container-xl">
|
||||
<div class="row g-2 align-items-center">
|
||||
@@ -48,7 +20,7 @@
|
||||
{{ csrf_field() }}
|
||||
<div class="col-md-6">
|
||||
<label for="bidder_num" class="form-label">Bidder</label>
|
||||
<select name="bidder_num" id="bidder_num" class="form-select" required>
|
||||
<select name="checkoutbiddernum" id="bidder_num" class="form-select" required>
|
||||
@foreach($bidders as $bidder)
|
||||
<option value="{{ $bidder->idbidders }}">{{ $bidder->bidder_assigned_number }} - {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</option>
|
||||
@endforeach
|
||||
@@ -65,3 +37,4 @@
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('components.tomselect')
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<div class="container-xl">
|
||||
<div class="row g-2 align-items-center">
|
||||
<div class="col">
|
||||
<h2 class="page-title">Edit Winners</h2>
|
||||
<h2 class="page-title">Edit Winner</h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -14,24 +14,53 @@
|
||||
<div class="container-xl">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
@if($winner)
|
||||
<form method="POST" action="/editwinners" class="row g-3">
|
||||
{{ csrf_field() }}
|
||||
<input type="hidden" name="winid" value="{{ $winner->idwinning_bids }}">
|
||||
|
||||
<div class="col-md-6">
|
||||
<label for="id" class="form-label">Winner ID</label>
|
||||
<input type="text" name="id" id="id" class="form-control" value="{{ $winner->id }}" readonly>
|
||||
<label for="winnerbiddernum" class="form-label">Bidder</label>
|
||||
<select name="winnerbiddernum" id="winnerbiddernum" class="form-select" required>
|
||||
@foreach($bidders as $bidder)
|
||||
<option value="{{ $bidder->idbidders }}" {{ $winner->winning_bidder_num == $bidder->idbidders ? 'selected' : '' }}>
|
||||
{{ $bidder->bidder_assigned_number }} - {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label for="score" class="form-label">Score</label>
|
||||
<input type="number" name="score" id="score" class="form-control" value="{{ $winner->score }}" required>
|
||||
<label for="winneritemnum" class="form-label">Item</label>
|
||||
<select name="winneritemnum" id="winneritemnum" class="form-select" required>
|
||||
@foreach($items as $item)
|
||||
<option value="{{ $item->iditems }}" {{ $winner->winning_item_num == $item->iditems ? 'selected' : '' }}>
|
||||
{{ $item->item_assigned_num }} - {{ $item->item_desc }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="winnerbid" class="form-label">Winning Amount</label>
|
||||
<input type="text" name="winnerbid" id="winnerbid" class="form-control" value="{{ $winner->winning_cost }}" required>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Update Score</button>
|
||||
<button type="submit" class="btn btn-primary">Update Winner</button>
|
||||
<a href="/winnersbyitem" class="btn btn-link">Cancel</a>
|
||||
</div>
|
||||
</form>
|
||||
@else
|
||||
<div class="alert alert-danger">
|
||||
Winner not found. <a href="/winnersbyitem">Back to list</a>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('components.tomselect')
|
||||
@push('js')
|
||||
@endpush
|
||||
|
||||
@@ -82,6 +82,21 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mt-4">
|
||||
<div class="col-12">
|
||||
<a href="https://hackathon.tfmm.co/mywinnings" target="_blank" class="btn btn-red btn-lg w-100 py-3 fs-2">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-credit-card me-2" width="32" height="32" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
|
||||
<path d="M3 5m0 3a3 3 0 0 1 3 -3h12a3 3 0 0 1 3 3v8a3 3 0 0 1 -3 3h-12a3 3 0 0 1 -3 -3z"></path>
|
||||
<path d="M3 10l18 0"></path>
|
||||
<path d="M7 15l.01 0"></path>
|
||||
<path d="M11 15l2 0"></path>
|
||||
</svg>
|
||||
Self-Checkout (Pay Online)
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
<div class="page-body">
|
||||
<div class="container-xl">
|
||||
<div class="card">
|
||||
<div id="payment-error-container"></div>
|
||||
<div class="card-body">
|
||||
<div id="checkout-container">
|
||||
<div class="text-center">
|
||||
@@ -33,6 +34,13 @@
|
||||
<div class="spinner-border" role="status"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="fallback-container" class="mt-4 text-center" style="display: none;">
|
||||
<div class="hr-text">Still here?</div>
|
||||
<p class="text-muted">If you have already completed your payment but the page hasn't redirected, please click the button below.</p>
|
||||
<a id="verify-button" href="#" class="btn btn-info">
|
||||
<i class="ti ti-shield-check me-2"></i>Verify Payment Status
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -67,19 +75,52 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// Set up fallback button
|
||||
const verifyUrl = `/north/verify/${bidderId}?sessionToken=${sessionToken}`;
|
||||
const verifyButton = document.getElementById('verify-button');
|
||||
const fallbackContainer = document.getElementById('fallback-container');
|
||||
verifyButton.href = verifyUrl;
|
||||
|
||||
// Show fallback after 5 seconds to give user a manual way out if auto-redirect fails
|
||||
setTimeout(() => {
|
||||
fallbackContainer.style.display = 'block';
|
||||
}, 5000);
|
||||
|
||||
await checkout.mount(sessionToken, 'checkout-container');
|
||||
|
||||
const handleCompletion = (result) => {
|
||||
window.location.href = `/north/verify/${bidderId}?sessionToken=${sessionToken}`;
|
||||
console.log('Payment complete event received:', result);
|
||||
window.location.href = verifyUrl;
|
||||
};
|
||||
|
||||
// Register standard completion events
|
||||
checkout.onPaymentComplete(handleCompletion);
|
||||
if (typeof checkout.onPaymentSuccess === 'function') {
|
||||
checkout.onPaymentSuccess(handleCompletion);
|
||||
}
|
||||
|
||||
// Handle errors
|
||||
if (typeof checkout.onPaymentError === 'function') {
|
||||
checkout.onPaymentError((error) => {
|
||||
console.error('Payment Error:', error);
|
||||
const errorDiv = document.createElement('div');
|
||||
errorDiv.className = 'alert alert-danger alert-dismissible';
|
||||
errorDiv.innerHTML = `
|
||||
<div class="d-flex">
|
||||
<div><i class="ti ti-alert-triangle me-2"></i></div>
|
||||
<div>
|
||||
<strong>Payment Error:</strong> ${error.message || 'An error occurred during payment.'}
|
||||
</div>
|
||||
</div>
|
||||
<a class="btn-close" data-bs-dismiss="alert" aria-label="close"></a>
|
||||
`;
|
||||
document.getElementById('payment-error-container').prepend(errorDiv);
|
||||
});
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('Checkout Error:', error);
|
||||
document.getElementById('checkout-container').innerHTML = '<div class="alert alert-danger">An error occurred. Please try again.</div>';
|
||||
document.getElementById('checkout-container').innerHTML = '<div class="alert alert-danger">An error occurred while initializing checkout. Please try again.</div>';
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -42,5 +42,6 @@
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('components.tomselect')
|
||||
@push('js')
|
||||
@endpush
|
||||
|
||||
@@ -20,7 +20,12 @@
|
||||
{{ csrf_field() }}
|
||||
<div class="col-md-6">
|
||||
<label for="reprintbiddernum" class="form-label">Bidder Number</label>
|
||||
<input type="text" name="reprintbiddernum" id="reprintbiddernum" class="form-control" required>
|
||||
<select name="reprintbiddernum" id="reprintbiddernum" class="form-select" required>
|
||||
<option value="">Select Bidder</option>
|
||||
@foreach($bidders as $bidder)
|
||||
<option value="{{ $bidder->idbidders }}">{{ $bidder->bidder_assigned_number }} - {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Reprint Receipt</button>
|
||||
@@ -33,5 +38,6 @@
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('components.tomselect')
|
||||
@push('js')
|
||||
@endpush
|
||||
|
||||
@@ -14,24 +14,38 @@
|
||||
<div class="container-xl">
|
||||
<div class="card">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-vcenter card-table" id="showcars-table">
|
||||
<table class="table table-vcenter card-table text-nowrap" id="showcars-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="sort" data-sort="bidder-num">Bidder #</th>
|
||||
<th class="sort" data-sort="bidder-num">#</th>
|
||||
<th class="sort" data-sort="lname">Last Name</th>
|
||||
<th class="sort" data-sort="fname">First Name</th>
|
||||
<th>Address</th>
|
||||
<th>City</th>
|
||||
<th>State</th>
|
||||
<th>Zip</th>
|
||||
<th>Phone</th>
|
||||
<th>Email</th>
|
||||
<th class="sort" data-sort="year">Year</th>
|
||||
<th class="sort" data-sort="make">Make</th>
|
||||
<th class="sort" data-sort="model">Model</th>
|
||||
<th class="sort" data-sort="year">Year</th>
|
||||
<th class="sort" data-sort="owner">Owner</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="list">
|
||||
@foreach($showcarlist_results as $vehicle)
|
||||
<tr>
|
||||
<td class="bidder-num">{{ $vehicle->bidder_assigned_number ?? 'N/A' }}</td>
|
||||
<td class="bidder-num">{{ $vehicle->bidder_assigned_number }}</td>
|
||||
<td class="lname">{{ $vehicle->bidder_lname }}</td>
|
||||
<td class="fname">{{ $vehicle->bidder_fname }}</td>
|
||||
<td>{{ $vehicle->bidder_addr }}</td>
|
||||
<td>{{ $vehicle->bidder_city }}</td>
|
||||
<td>{{ $vehicle->bidder_state }}</td>
|
||||
<td>{{ $vehicle->bidder_zip }}</td>
|
||||
<td>{{ \App\Helpers\PhoneHelper::format($vehicle->bidder_phone) }}</td>
|
||||
<td>{{ $vehicle->bidder_email }}</td>
|
||||
<td class="year">{{ $vehicle->year }}</td>
|
||||
<td class="make">{{ $vehicle->make }}</td>
|
||||
<td class="model">{{ $vehicle->model }}</td>
|
||||
<td class="year">{{ $vehicle->year }}</td>
|
||||
<td class="owner">{{ $vehicle->bidder_fname }} {{ $vehicle->bidder_lname }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
@@ -46,7 +60,7 @@
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/list.js/2.3.1/list.min.js"></script>
|
||||
<script>
|
||||
new List('showcars-table', {
|
||||
valueNames: ['bidder-num', 'make', 'model', 'year', 'owner']
|
||||
valueNames: ['bidder-num', 'lname', 'fname', 'year', 'make', 'model']
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
+22
-21
@@ -10,6 +10,19 @@
|
||||
<div class="card card-md">
|
||||
<div class="card-body">
|
||||
<h2 class="h2 text-center mb-4">Login to your account</h2>
|
||||
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success" role="alert">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if (session('error'))
|
||||
<div class="alert alert-danger" role="alert">
|
||||
{{ session('error') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<form action="{{route('login')}}" method="post" autocomplete="off" novalidate>
|
||||
@csrf
|
||||
<div class="mb-3">
|
||||
@@ -62,28 +75,16 @@
|
||||
<div class="hr-text">or</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col"><a href="#" class="btn btn-white w-100">
|
||||
<!-- Download SVG icon from http://tabler-icons.io/i/brand-github -->
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon text-github" width="24" height="24"
|
||||
viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
|
||||
stroke-linecap="round" stroke-linejoin="round">
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none"/>
|
||||
<path
|
||||
d="M9 19c-4.3 1.4 -4.3 -2.5 -6 -3m12 5v-3.5c0 -1 .1 -1.4 -.5 -2c2.8 -.3 5.5 -1.4 5.5 -6a4.6 4.6 0 0 0 -1.3 -3.2a4.2 4.2 0 0 0 -.1 -3.2s-1.1 -.3 -3.5 1.3a12.3 12.3 0 0 0 -6.2 0c-2.4 -1.6 -3.5 -1.3 -3.5 -1.3a4.2 4.2 0 0 0 -.1 3.2a4.6 4.6 0 0 0 -1.3 3.2c0 4.6 2.7 5.7 5.5 6c-.6 .6 -.6 1.2 -.5 2v3.5"/>
|
||||
<div class="col">
|
||||
<a href="{{ url('auth/social/oidc') }}" class="btn btn-white w-100">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-login" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
|
||||
<path d="M14 8v-2a2 2 0 0 0 -2 -2h-7a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h7a2 2 0 0 0 2 -2v-2"></path>
|
||||
<path d="M20 12h-13l3 -3m0 6l-3 -3"></path>
|
||||
</svg>
|
||||
Login with Github
|
||||
</a></div>
|
||||
<div class="col"><a href="#" class="btn btn-white w-100">
|
||||
<!-- Download SVG icon from http://tabler-icons.io/i/brand-twitter -->
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon text-twitter" width="24" height="24"
|
||||
viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
|
||||
stroke-linecap="round" stroke-linejoin="round">
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none"/>
|
||||
<path
|
||||
d="M22 4.01c-1 .49 -1.98 .689 -3 .99c-1.121 -1.265 -2.783 -1.335 -4.38 -.737s-2.643 2.06 -2.62 3.737v1c-3.245 .083 -6.135 -1.395 -8 -4c0 0 -4.182 7.433 4 11c-1.872 1.247 -3.739 2.088 -6 2c3.308 1.803 6.913 2.423 10.034 1.517c3.58 -1.04 6.522 -3.723 7.651 -7.742a13.84 13.84 0 0 0 .497 -3.753c-.002 -.249 1.51 -2.772 1.818 -4.013z"/>
|
||||
</svg>
|
||||
Login with Twitter
|
||||
</a></div>
|
||||
Login with Single Sign-On
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -76,6 +76,21 @@
|
||||
<button type="submit" class="btn btn-primary w-100">Create new account</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hr-text">or</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<a href="{{ url('auth/social/oidc') }}" class="btn btn-white w-100">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-login" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
|
||||
<path d="M14 8v-2a2 2 0 0 0 -2 -2h-7a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h7a2 2 0 0 0 2 -2v-2"></path>
|
||||
<path d="M20 12h-13l3 -3m0 6l-3 -3"></path>
|
||||
</svg>
|
||||
Login with Single Sign-On
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<div class="text-center text-muted mt-3">
|
||||
Already have account? <a href="{{route('login')}}" tabindex="-1">Sign in</a>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
@endif
|
||||
<!-- Page Error -->
|
||||
@include('tablar::error')
|
||||
@include('tablar::partials.footer.bottom')
|
||||
{{-- @include('tablar::partials.footer.bottom') --}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
<div class="navbar-nav flex-row order-md-last">
|
||||
<div class="d-none d-md-flex">
|
||||
@include('tablar::partials.header.theme-mode')
|
||||
@include('tablar::partials.header.notifications')
|
||||
{{-- @include('tablar::partials.header.notifications') --}}
|
||||
</div>
|
||||
@include('tablar::partials.header.top-right')
|
||||
</div>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<div class="d-none d-md-flex">
|
||||
@include('tablar::partials.header.theme-mode')
|
||||
@include('tablar::partials.header.notifications')
|
||||
{{-- @include('tablar::partials.header.notifications') --}}
|
||||
</div>
|
||||
|
||||
@include('tablar::partials.header.top-right')
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<a href="#">
|
||||
<img src="{{asset(config('tablar.auth_logo.img.path','assets/logo.svg'))}}" width="110" height="32"
|
||||
<img src="{{asset('assets/auction_logo.png')}}" width="220" height="64"
|
||||
alt="{{asset(config('tablar.title','Tablar'))}}"
|
||||
class="navbar-brand-image">
|
||||
class="navbar-brand-image" style="height: 64px !important; width: 220px !important;">
|
||||
</a>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="navbar-nav flex-row order-md-last">
|
||||
<div class="d-none d-md-flex">
|
||||
@include('tablar::partials.header.theme-mode')
|
||||
@include('tablar::partials.header.notifications')
|
||||
{{-- @include('tablar::partials.header.notifications') --}}
|
||||
</div>
|
||||
@include('tablar::partials.header.top-right')
|
||||
</div>
|
||||
|
||||
@@ -2,33 +2,23 @@
|
||||
<div class="nav-item dropdown">
|
||||
<a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown"
|
||||
aria-label="Open user menu">
|
||||
<span class="avatar">SE</span>
|
||||
<div class="d-none d-xl-block ps-2">
|
||||
<div>{{Auth()->user()->name}}</div>
|
||||
<div class="mt-1 small text-muted">Software Engineer</div>
|
||||
</div>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow">
|
||||
|
||||
@php( $logout_url = View::getSection('logout_url') ?? config('tablar.logout_url', 'logout') )
|
||||
@php( $profile_url = View::getSection('profile_url') ?? config('tablar.profile_url', 'logout') )
|
||||
@php( $setting_url = View::getSection('setting_url') ?? config('tablar.setting_url', 'home') )
|
||||
|
||||
@if (config('tablar.use_route_url', true))
|
||||
@php( $profile_url = $profile_url ? route($profile_url) : '' )
|
||||
@php( $logout_url = $logout_url ? route($logout_url) : '' )
|
||||
@php( $setting_url = $setting_url ? route($setting_url) : '' )
|
||||
@else
|
||||
@php( $profile_url = $profile_url ? url($profile_url) : '' )
|
||||
@php( $logout_url = $logout_url ? url($logout_url) : '' )
|
||||
@php( $setting_url = $setting_url ? url($setting_url) : '' )
|
||||
@endif
|
||||
|
||||
<a href="#" class="dropdown-item">Status</a>
|
||||
<a href="{{$profile_url}}" class="dropdown-item">Profile</a>
|
||||
<a href="#" class="dropdown-item">Feedback</a>
|
||||
<a href="{{ url('admin') }}" class="dropdown-item">Admin</a>
|
||||
<a href="{{ url('auth/social/oidc') }}" class="dropdown-item">Link OIDC Account</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="{{$setting_url}}" class="dropdown-item">Settings</a>
|
||||
<a class="dropdown-item"
|
||||
href="#" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
|
||||
<i class="fa fa-fw fa-power-off text-red"></i>
|
||||
@@ -44,4 +34,8 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="nav-item">
|
||||
<a class="nav-link" href="{{ route('login') }}">Login</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
<div class="d-none d-md-flex">
|
||||
@include('tablar::partials.header.theme-mode')
|
||||
@include('tablar::partials.header.notifications')
|
||||
{{-- @include('tablar::partials.header.notifications') --}}
|
||||
</div>
|
||||
|
||||
@include('tablar::partials.header.top-right')
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</div>
|
||||
<div class="d-none d-lg-flex">
|
||||
@include('tablar::partials.header.theme-mode')
|
||||
@include('tablar::partials.header.notifications')
|
||||
{{-- @include('tablar::partials.header.notifications') --}}
|
||||
</div>
|
||||
@include('tablar::partials.header.top-right')
|
||||
</div>
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="winning_cost" class="form-label">Winning Amount</label>
|
||||
<input type="number" name="winning_cost" id="winning_cost" step="0.01" class="form-control" required>
|
||||
<input type="text" name="winning_cost" id="winning_cost" class="form-control" required>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
@@ -54,5 +54,6 @@
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('components.tomselect')
|
||||
@push('js')
|
||||
@endpush
|
||||
|
||||
@@ -24,18 +24,21 @@
|
||||
<th class="sort" data-sort="item-desc">Item Description</th>
|
||||
<th class="sort" data-sort="winner">Winner</th>
|
||||
<th class="sort" data-sort="bid">Winning Bid</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="list">
|
||||
</thead>
|
||||
<tbody class="list">
|
||||
@foreach($winnersbyitem_results as $winner)
|
||||
<tr>
|
||||
<td class="item-num">{{ $winner->items->item_assigned_num }}</td>
|
||||
<td class="item-desc">{{ $winner->items->item_desc }}</td>
|
||||
<td class="winner">{{ $winner->bidders->bidder_fname }} {{ $winner->bidders->bidder_lname }}</td>
|
||||
<td class="bid">${{ number_format($winner->winning_cost, 2) }}</td>
|
||||
<td>
|
||||
<a href="/editwinners?id={{ $winner->idwinning_bids }}" class="btn btn-sm btn-white">Edit</a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
@endforeach </tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<div class="container-xl">
|
||||
<div class="row g-2 align-items-center">
|
||||
<div class="col">
|
||||
<h2 class="page-title">Reprint Receipt</h2>
|
||||
<h2 class="page-title">Winner Total</h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -19,8 +19,13 @@
|
||||
<form method="POST" action="/winnertotal" class="row g-3">
|
||||
{{ csrf_field() }}
|
||||
<div class="col-md-6">
|
||||
<label for="biddernum" class="form-label">Bidder Number</label>
|
||||
<input type="text" name="biddernum" id="biddernum" class="form-control" required>
|
||||
<label for="winnerbiddernum" class="form-label">Bidder Number</label>
|
||||
<select name="winnerbiddernum" id="winnerbiddernum" class="form-select" required>
|
||||
<option value="">Select Bidder</option>
|
||||
@foreach($bidders as $bidder)
|
||||
<option value="{{ $bidder->idbidders }}">{{ $bidder->bidder_assigned_number }} - {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Get Total</button>
|
||||
@@ -33,5 +38,6 @@
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@include('components.tomselect')
|
||||
@push('js')
|
||||
@endpush
|
||||
|
||||
Reference in New Issue
Block a user