Compare commits
159 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 24e2d91eb7 | |||
| 80545f38b3 | |||
| 1b30673823 | |||
| 3703ed569a | |||
| c63ca6626e | |||
| a7edc0115d | |||
| e8a31380f7 | |||
| 1ad8f53a95 | |||
| 05dad0ece0 | |||
| b5bbe4d1b5 | |||
| 2db4ad18e3 | |||
| 107223f2cc | |||
| 799eb37ae0 | |||
| d79d2fbe3e | |||
| 6e2c27a5a4 | |||
| 9e2c50a9ee | |||
| 239ee20397 | |||
| 7bf32dfdcc | |||
| f96b70684b | |||
| bd87475b4d | |||
| 6b1d87414e | |||
| 7a4b926aac | |||
| fb31d91476 | |||
| 55a05ef00e | |||
| a4483788cf | |||
| 2a6edc07f9 | |||
| ba6182e41e | |||
| 2cd8feb19d | |||
| b6ed1e8325 | |||
| 7a29315759 | |||
| 5f4b0c16a3 | |||
| 599b404791 | |||
| 3ddf99172e | |||
| 5c1b855283 | |||
| a4f26e9006 | |||
| 444b9e26db | |||
| 24905c9506 | |||
| 6cb3e1ac24 | |||
| 30dbbd6d58 | |||
| 6193e7fce4 | |||
| 2521246bda | |||
| b208af478d | |||
| 7d9af30ed3 | |||
| 46fbe7c98d | |||
| 87aa8d74d4 | |||
| 01a6d78333 | |||
| af49c71d72 | |||
| e74295fee4 | |||
| e47e20e49b | |||
| 365ebf112a | |||
| 8e6f4bdcfc | |||
| 597c11acd1 | |||
| ea0c1272d1 | |||
| 66e0e467df | |||
| 46c88ed22a | |||
| 4bd0ec6e35 | |||
| 68f3be7644 | |||
| e19c077203 | |||
| bb71e41459 | |||
| 1f4b108c51 | |||
| 762b242046 | |||
| 3cc39c4b3d | |||
| ef00695950 | |||
| 3f711effdc | |||
| 599dfb6f14 | |||
| 5049ed9777 | |||
| b564a63c67 | |||
| 3d95c63e63 | |||
| 72362d2d90 | |||
| 0c4df52f83 | |||
| c6a82f66ad | |||
| 760a3887b6 | |||
| 583b146f41 | |||
| 9526e17f09 | |||
| b82df0a0fb | |||
| 7598164ce4 | |||
| e813d2543f | |||
| 74d67d073e | |||
| e5dbe3e126 | |||
| 18e7c9b361 | |||
| bec2234bd4 | |||
| 492ff400c7 | |||
| d0a0149a75 | |||
| 10349075b0 | |||
| 44a34b1114 | |||
| bd93dd0bf7 | |||
| 81dbf11592 | |||
| 7c88db310d | |||
| 0fd6a6c3e2 | |||
| 01c1d77016 | |||
| 008000314f | |||
| a382a434d4 | |||
| 610ee4290b | |||
| 846db1accf | |||
| 78c2fbb41a | |||
| f130d39118 | |||
| 1adb557265 | |||
| 75aa121ac7 | |||
| 296a6b9243 | |||
| ccac39cd85 | |||
| 69e4516ad8 | |||
| f6aac32eaa | |||
| a60a89d77d | |||
| cec229459d | |||
| 2ae745ffea | |||
| bd52e27f76 | |||
| 9108b6bab6 | |||
| 58450a1262 | |||
| 878236ae2f | |||
| 05ab1c6014 | |||
| 9065dcd911 | |||
| dcd08ae530 | |||
| d468991bd1 | |||
| 7d1ec59dea | |||
| 24d1eda717 | |||
| 9d981f3a34 | |||
| b9c018a4a6 | |||
| 23b0b30434 | |||
| 4b9220c89e | |||
| 298f3fa22b | |||
| 98be7131f4 | |||
| 999c1dfc58 | |||
| a3fd278536 | |||
| 290498c728 | |||
| aca21ae115 | |||
| 982efbf2bd | |||
| 3953a6f4c8 | |||
| fbb10a01d4 | |||
| 6ccb754e0c | |||
| 50826c8c20 | |||
| 68f75ac2fc | |||
| 9587c44657 | |||
| 06de3c0145 | |||
| d2d53e961b | |||
| b0816231d6 | |||
| e4cccba942 | |||
| e023f68a84 | |||
| 4edb7fac10 | |||
| 19f93f95bb | |||
| 885161cc2b | |||
| a8fd03f256 | |||
| 00ff08e3a6 | |||
| 7e8b35bf20 | |||
| 681d8b73d6 | |||
| f294ded6e8 | |||
| eca564eac7 | |||
| e8df889f7e | |||
| ad02f65b54 | |||
| c2c9464133 | |||
| c0176f9924 | |||
| ffa8d30be4 | |||
| d64e1d5578 | |||
| ad66fef19b | |||
| 5a7684bc8c | |||
| aed29fbf56 | |||
| 816fba5121 | |||
| ddbfc642f2 | |||
| b6db2f200b | |||
| ef4ef144a6 |
@@ -33,3 +33,13 @@ MAIL_FROM_NAME=null
|
||||
PUSHER_APP_ID=
|
||||
PUSHER_APP_KEY=
|
||||
PUSHER_APP_SECRET=
|
||||
|
||||
OIDC_BASE_URL=
|
||||
OIDC_CLIENT_ID=
|
||||
OIDC_CLIENT_SECRET=
|
||||
OIDC_REDIRECT_URI="${APP_URL}/auth/social/oidc/callback"
|
||||
|
||||
NORTH_CHECKOUT_ID=
|
||||
NORTH_PROFILE_ID=
|
||||
NORTH_PRIVATE_API_KEY=
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
{"version":2,"defects":{"Tests\\Feature\\MyWinningsTest::test_mywinnings_form_is_accessible":8,"Tests\\Feature\\MyWinningsTest::test_mywinnings_results_show_correct_data":8,"Tests\\Feature\\MyWinningsTest::test_mywinnings_invalid_bidder_shows_error":8},"times":{"Tests\\Unit\\PhoneFormattingTest::it_formats_a_10_digit_phone_number":0.018,"Tests\\Unit\\PhoneFormattingTest::it_strips_non_numeric_characters_before_formatting":0,"Tests\\Unit\\PhoneFormattingTest::it_returns_original_value_if_not_10_digits":0,"Tests\\Unit\\PhoneFormattingTest::bidder_model_accessor_formats_phone_number":0.003}}
|
||||
@@ -57,7 +57,8 @@ class BiddersResource extends Resource
|
||||
TextColumn::make('bidder_city')->label('City')->sortable(),
|
||||
TextColumn::make('bidder_state')->label('State')->sortable(),
|
||||
TextColumn::make('bidder_zip')->label('Zip')->sortable(),
|
||||
TextColumn::make('bidder_phone')->label('Phone Number')->sortable(),
|
||||
TextColumn::make('bidder_phone')->label('Phone Number')->sortable()
|
||||
->formatStateUsing(fn ($state) => \App\Helpers\PhoneHelper::format($state)),
|
||||
TextColumn::make('bidder_email')->label('Email')->sortable(),
|
||||
])
|
||||
->filters([
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Resources;
|
||||
|
||||
use App\User;
|
||||
use Filament\Resources\Resource;
|
||||
use Filament\Tables\Table;
|
||||
use Filament\Tables;
|
||||
use Filament\Tables\Columns\TextColumn;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Schemas\Schema;
|
||||
use Filament\Actions\EditAction;
|
||||
use Filament\Actions\BulkActionGroup;
|
||||
use Filament\Actions\DeleteBulkAction;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use BackedEnum;
|
||||
|
||||
class UserResource extends Resource
|
||||
{
|
||||
protected static ?string $model = User::class;
|
||||
|
||||
protected static ?string $recordTitleAttribute = 'name';
|
||||
|
||||
protected static string | BackedEnum | null $navigationIcon = 'heroicon-o-users';
|
||||
|
||||
public static function form(Schema $schema): Schema
|
||||
{
|
||||
return $schema
|
||||
->components([
|
||||
TextInput::make('name')
|
||||
->required()
|
||||
->maxLength(255),
|
||||
TextInput::make('email')
|
||||
->email()
|
||||
->required()
|
||||
->maxLength(255),
|
||||
TextInput::make('provider_name')
|
||||
->label('OIDC Provider')
|
||||
->disabled(),
|
||||
TextInput::make('provider_id')
|
||||
->label('OIDC ID')
|
||||
->disabled(),
|
||||
]);
|
||||
}
|
||||
|
||||
public static function table(Table $table): Table
|
||||
{
|
||||
return $table
|
||||
->columns([
|
||||
TextColumn::make('name')->sortable()->searchable(),
|
||||
TextColumn::make('email')->sortable()->searchable(),
|
||||
TextColumn::make('provider_name')->label('OIDC Provider'),
|
||||
TextColumn::make('provider_id')->label('OIDC ID'),
|
||||
TextColumn::make('created_at')->dateTime()->sortable(),
|
||||
])
|
||||
->filters([
|
||||
//
|
||||
])
|
||||
->recordActions([
|
||||
EditAction::make(),
|
||||
])
|
||||
->toolbarActions([
|
||||
BulkActionGroup::make([
|
||||
DeleteBulkAction::make(),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
public static function getPages(): array
|
||||
{
|
||||
return [
|
||||
'index' => UserResource\Pages\ListUsers::route('/'),
|
||||
'create' => UserResource\Pages\CreateUsers::route('/create'),
|
||||
'edit' => UserResource\Pages\EditUsers::route('/{record}/edit'),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Resources\UserResource\Pages;
|
||||
|
||||
use App\Filament\Resources\UserResource;
|
||||
use Filament\Resources\Pages\CreateRecord;
|
||||
|
||||
class CreateUsers extends CreateRecord
|
||||
{
|
||||
protected static string $resource = UserResource::class;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Resources\UserResource\Pages;
|
||||
|
||||
use App\Filament\Resources\UserResource;
|
||||
use Filament\Resources\Pages\EditRecord;
|
||||
|
||||
class EditUsers extends EditRecord
|
||||
{
|
||||
protected static string $resource = UserResource::class;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Resources\UserResource\Pages;
|
||||
|
||||
use App\Filament\Resources\UserResource;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
|
||||
class ListUsers extends ListRecords
|
||||
{
|
||||
protected static string $resource = UserResource::class;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
<?php
|
||||
namespace App\Helpers;
|
||||
|
||||
class PhoneHelper
|
||||
{
|
||||
public static function format($phone)
|
||||
{
|
||||
$phone = preg_replace('/[^0-9]/', '', $phone);
|
||||
if (strlen($phone) == 10) {
|
||||
return preg_replace('/([0-9]{3})([0-9]{3})([0-9]{4})/', '$1-$2-$3', $phone);
|
||||
}
|
||||
return $phone;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Laravel\Socialite\Facades\Socialite;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class SocialiteController extends Controller
|
||||
{
|
||||
public function redirectToProvider($provider)
|
||||
{
|
||||
return Socialite::driver($provider)->redirect();
|
||||
}
|
||||
|
||||
public function handleProviderCallback($provider)
|
||||
{
|
||||
try {
|
||||
$socialUser = Socialite::driver($provider)->user();
|
||||
} catch (\Exception $e) {
|
||||
return redirect('/login')->with('error', 'Authentication failed.');
|
||||
}
|
||||
|
||||
if (Auth::check()) {
|
||||
$user = Auth::user();
|
||||
$user->update([
|
||||
'provider_name' => $provider,
|
||||
'provider_id' => $socialUser->getId(),
|
||||
]);
|
||||
|
||||
return redirect()->intended('/admin')->with('status', 'Account linked successfully!');
|
||||
}
|
||||
|
||||
// Find user by provider_id
|
||||
$user = User::where('provider_name', $provider)
|
||||
->where('provider_id', $socialUser->getId())
|
||||
->first();
|
||||
|
||||
if (!$user) {
|
||||
// Find user by email to link
|
||||
$user = User::where('email', $socialUser->getEmail())->first();
|
||||
|
||||
if ($user) {
|
||||
// Link the account
|
||||
$user->update([
|
||||
'provider_name' => $provider,
|
||||
'provider_id' => $socialUser->getId(),
|
||||
]);
|
||||
} else {
|
||||
// Optionally create a new user
|
||||
$user = User::create([
|
||||
'name' => $socialUser->getName() ?? $socialUser->getNickname() ?? $socialUser->getEmail(),
|
||||
'email' => $socialUser->getEmail(),
|
||||
'provider_name' => $provider,
|
||||
'provider_id' => $socialUser->getId(),
|
||||
'password' => bcrypt(Str::random(24)),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Auth::login($user);
|
||||
|
||||
return redirect()->intended('/admin'); // Redirect to filament admin or home
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Bidders;
|
||||
use App\Models\Checkout;
|
||||
use App\Models\WinningBids;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class NorthCheckoutController extends Controller
|
||||
{
|
||||
public function checkout(Request $request, $bidder_id)
|
||||
{
|
||||
$bidder = Bidders::where('idbidders', $bidder_id)->firstOrFail();
|
||||
|
||||
// Check if already checked out
|
||||
if (Checkout::where('bidder_num', $bidder->idbidders)->exists()) {
|
||||
return redirect('/mywinnings?bidder_number=' . $bidder->bidder_assigned_number)->with('error', 'Bidder has already checked out.');
|
||||
}
|
||||
|
||||
$winnings = WinningBids::where('winning_bidder_num', $bidder->idbidders)->get();
|
||||
$total_cost = $winnings->sum('winning_cost');
|
||||
|
||||
if ($total_cost <= 0) {
|
||||
return redirect('/mywinnings?bidder_number=' . $bidder->bidder_assigned_number)->with('error', 'No winnings found for this bidder.');
|
||||
}
|
||||
|
||||
return view('north_checkout', [
|
||||
'bidder' => $bidder,
|
||||
'total_cost' => $total_cost,
|
||||
]);
|
||||
}
|
||||
|
||||
public function createSession(Request $request, $bidder_id)
|
||||
{
|
||||
$bidder = Bidders::findOrFail($bidder_id);
|
||||
$winnings = WinningBids::with('items')->where('winning_bidder_num', $bidder->idbidders)->get();
|
||||
$total_cost = $winnings->sum('winning_cost');
|
||||
|
||||
$products = $winnings->map(function($winning) {
|
||||
return [
|
||||
'name' => $winning->items->item_desc ?? 'Auction Item',
|
||||
'price' => (float)$winning->winning_cost,
|
||||
'quantity' => 1
|
||||
];
|
||||
})->toArray();
|
||||
|
||||
$apiKey = config('services.north.private_api_key');
|
||||
$checkoutId = config('services.north.checkout_id');
|
||||
$profileId = config('services.north.profile_id');
|
||||
|
||||
if (!$apiKey || !$checkoutId || !$profileId) {
|
||||
return response()->json(['error' => 'North configuration missing.'], 500);
|
||||
}
|
||||
|
||||
$response = Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $apiKey,
|
||||
'Accept' => 'application/json',
|
||||
'Content-Type' => 'application/json',
|
||||
])->post('https://checkout.north.com/api/sessions', [
|
||||
'checkoutId' => $checkoutId,
|
||||
'profileId' => $profileId,
|
||||
'amount' => (float)$total_cost,
|
||||
'products' => $products,
|
||||
]);
|
||||
|
||||
if ($response->failed()) {
|
||||
Log::error('North Session Creation Failed: ' . $response->status() . ' ' . $response->body());
|
||||
return response()->json([
|
||||
'error' => 'Failed to create checkout session: ' . ($response->json('message') ?? 'Unknown error'),
|
||||
'status' => $response->status(),
|
||||
'body' => $response->body()
|
||||
], 500);
|
||||
}
|
||||
|
||||
$data = $response->json();
|
||||
|
||||
// If json() is null but body is not empty, it might be a parsing error
|
||||
if (is_null($data) && !empty($response->body())) {
|
||||
Log::error('North Session Response is not JSON: ' . $response->body());
|
||||
return response()->json([
|
||||
'error' => 'Response from North is not valid JSON.',
|
||||
'raw_body' => $response->body()
|
||||
], 500);
|
||||
}
|
||||
|
||||
$token = $data['token'] ??
|
||||
$data['sessionToken'] ??
|
||||
$data['id'] ??
|
||||
$data['session_id'] ??
|
||||
($data['session']['id'] ?? null);
|
||||
|
||||
if (!$token) {
|
||||
Log::error('North Session Token Missing in Response: ' . json_encode($data));
|
||||
return response()->json([
|
||||
'error' => 'Session token not found in API response.',
|
||||
'debug_response' => $data,
|
||||
'raw_body' => $response->body()
|
||||
], 500);
|
||||
}
|
||||
|
||||
return response()->json(['sessionToken' => $token]);
|
||||
}
|
||||
|
||||
public function verify(Request $request, $bidder_id)
|
||||
{
|
||||
$bidder = Bidders::findOrFail($bidder_id);
|
||||
$sessionToken = $request->query('sessionToken');
|
||||
if (!$sessionToken) {
|
||||
return redirect('/mywinnings?bidder_number=' . $bidder->bidder_assigned_number)->with('error', 'Missing session token.');
|
||||
}
|
||||
|
||||
$apiKey = config('services.north.private_api_key');
|
||||
$checkoutId = config('services.north.checkout_id');
|
||||
$profileId = config('services.north.profile_id');
|
||||
|
||||
$response = Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . $apiKey,
|
||||
'SessionToken' => $sessionToken,
|
||||
'CheckoutId' => $checkoutId,
|
||||
'ProfileId' => $profileId,
|
||||
'Accept' => 'application/json',
|
||||
])->get('https://checkout.north.com/api/sessions/status');
|
||||
|
||||
if ($response->failed()) {
|
||||
Log::error('North Session Verification Failed: ' . $response->status() . ' ' . $response->body());
|
||||
return redirect('/mywinnings?bidder_number=' . $bidder->bidder_assigned_number)->with('error', 'Failed to verify payment status. Status: ' . $response->status());
|
||||
}
|
||||
|
||||
$status = $response->json();
|
||||
$currentStatus = $status['status'] ?? '';
|
||||
|
||||
// The North API status check might return Approved, completed, success, authorized, or captured.
|
||||
$successStatuses = ['approved', 'completed', 'success', 'authorized', 'captured'];
|
||||
|
||||
if (in_array(strtolower($currentStatus), $successStatuses)) {
|
||||
// Check if already checked out to avoid duplicates
|
||||
$existingCheckout = Checkout::where('bidder_num', $bidder->idbidders)->first();
|
||||
|
||||
if (!$existingCheckout) {
|
||||
// According to docs, when status is Approved, transaction details are in 'body'
|
||||
// Digital wallets might have these at the top level
|
||||
$body = $status['body'] ?? [];
|
||||
$winnertotal = $status['amount'] ??
|
||||
($body['amount'] ??
|
||||
($status['amount_total'] ??
|
||||
WinningBids::where('winning_bidder_num', $bidder->idbidders)->sum('winning_cost')));
|
||||
|
||||
$payment_method = 3; // Credit Card
|
||||
$cc_transaction = $body['auth_guid'] ??
|
||||
($status['transaction_id'] ??
|
||||
($status['transactionId'] ??
|
||||
($status['id'] ?? 'NORTH_EC')));
|
||||
|
||||
$cc_amount = $winnertotal;
|
||||
$check_number = null;
|
||||
|
||||
$checkout_id = DB::table('checkout')->insertGetID(
|
||||
[
|
||||
'bidder_num' => $bidder->idbidders,
|
||||
'winnertotal' => $winnertotal,
|
||||
'payment_method' => $payment_method,
|
||||
'check_number' => $check_number,
|
||||
'cc_transaction' => $cc_transaction,
|
||||
'cc_amount' => $cc_amount,
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]
|
||||
);
|
||||
} else {
|
||||
$checkout_id = $existingCheckout->checkout_id;
|
||||
$payment_method = $existingCheckout->payment_method;
|
||||
$cc_transaction = $existingCheckout->cc_transaction;
|
||||
$check_number = $existingCheckout->check_number;
|
||||
}
|
||||
|
||||
// Replicate the data for checkout_complete view
|
||||
$checkout_list_results = DB::select("SELECT
|
||||
*, items.item_assigned_num, items.item_desc
|
||||
FROM winning_bids
|
||||
INNER JOIN items AS items
|
||||
ON winning_bids.winning_item_num=items.iditems
|
||||
WHERE winning_bidder_num = $bidder->idbidders
|
||||
");
|
||||
|
||||
$checkout_info_results = DB::select("SELECT
|
||||
winning_bids.*,
|
||||
bidders.*,
|
||||
sum(winning_cost) AS total_cost
|
||||
FROM winning_bids
|
||||
INNER JOIN bidders AS bidders
|
||||
ON winning_bids.winning_bidder_num=bidders.idbidders
|
||||
WHERE winning_bidder_num = $bidder->idbidders
|
||||
GROUP BY winning_bids.winning_bidder_num
|
||||
");
|
||||
|
||||
return view('checkout_complete', [
|
||||
'checkout_result' => $checkout_id,
|
||||
'checkout_list_results' => $checkout_list_results,
|
||||
'checkout_info_results' => $checkout_info_results,
|
||||
'payment_method' => $payment_method,
|
||||
'check_number' => $check_number,
|
||||
'cc_transaction' => $cc_transaction
|
||||
]);
|
||||
}
|
||||
|
||||
return redirect('/mywinnings?bidder_number=' . $bidder->bidder_assigned_number)->with('error', 'Payment not completed. Status: ' . ($status['status'] ?? 'unknown'));
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use View;
|
||||
use App\helpers;
|
||||
use PDF;
|
||||
use Spatie\LaravelPdf\Facades\Pdf;
|
||||
use App\Models\Bidders;
|
||||
use App\Models\Items;
|
||||
use App\Models\Checkout;
|
||||
@@ -19,7 +19,7 @@ use App\Models\CarShowCategory;
|
||||
use App\Models\Types;
|
||||
use App\Models\Vehicles;
|
||||
use App\Models\VehicleScores;
|
||||
|
||||
use Dompdf\Dompdf;
|
||||
class PagesController extends Controller
|
||||
{
|
||||
public function home()
|
||||
@@ -81,7 +81,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
|
||||
@@ -250,6 +251,49 @@ class PagesController extends Controller
|
||||
return view('receiptpdf', $checkout_data);
|
||||
}
|
||||
|
||||
public function downloadReceiptPdf(Request $request)
|
||||
{
|
||||
$checkoutid = $request->checkout_id;
|
||||
$checkout_final_results = Checkout::where('checkout_id', '=', $checkoutid)->first();
|
||||
if (!$checkout_final_results) {
|
||||
return redirect('/mywinnings')->with('error', 'Checkout record not found.');
|
||||
}
|
||||
|
||||
$bidder_num = $checkout_final_results->bidder_num;
|
||||
$checkout_list_results = DB::select("SELECT
|
||||
*, items.item_assigned_num, items.item_desc
|
||||
FROM winning_bids
|
||||
INNER JOIN items AS items ON winning_bids.winning_item_num=items.iditems
|
||||
WHERE winning_bidder_num = $bidder_num
|
||||
");
|
||||
$checkout_info_results = DB::select("SELECT
|
||||
winning_bids.*,
|
||||
bidders.*,
|
||||
sum(winning_cost) AS total_cost
|
||||
FROM winning_bids
|
||||
INNER JOIN bidders AS bidders ON winning_bids.winning_bidder_num=bidders.idbidders
|
||||
WHERE winning_bidder_num = $bidder_num
|
||||
GROUP BY winning_bids.winning_bidder_num
|
||||
");
|
||||
|
||||
$options = new \Dompdf\Options();
|
||||
$options->set('isHtml5ParserEnabled', true);
|
||||
$options->set('isRemoteEnabled', true);
|
||||
$dompdf = new Dompdf($options);
|
||||
|
||||
$html = view('receiptpdf', [
|
||||
'checkout_final_results' => $checkout_final_results,
|
||||
'checkout_list_results' => $checkout_list_results,
|
||||
'checkout_info_results' => $checkout_info_results
|
||||
])->render();
|
||||
|
||||
$dompdf->loadHtml($html);
|
||||
$dompdf->setPaper('letter', 'portrait');
|
||||
$dompdf->render();
|
||||
|
||||
return $dompdf->stream('receipt-'.$checkoutid.'.pdf');
|
||||
}
|
||||
|
||||
public function reprintReceipt(Request $reprint_receipt_req)
|
||||
{
|
||||
if (!$reprint_receipt_req->reprintbiddernum) {
|
||||
@@ -291,15 +335,7 @@ 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'])->get();
|
||||
return view('winnersbyitem', ['winnersbyitem_results' => $winnersbyitem_results]);
|
||||
}
|
||||
|
||||
@@ -334,37 +370,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;
|
||||
@@ -515,4 +555,33 @@ class PagesController extends Controller
|
||||
//dd($showcarlist_results);
|
||||
return view('showcarlist', ['showcarlist_results' => $showcarlist_results]);
|
||||
}
|
||||
|
||||
public function myWinnings(Request $request)
|
||||
{
|
||||
if (!$request->bidder_number) {
|
||||
return view('mywinnings_form');
|
||||
}
|
||||
|
||||
$bidder_number = $request->bidder_number;
|
||||
$bidder = Bidders::where('bidder_assigned_number', $bidder_number)->first();
|
||||
|
||||
if (!$bidder) {
|
||||
return view('mywinnings_form', ['error' => 'Bidder number not found.']);
|
||||
}
|
||||
|
||||
$winnings = WinningBids::with('items')
|
||||
->where('winning_bidder_num', $bidder->idbidders)
|
||||
->get();
|
||||
|
||||
$total_cost = $winnings->sum('winning_cost');
|
||||
|
||||
$is_checked_out = \App\Models\Checkout::where('bidder_num', $bidder->idbidders)->exists();
|
||||
|
||||
return view('mywinnings_results', [
|
||||
'bidder' => $bidder,
|
||||
'winnings' => $winnings,
|
||||
'total_cost' => $total_cost,
|
||||
'is_checked_out' => $is_checked_out
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ class WinningBids extends Model
|
||||
|
||||
public function items()
|
||||
{
|
||||
return $this->hasOne(Items::class, 'iditems', 'winning_item_num');
|
||||
return $this->belongsTo(Items::class, 'winning_item_num', 'iditems');
|
||||
}
|
||||
|
||||
public function bidders()
|
||||
|
||||
@@ -16,6 +16,9 @@ class EventServiceProvider extends ServiceProvider
|
||||
'App\Events\Event' => [
|
||||
'App\Listeners\EventListener',
|
||||
],
|
||||
\SocialiteProviders\Manager\SocialiteWasCalled::class => [
|
||||
\SocialiteProviders\OIDC\OIDCExtendSocialite::class.'@handle',
|
||||
],
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@@ -18,8 +18,41 @@ use Illuminate\Routing\Middleware\SubstituteBindings;
|
||||
use Illuminate\Session\Middleware\StartSession;
|
||||
use Illuminate\View\Middleware\ShareErrorsFromSession;
|
||||
|
||||
use Filament\Support\Facades\FilamentView;
|
||||
use Illuminate\Support\Facades\Blade;
|
||||
|
||||
use Filament\Navigation\MenuItem;
|
||||
|
||||
use Filament\Facades\Filament;
|
||||
|
||||
class AdminPanelProvider extends PanelProvider
|
||||
{
|
||||
public function boot()
|
||||
{
|
||||
FilamentView::registerRenderHook(
|
||||
'panels::auth.login.form.after',
|
||||
fn (): string => Blade::render('
|
||||
<div class="mt-4">
|
||||
<x-filament::button
|
||||
:href="url(\'auth/social/oidc\')"
|
||||
tag="a"
|
||||
color="info"
|
||||
class="w-full"
|
||||
>
|
||||
Login with OIDC
|
||||
</x-filament::button>
|
||||
</div>
|
||||
'),
|
||||
);
|
||||
|
||||
Filament::registerUserMenuItems([
|
||||
MenuItem::make()
|
||||
->label('Link OIDC Account')
|
||||
->icon('heroicon-o-link')
|
||||
->url(fn (): string => url('auth/social/oidc')),
|
||||
]);
|
||||
}
|
||||
|
||||
public function panel(Panel $panel): Panel
|
||||
{
|
||||
return $panel
|
||||
@@ -27,6 +60,13 @@ class AdminPanelProvider extends PanelProvider
|
||||
->id('admin')
|
||||
->path('admin')
|
||||
->login()
|
||||
->profile()
|
||||
->userMenuItems([
|
||||
'oidc' => MenuItem::make()
|
||||
->label('Link OIDC Account')
|
||||
->icon('heroicon-o-link')
|
||||
->url(fn (): string => url('auth/social/oidc')),
|
||||
])
|
||||
->brandName(env('APP_NAME'))
|
||||
->homeUrl('/')
|
||||
->colors([
|
||||
|
||||
@@ -18,7 +18,7 @@ class User extends Authenticatable implements FilamentUser, HasName
|
||||
* @var array
|
||||
*/
|
||||
protected $fillable = [
|
||||
'name', 'email', 'password',
|
||||
'name', 'email', 'password', 'provider_name', 'provider_id',
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,13 +5,19 @@
|
||||
"license": "MIT",
|
||||
"type": "project",
|
||||
"require": {
|
||||
"php": "^8.2",
|
||||
"php": "^8.3",
|
||||
"barryvdh/laravel-snappy": "^1.0",
|
||||
"carlos-meneses/laravel-mpdf": "^2.1",
|
||||
"dompdf/dompdf": "^3.1",
|
||||
"filament/filament": "^5.0",
|
||||
"laravel/framework": "^11.0",
|
||||
"kovah/laravel-socialite-oidc": "^0.7.0",
|
||||
"laravel/framework": "^12.0",
|
||||
"laravel/socialite": "^5.26",
|
||||
"laravel/tinker": "^2.9",
|
||||
"laravel/ui": "^4.2"
|
||||
"laravel/ui": "^4.2",
|
||||
"socialiteproviders/manager": "^4.9",
|
||||
"spatie/laravel-pdf": "^2.8",
|
||||
"takielias/tablar": "^13.02"
|
||||
},
|
||||
"require-dev": {
|
||||
"barryvdh/laravel-debugbar": "^3.8",
|
||||
@@ -66,5 +72,7 @@
|
||||
"preferred-install": "dist",
|
||||
"sort-packages": true,
|
||||
"optimize-autoloader": true
|
||||
}
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"prefer-stable": true
|
||||
}
|
||||
|
||||
@@ -35,4 +35,17 @@ return [
|
||||
'secret' => env('STRIPE_SECRET'),
|
||||
],
|
||||
|
||||
'oidc' => [
|
||||
'base_url' => env('OIDC_BASE_URL'),
|
||||
'client_id' => env('OIDC_CLIENT_ID'),
|
||||
'client_secret' => env('OIDC_CLIENT_SECRET'),
|
||||
'redirect' => env('OIDC_REDIRECT_URI'),
|
||||
],
|
||||
|
||||
'north' => [
|
||||
'checkout_id' => env('NORTH_CHECKOUT_ID'),
|
||||
'profile_id' => env('NORTH_PROFILE_ID'),
|
||||
'private_api_key' => env('NORTH_PRIVATE_API_KEY'),
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
@@ -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',
|
||||
],
|
||||
],
|
||||
],
|
||||
],
|
||||
];
|
||||
@@ -23,14 +23,131 @@ $factory->define(App\User::class, function (Faker\Generator $faker) {
|
||||
];
|
||||
});
|
||||
|
||||
//Bidder
|
||||
$factory->define(App\Models\Bidder::class, function (Faker\Generator $faker) {
|
||||
static $password;
|
||||
|
||||
// Bidders
|
||||
$factory->define(App\Models\Bidders::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'name' => $faker->name,
|
||||
'email' => $faker->unique()->safeEmail,
|
||||
'password' => $password ?: $password = bcrypt('secret'),
|
||||
'remember_token' => str_random(10),
|
||||
'bidder_fname' => $faker->firstName,
|
||||
'bidder_lname' => $faker->lastName,
|
||||
'bidder_addr' => $faker->streetAddress,
|
||||
'bidder_city' => $faker->city,
|
||||
'bidder_state' => $faker->stateAbbr,
|
||||
'bidder_zip' => $faker->postcode,
|
||||
'bidder_phone' => $faker->phoneNumber,
|
||||
'bidder_email' => $faker->unique()->safeEmail,
|
||||
'bidder_assigned_number' => $faker->unique()->numberBetween(1, 1000),
|
||||
];
|
||||
});
|
||||
|
||||
// Items
|
||||
$factory->define(App\Models\Items::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'item_desc' => $faker->sentence(3),
|
||||
'item_min_bid' => $faker->numberBetween(10, 100),
|
||||
'item_est_value' => $faker->numberBetween(50, 500),
|
||||
'item_assigned_num' => $faker->unique()->numberBetween(1, 500),
|
||||
];
|
||||
});
|
||||
|
||||
// CarShowCategory
|
||||
$factory->define(App\Models\CarShowCategory::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'category_name' => $faker->words(2, true),
|
||||
'vehicle_type' => $faker->boolean,
|
||||
];
|
||||
});
|
||||
|
||||
// Vehicles
|
||||
$factory->define(App\Models\Vehicles::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'year' => $faker->year,
|
||||
'make' => $faker->company,
|
||||
'model' => $faker->word,
|
||||
'type' => function () {
|
||||
return factory(App\Models\CarShowCategory::class)->create()->id;
|
||||
},
|
||||
'doNotJudge' => $faker->boolean,
|
||||
'owner' => function () {
|
||||
return factory(App\Models\Bidders::class)->create()->bidder_assigned_number;
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
// PaymentMethods
|
||||
$factory->define(App\Models\PaymentMethods::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'pm_name' => $faker->randomElement(['Cash', 'Check', 'Credit Card']),
|
||||
];
|
||||
});
|
||||
|
||||
// Judges
|
||||
$factory->define(App\Models\Judges::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'judge_number' => $faker->unique()->numberBetween(1, 50),
|
||||
];
|
||||
});
|
||||
|
||||
// VehicleScores
|
||||
$factory->define(App\Models\VehicleScores::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'judge' => function () {
|
||||
return factory(App\Models\Judges::class)->create()->id;
|
||||
},
|
||||
'overall_score' => $faker->numberBetween(1, 100),
|
||||
'vehicle' => function () {
|
||||
return factory(App\Models\Vehicles::class)->create()->id;
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
// PeoplesChoice
|
||||
$factory->define(App\Models\PeoplesChoice::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'vehicle' => function () {
|
||||
return factory(App\Models\Vehicles::class)->create()->id;
|
||||
},
|
||||
'pc_count' => $faker->numberBetween(0, 50),
|
||||
];
|
||||
});
|
||||
|
||||
// WinningBids
|
||||
$factory->define(App\Models\WinningBids::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'winning_bidder_num' => function () {
|
||||
return factory(App\Models\Bidders::class)->create()->idbidders;
|
||||
},
|
||||
'winning_cost' => $faker->numberBetween(10, 1000),
|
||||
'winning_item_num' => function () {
|
||||
return factory(App\Models\Items::class)->create()->iditems;
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
// Checkout
|
||||
$factory->define(App\Models\Checkout::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'bidder_num' => function () {
|
||||
return factory(App\Models\Bidders::class)->create()->idbidders;
|
||||
},
|
||||
'winnertotal' => $faker->numberBetween(10, 2000),
|
||||
'payment_method' => function () {
|
||||
return factory(App\Models\PaymentMethods::class)->create()->pm_id;
|
||||
},
|
||||
'check_number' => $faker->optional()->numberBetween(100, 999),
|
||||
'cc_transaction' => $faker->optional()->uuid,
|
||||
'cc_amount' => $faker->optional()->numberBetween(10, 2000),
|
||||
];
|
||||
});
|
||||
|
||||
// CarShowWinner
|
||||
$factory->define(App\Models\CarShowWinner::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'vehicle' => function () {
|
||||
return factory(App\Models\Vehicles::class)->create()->id;
|
||||
},
|
||||
'category' => function () {
|
||||
return factory(App\Models\CarShowCategory::class)->create()->id;
|
||||
},
|
||||
'place' => $faker->numberBetween(1, 3),
|
||||
'total_score' => $faker->numberBetween(50, 300),
|
||||
];
|
||||
});
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->string('provider_name')->nullable();
|
||||
$table->string('provider_id')->nullable();
|
||||
$table->unique(['provider_name', 'provider_id']);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->dropUnique(['provider_name', 'provider_id']);
|
||||
$table->dropColumn(['provider_name', 'provider_id']);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\Bidders;
|
||||
|
||||
class BiddersTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
factory(Bidders::class, 50)->create();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\CarShowCategory;
|
||||
|
||||
class CarShowCategoryTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
factory(CarShowCategory::class, 10)->create();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\CarShowWinner;
|
||||
use App\Models\Vehicles;
|
||||
use App\Models\CarShowCategory;
|
||||
|
||||
class CarShowWinnerTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
$categories = CarShowCategory::all();
|
||||
$vehicles = Vehicles::all();
|
||||
|
||||
foreach ($categories as $category) {
|
||||
for ($i = 1; $i <= 3; $i++) {
|
||||
factory(CarShowWinner::class)->create([
|
||||
'category' => $category->id,
|
||||
'vehicle' => $vehicles->random()->id,
|
||||
'place' => $i,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\Checkout;
|
||||
use App\Models\Bidders;
|
||||
use App\Models\PaymentMethods;
|
||||
|
||||
class CheckoutTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
$bidders = Bidders::all();
|
||||
$paymentMethods = PaymentMethods::all();
|
||||
|
||||
foreach ($bidders as $bidder) {
|
||||
if (rand(0, 1)) {
|
||||
factory(Checkout::class)->create([
|
||||
'bidder_num' => $bidder->idbidders,
|
||||
'payment_method' => $paymentMethods->random()->pm_id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,17 @@ class DatabaseSeeder extends Seeder
|
||||
*/
|
||||
public function run()
|
||||
{
|
||||
// $this->call(UsersTableSeeder::class);
|
||||
$this->call(UsersTableSeeder::class);
|
||||
$this->call(PaymentMethodsTableSeeder::class);
|
||||
$this->call(CarShowCategoryTableSeeder::class);
|
||||
$this->call(BiddersTableSeeder::class);
|
||||
$this->call(ItemsTableSeeder::class);
|
||||
$this->call(JudgesTableSeeder::class);
|
||||
$this->call(VehiclesTableSeeder::class);
|
||||
$this->call(VehicleScoresTableSeeder::class);
|
||||
$this->call(PeoplesChoiceTableSeeder::class);
|
||||
$this->call(WinningBidsTableSeeder::class);
|
||||
$this->call(CheckoutTableSeeder::class);
|
||||
$this->call(CarShowWinnerTableSeeder::class);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\Items;
|
||||
|
||||
class ItemsTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
factory(Items::class, 30)->create();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\Judges;
|
||||
|
||||
class JudgesTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
factory(Judges::class, 5)->create();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\PaymentMethods;
|
||||
|
||||
class PaymentMethodsTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
PaymentMethods::create(['pm_name' => 'Cash']);
|
||||
PaymentMethods::create(['pm_name' => 'Check']);
|
||||
PaymentMethods::create(['pm_name' => 'Credit Card']);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\PeoplesChoice;
|
||||
use App\Models\Vehicles;
|
||||
|
||||
class PeoplesChoiceTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
$vehicles = Vehicles::all();
|
||||
|
||||
foreach ($vehicles as $vehicle) {
|
||||
factory(PeoplesChoice::class)->create([
|
||||
'vehicle' => $vehicle->id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\User;
|
||||
|
||||
class UsersTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
factory(User::class, 10)->create();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\VehicleScores;
|
||||
use App\Models\Judges;
|
||||
use App\Models\Vehicles;
|
||||
|
||||
class VehicleScoresTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
$judges = Judges::all();
|
||||
$vehicles = Vehicles::all();
|
||||
|
||||
foreach ($vehicles as $vehicle) {
|
||||
foreach ($judges as $judge) {
|
||||
factory(VehicleScores::class)->create([
|
||||
'judge' => $judge->id,
|
||||
'vehicle' => $vehicle->id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\Vehicles;
|
||||
use App\Models\CarShowCategory;
|
||||
use App\Models\Bidders;
|
||||
|
||||
class VehiclesTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
$categories = CarShowCategory::all();
|
||||
$bidders = Bidders::all();
|
||||
|
||||
factory(Vehicles::class, 40)->create([
|
||||
'type' => function () use ($categories) {
|
||||
return $categories->random()->id;
|
||||
},
|
||||
'owner' => function () use ($bidders) {
|
||||
return $bidders->random()->bidder_assigned_number;
|
||||
},
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\WinningBids;
|
||||
use App\Models\Bidders;
|
||||
use App\Models\Items;
|
||||
|
||||
class WinningBidsTableSeeder extends Seeder
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
$bidders = Bidders::all();
|
||||
$items = Items::all();
|
||||
|
||||
foreach ($items as $item) {
|
||||
if (rand(0, 1)) {
|
||||
factory(WinningBids::class)->create([
|
||||
'winning_bidder_num' => $bidders->random()->idbidders,
|
||||
'winning_item_num' => $item->iditems,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
/home/sjcsauction/public_html/.well-known
|
||||
auction/home/sjcsauction/public_html/.well-known
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 4.8 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 5.7 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 52 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 5.2 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 7.6 KiB |
|
After Width: | Height: | Size: 72 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 78 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 6.1 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 4.0 KiB |
|
After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 4.8 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 10 KiB |