From cd8c610d4a70bef4f77df2b59d07fa55bd7baa54 Mon Sep 17 00:00:00 2001 From: Russ Long Date: Sun, 23 Dec 2018 10:26:26 -0500 Subject: [PATCH] Cleanup --- app/Http/Controllers/PagesController.php | 401 ++++++++++++----------- app/Http/Kernel.php | 2 +- app/Http/Middleware/HttpsRedirect.php | 10 +- app/Models/Bidders.php | 4 +- app/Models/Checkout.php | 30 +- app/Models/Items.php | 22 +- app/Models/PaymentMethods.php | 19 +- app/Models/WinningBids.php | 26 +- app/Providers/AppServiceProvider.php | 2 +- app/helpers.php | 97 +++--- 10 files changed, 308 insertions(+), 305 deletions(-) diff --git a/app/Http/Controllers/PagesController.php b/app/Http/Controllers/PagesController.php index e4ab700..d6f2f3b 100644 --- a/app/Http/Controllers/PagesController.php +++ b/app/Http/Controllers/PagesController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use View; -Use App\helpers; +use App\helpers; use PDF; use App\Models\Bidders; use App\Models\Items; @@ -15,69 +15,73 @@ use App\Models\WinningBids; class PagesController extends Controller { - public function home() - { - $item_count_result = Items::count(); - $bidder_count_result = Bidders::count(); - $winner_count_result = WinningBids::count(); - return view('home', ['item_count_result' => $item_count_result, 'bidder_count_result' => $bidder_count_result, 'winner_count_result' => $winner_count_result]); - } + public function home() + { + $item_count_result = Items::count(); + $bidder_count_result = Bidders::count(); + $winner_count_result = WinningBids::count(); + return view('home', ['item_count_result' => $item_count_result, 'bidder_count_result' => $bidder_count_result, 'winner_count_result' => $winner_count_result]); + } - public function bidderlist() - { - $bidderlist_results = Bidders::orderBy('bidder_assigned_number', 'asc') + public function bidderlist() + { + $bidderlist_results = Bidders::orderBy('bidder_assigned_number', 'asc') ->orderBy('bidder_lname', 'asc') ->orderBy('bidder_fname', 'asc') ->get(); - return view('bidderlist', ['bidderlist_results' => $bidderlist_results]); - } - - public function bidders(Request $bidder_req) - { - if(!$bidder_req->bidderlname){ - return view('bidders'); + return view('bidderlist', ['bidderlist_results' => $bidderlist_results]); } - $bidder_lname = $bidder_req->bidderlname; - $bidder_fname = $bidder_req->bidderfname; - $bidder_addr = $bidder_req->bidderaddr; - $bidder_city = $bidder_req->biddercity; - $bidder_state = $bidder_req->bidderstate; - $bidder_zip = $bidder_req->bidderzip; - $bidder_phone = $bidder_req->bidderphone; - $bidder_email = $bidder_req->bidderemail; - $bidder_assigned_number = $bidder_req->biddernum; - $bidder_insert = Bidders::updateOrCreate( - [ - 'bidder_assigned_number' => $bidder_assigned_number, - ], - [ - 'bidder_lname' => $bidder_lname , - 'bidder_fname' => $bidder_fname , - 'bidder_addr' => $bidder_addr , - 'bidder_city' => $bidder_city , - 'bidder_state' => $bidder_state , - 'bidder_zip' => $bidder_zip , - 'bidder_phone' => $bidder_phone , - 'bidder_email' => $bidder_email - ]); - return redirect('bidders'); - } + public function bidders(Request $bidder_req) + { + if (!$bidder_req->bidderlname) { + return view('bidders'); + } + $bidder_lname = $bidder_req->bidderlname; + $bidder_fname = $bidder_req->bidderfname; + $bidder_addr = $bidder_req->bidderaddr; + $bidder_city = $bidder_req->biddercity; + $bidder_state = $bidder_req->bidderstate; + $bidder_zip = $bidder_req->bidderzip; + $bidder_phone = $bidder_req->bidderphone; + $bidder_email = $bidder_req->bidderemail; + $bidder_assigned_number = $bidder_req->biddernum; + $bidder_insert = Bidders::updateOrCreate( + [ + 'bidder_assigned_number' => $bidder_assigned_number, + ], + [ + 'bidder_lname' => $bidder_lname , + 'bidder_fname' => $bidder_fname , + 'bidder_addr' => $bidder_addr , + 'bidder_city' => $bidder_city , + 'bidder_state' => $bidder_state , + 'bidder_zip' => $bidder_zip , + 'bidder_phone' => $bidder_phone , + 'bidder_email' => $bidder_email + ] + ); - public function checkout(Request $checkout_req) - { - if(!$checkout_req->checkoutbiddernum){ - return view('checkout_select_form'); - } elseif(!$checkout_req->checkout_payment_method){ - $checkout_bidder = $checkout_req->checkoutbiddernum; - $checkout_list_results = DB::select("SELECT + return redirect('bidders'); + } + + public function checkout(Request $checkout_req) + { + if (!$checkout_req->checkoutbiddernum) { + return view('checkout_select_form'); + } elseif (!$checkout_req->checkout_payment_method) { + $checkout_bidder = $checkout_req->checkoutbiddernum; + $checkout_list_results = DB::select("SELECT *, items.item_assigned_num FROM winning_bids INNER JOIN items AS items ON winning_bids.winning_item_num=items.iditems WHERE winning_bidder_num = $checkout_bidder "); - $checkout_info_results = DB::select("SELECT + WinningBids::with('items') + ->where('winning_bidder_num', $checkout_bidder) + ->get(); + $checkout_info_results = DB::select("SELECT winning_bids.*, bidders.*, sum(winning_cost) AS total_cost @@ -87,22 +91,22 @@ class PagesController extends Controller WHERE winning_bidder_num = $checkout_bidder GROUP BY winning_bids.winning_bidder_num "); - return view('checkout', ['checkout_list_results' => $checkout_list_results, 'checkout_info_results' => $checkout_info_results]); - } else { - $winnertotal = $checkout_req->winnertotal; - $bidder_num = $checkout_req->checkoutbiddernum; - $payment_method = $checkout_req->checkout_payment_method; - $check_number = $checkout_req->check_number; - $cc_transaction = $checkout_req->cc_transaction; - $cc_amount = $checkout_req->cc_amount; - $checkout_list_results = DB::select("SELECT + return view('checkout', ['checkout_list_results' => $checkout_list_results, 'checkout_info_results' => $checkout_info_results]); + } else { + $winnertotal = $checkout_req->winnertotal; + $bidder_num = $checkout_req->checkoutbiddernum; + $payment_method = $checkout_req->checkout_payment_method; + $check_number = $checkout_req->check_number; + $cc_transaction = $checkout_req->cc_transaction; + $cc_amount = $checkout_req->cc_amount; + $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 + $checkout_info_results = DB::select("SELECT winning_bids.*, bidders.*, sum(winning_cost) AS total_cost @@ -112,23 +116,23 @@ class PagesController extends Controller WHERE winning_bidder_num = $bidder_num GROUP BY winning_bids.winning_bidder_num "); - $checkout_result = DB::table('checkout')->insertGetID( - [ - 'bidder_num' => $bidder_num, - 'winnertotal' => $winnertotal, - 'payment_method' => $payment_method, - 'check_number' => $check_number, - 'cc_transaction' => $cc_transaction, - 'cc_amount' => $cc_amount, - ] - ); - return view('checkout_complete', ['checkout_result' => $checkout_result, 'checkout_list_results' => $checkout_list_results, 'checkout_info_results' => $checkout_info_results, 'payment_method' => $payment_method, 'check_number' => $check_number, 'cc_transaction' => $cc_transaction]); + $checkout_result = DB::table('checkout')->insertGetID( + [ + 'bidder_num' => $bidder_num, + 'winnertotal' => $winnertotal, + 'payment_method' => $payment_method, + 'check_number' => $check_number, + 'cc_transaction' => $cc_transaction, + 'cc_amount' => $cc_amount, + ] + ); + return view('checkout_complete', ['checkout_result' => $checkout_result, 'checkout_list_results' => $checkout_list_results, 'checkout_info_results' => $checkout_info_results, 'payment_method' => $payment_method, 'check_number' => $check_number, 'cc_transaction' => $cc_transaction]); + } } - } - public function checkout_complete_list() - { - $checkout_complete_results = DB::select("SELECT + public function checkout_complete_list() + { + $checkout_complete_results = DB::select("SELECT checkout.*, bidders.* FROM checkout @@ -137,31 +141,31 @@ class PagesController extends Controller GROUP BY checkout.bidder_num ORDER BY bidders.bidder_assigned_number ASC "); - return view('checkout_complete_list', ['checkout_complete_results' => $checkout_complete_results]); - } - - public function editwinners(Request $edit_win_req) - { - if(!$edit_win_req->winid){ - return view('editwinners'); + return view('checkout_complete_list', ['checkout_complete_results' => $checkout_complete_results]); } - $winning_bid_id = $edit_win_req->winid; - $winner_bidder = $edit_win_req->winnerbiddernum; - $winner_cost = $edit_win_req->winnerbid; - $winner_insert = DB::table('winning_bids') - ->where('idwinning_bids', $winning_bid_id) - ->update( - [ - 'winning_bidder_num' => $winner_bidder, - 'winning_cost' => $winner_cost - ] - ); - return redirect('editwinners'); - } - public function finaltally() - { - $finaltally_results = DB::select("SELECT + public function editwinners(Request $edit_win_req) + { + if (!$edit_win_req->winid) { + return view('editwinners'); + } + $winning_bid_id = $edit_win_req->winid; + $winner_bidder = $edit_win_req->winnerbiddernum; + $winner_cost = $edit_win_req->winnerbid; + $winner_insert = DB::table('winning_bids') + ->where('idwinning_bids', $winning_bid_id) + ->update( + [ + 'winning_bidder_num' => $winner_bidder, + 'winning_cost' => $winner_cost + ] + ); + return redirect('editwinners'); + } + + public function finaltally() + { + $finaltally_results = DB::select("SELECT winning_bids.*, sum(winning_bids.winning_cost) AS total_due, bidders.* @@ -171,55 +175,56 @@ class PagesController extends Controller GROUP BY winning_bids.winning_bidder_num ORDER BY bidders.bidder_lname "); - return view('finaltally', ['finaltally_results' => $finaltally_results]); - } + return view('finaltally', ['finaltally_results' => $finaltally_results]); + } - public function itemlist() - { - $itemlist_results = DB::select("SELECT + public function itemlist() + { + $itemlist_results = DB::select("SELECT * FROM items ORDER BY item_assigned_num ASC "); - return view('itemlist', ['itemlist_results' => $itemlist_results]); - } - - public function items(Request $items_req) - { - if(!$items_req->itemnum){ - return view('items'); + return view('itemlist', ['itemlist_results' => $itemlist_results]); } - $item_assigned_num = $items_req->itemnum; - $item_desc = $items_req->itemdesc; - $item_min_bid = $items_req->itemminbid; - $items_est_value = $items_req->itemestvalue; - $item_insert = DB::table('items')->insert( - [ - 'item_assigned_num' => $item_assigned_num, - 'item_desc' => $item_desc, - 'item_min_bid' => $item_min_bid, - 'item_est_value' => $items_est_value - ]); - return redirect('items'); - } - public function receiptpdf(Request $receiptpdf_request) - { - $checkoutid = $receiptpdf_request->checkout_id; - $checkout_final_results = DB::select("SELECT + public function items(Request $items_req) + { + if (!$items_req->itemnum) { + return view('items'); + } + $item_assigned_num = $items_req->itemnum; + $item_desc = $items_req->itemdesc; + $item_min_bid = $items_req->itemminbid; + $items_est_value = $items_req->itemestvalue; + $item_insert = DB::table('items')->insert( + [ + 'item_assigned_num' => $item_assigned_num, + 'item_desc' => $item_desc, + 'item_min_bid' => $item_min_bid, + 'item_est_value' => $items_est_value + ] + ); + return redirect('items'); + } + + public function receiptpdf(Request $receiptpdf_request) + { + $checkoutid = $receiptpdf_request->checkout_id; + $checkout_final_results = DB::select("SELECT * FROM checkout WHERE checkout_id = $checkoutid "); - $bidder_num = $checkout_final_results['0']->bidder_num; - $checkout_list_results = DB::select("SELECT + $bidder_num = $checkout_final_results['0']->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 + $checkout_info_results = DB::select("SELECT winning_bids.*, bidders.*, sum(winning_cost) AS total_cost @@ -229,42 +234,42 @@ class PagesController extends Controller WHERE winning_bidder_num = $bidder_num GROUP BY winning_bids.winning_bidder_num "); -//dd($checkout_final_results); - $checkout_data = [ - 'checkout_final_results' => $checkout_final_results, - 'checkout_list_results' => $checkout_list_results, - 'checkout_info_results' => $checkout_info_results - ]; -// dd($checkout_data); - //$pdf = PDF::loadView('receiptpdf', $checkout_data); + //dd($checkout_final_results); + $checkout_data = [ + 'checkout_final_results' => $checkout_final_results, + 'checkout_list_results' => $checkout_list_results, + 'checkout_info_results' => $checkout_info_results + ]; + // dd($checkout_data); + //$pdf = PDF::loadView('receiptpdf', $checkout_data); -//dd($pdf); -// $receiptcontentview = View::make('receiptpdf', $checkout_data); -// $receiptcontent = $receiptcontentview->render(); -// $pdf = PDF::loadHTML($receiptcontent); -// $pdf = PDF::loadView('receiptpdf', $checkout_data); -// return $pdf->stream('receipt.pdf'); - return view('receiptpdf', $checkout_data); - } + //dd($pdf); + // $receiptcontentview = View::make('receiptpdf', $checkout_data); + // $receiptcontent = $receiptcontentview->render(); + // $pdf = PDF::loadHTML($receiptcontent); + // $pdf = PDF::loadView('receiptpdf', $checkout_data); + // return $pdf->stream('receipt.pdf'); + return view('receiptpdf', $checkout_data); + } - public function reprint_receipt(Request $reprint_receipt_req) - { - if(!$reprint_receipt_req->reprintbiddernum){ - return view('reprint_receipt_form'); - } else { - $bidnum=$reprint_receipt_req->reprintbiddernum; - $checkout_id = DB::select("SELECT + public function reprint_receipt(Request $reprint_receipt_req) + { + if (!$reprint_receipt_req->reprintbiddernum) { + return view('reprint_receipt_form'); + } else { + $bidnum=$reprint_receipt_req->reprintbiddernum; + $checkout_id = DB::select("SELECT checkout_id FROM checkout WHERE bidder_num = $bidnum "); - return redirect()->route('receiptpdf', ['checkout_id' => $checkout_id['0']->checkout_id]); + return redirect()->route('receiptpdf', ['checkout_id' => $checkout_id['0']->checkout_id]); + } } - } - public function winnerlist() - { - $winnerlist_results = DB::select("SELECT + public function winnerlist() + { + $winnerlist_results = DB::select("SELECT *, bidders.bidder_assigned_number, items.item_assigned_num FROM winning_bids INNER JOIN bidders as bidders @@ -273,30 +278,30 @@ class PagesController extends Controller ON winning_bids.winning_item_num=items.iditems ORDER BY winning_item_num ASC "); - return view('winnerlist', ['winnerlist_results' => $winnerlist_results]); - } - - public function winners(Request $winners_req) - { - if(!$winners_req->winnerbid){ - return view('winners'); + return view('winnerlist', ['winnerlist_results' => $winnerlist_results]); } - $winner_item = $winners_req->winneritemnum; - $winner_bidder = $winners_req->winnerbiddernum; - $winner_cost = $winners_req->winnerbid; - $winner_insert = DB::table('winning_bids')->insert( - [ - 'winning_item_num' => $winner_item, - 'winning_bidder_num' => $winner_bidder, - 'winning_cost' => $winner_cost - ] - ); - return redirect('winners'); - } - public function winnersbyitem() - { - $winnersbyitem_results = DB::select("SELECT + public function winners(Request $winners_req) + { + if (!$winners_req->winnerbid) { + return view('winners'); + } + $winner_item = $winners_req->winneritemnum; + $winner_bidder = $winners_req->winnerbiddernum; + $winner_cost = $winners_req->winnerbid; + $winner_insert = DB::table('winning_bids')->insert( + [ + 'winning_item_num' => $winner_item, + 'winning_bidder_num' => $winner_bidder, + 'winning_cost' => $winner_cost + ] + ); + return redirect('winners'); + } + + public function winnersbyitem() + { + $winnersbyitem_results = DB::select("SELECT * FROM winning_bids INNER JOIN items as items @@ -305,23 +310,23 @@ class PagesController extends Controller ON winning_bids.winning_bidder_num=bidders.idbidders ORDER BY item_assigned_num ASC "); - return view('winnersbyitem', ['winnersbyitem_results' => $winnersbyitem_results]); - } - - public function winnertotal(Request $winnertotal_req) - { - if(!$winnertotal_req->winnerbiddernum){ - return view('winnertotalform'); + return view('winnersbyitem', ['winnersbyitem_results' => $winnersbyitem_results]); } - $winner_total_bidder = $winnertotal_req->winnerbiddernum; - $winnertotal_list_results = DB::select("SELECT + + public function winnertotal(Request $winnertotal_req) + { + if (!$winnertotal_req->winnerbiddernum) { + return view('winnertotalform'); + } + $winner_total_bidder = $winnertotal_req->winnerbiddernum; + $winnertotal_list_results = DB::select("SELECT *, items.item_assigned_num FROM winning_bids INNER JOIN items AS items ON winning_bids.winning_item_num=items.iditems WHERE winning_bidder_num = $winner_total_bidder "); - $winnertotal_info_results = DB::select("SELECT + $winnertotal_info_results = DB::select("SELECT winning_bids.*, bidders.*, sum(winning_cost) AS total_cost @@ -331,17 +336,17 @@ class PagesController extends Controller WHERE winning_bidder_num = $winner_total_bidder GROUP BY winning_bids.winning_bidder_num "); - return view('winnertotal', ['winnertotal_list_results' => $winnertotal_list_results, 'winnertotal_info_results' => $winnertotal_info_results]); - } + return view('winnertotal', ['winnertotal_list_results' => $winnertotal_list_results, 'winnertotal_info_results' => $winnertotal_info_results]); + } - public function winningbidderlist() - { - $winnerlist_results = DB::select("SELECT + public function winningbidderlist() + { + $winnerlist_results = DB::select("SELECT winning_bidder_num FROM winning_bids GROUP BY winning_bidder_num ORDER BY winning_bidder_num "); - return view('winningbidderlist', ['winnerlist_results' => $winnerlist_results]); - } + return view('winningbidderlist', ['winnerlist_results' => $winnerlist_results]); + } } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 97ee068..9bb788f 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -34,7 +34,7 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, - \App\Http\Middleware\HttpsRedirect::class, + \App\Http\Middleware\HttpsRedirect::class, ], 'api' => [ diff --git a/app/Http/Middleware/HttpsRedirect.php b/app/Http/Middleware/HttpsRedirect.php index 2834baf..186ee35 100644 --- a/app/Http/Middleware/HttpsRedirect.php +++ b/app/Http/Middleware/HttpsRedirect.php @@ -13,12 +13,12 @@ class HttpsRedirect * @param \Closure $next * @return mixed */ -public function handle($request, Closure $next) + public function handle($request, Closure $next) { - if (!$request->secure() && env('APP_ENV') === 'prod') { - return redirect()->secure($request->getRequestUri()); - } + if (!$request->secure() && env('APP_ENV') === 'prod') { + return redirect()->secure($request->getRequestUri()); + } - return $next($request); + return $next($request); } } diff --git a/app/Models/Bidders.php b/app/Models/Bidders.php index 01ad27b..bc0e73e 100644 --- a/app/Models/Bidders.php +++ b/app/Models/Bidders.php @@ -28,11 +28,11 @@ class Bidders extends Model public function checkout() { - return $this->hasMany('App\Models\Checkout', 'bidder_num', 'idbidders'); + return $this->hasMany('App\Models\Checkout', 'bidder_num', 'idbidders'); } public function winningBids() { - return $this->hasMany('App\Models\WinningBids', 'winning_bidder_num', 'idbidders'); + return $this->hasMany('App\Models\WinningBids', 'winning_bidder_num', 'idbidders'); } } diff --git a/app/Models/Checkout.php b/app/Models/Checkout.php index 95971ee..5dce4b3 100644 --- a/app/Models/Checkout.php +++ b/app/Models/Checkout.php @@ -6,8 +6,8 @@ use Illuminate\Database\Eloquent\Model; class Checkout extends Model { - protected $table = 'checkout'; - protected $fillable = [ + protected $table = 'checkout'; + protected $fillable = [ 'bidder_num', 'winnertotal', 'payment_method', @@ -16,20 +16,20 @@ class Checkout extends Model 'cc_amount', 'created_at', 'updated_at' - ]; + ]; - protected $dates = [ - 'created_at', - 'updated_at' - ]; + protected $dates = [ + 'created_at', + 'updated_at' + ]; - public function bidders() - { - return $this->belongsTo('App\Models\Bidders', 'bidder_num', 'idbidders'); - } + public function bidders() + { + return $this->belongsTo('App\Models\Bidders', 'bidder_num', 'idbidders'); + } - public function paymentMethod() - { - return $this->hasMany('App\Models\PaymentMethods', 'payment_method', 'pm_id'); - } + public function paymentMethod() + { + return $this->hasMany('App\Models\PaymentMethods', 'payment_method', 'pm_id'); + } } diff --git a/app/Models/Items.php b/app/Models/Items.php index f67ea56..fb7434f 100644 --- a/app/Models/Items.php +++ b/app/Models/Items.php @@ -6,23 +6,23 @@ use Illuminate\Database\Eloquent\Model; class Items extends Model { - protected $table = 'items'; - protected $fillable = [ + protected $table = 'items'; + protected $fillable = [ 'item_desc', 'item_min_bid', 'item_est_value', 'item_assigned_num', 'created_at', 'updated_at' - ]; + ]; - protected $dates = [ - 'created_at', - 'updated_at' - ]; + protected $dates = [ + 'created_at', + 'updated_at' + ]; - public function winningBids() - { - return $this->belongsTo('App\Models\WinningBids', 'winning_item_num', 'iditems'); - } + public function winningBids() + { + return $this->belongsTo('App\Models\WinningBids', 'winning_item_num', 'iditems'); + } } diff --git a/app/Models/PaymentMethods.php b/app/Models/PaymentMethods.php index b289698..f41a829 100644 --- a/app/Models/PaymentMethods.php +++ b/app/Models/PaymentMethods.php @@ -6,21 +6,20 @@ use Illuminate\Database\Eloquent\Model; class PaymentMethods extends Model { - protected $table = 'payment_methods'; - protected $fillable = [ + protected $table = 'payment_methods'; + protected $fillable = [ 'pm_name', 'created_at', 'updated_at' - ]; + ]; - protected $dates = [ + protected $dates = [ 'created_at', 'updated_at' - ]; - - public function checkout() - { - return $this->belongsTo('App\Models\Checkout', 'payment_method', 'pm_id'); - } + ]; + public function checkout() + { + return $this->belongsTo('App\Models\Checkout', 'payment_method', 'pm_id'); + } } diff --git a/app/Models/WinningBids.php b/app/Models/WinningBids.php index 4c6d596..9bc7869 100644 --- a/app/Models/WinningBids.php +++ b/app/Models/WinningBids.php @@ -6,27 +6,27 @@ use Illuminate\Database\Eloquent\Model; class WinningBids extends Model { - protected $table = 'winning_bids'; - protected $fillable = [ + protected $table = 'winning_bids'; + protected $fillable = [ 'winning_bidder_num', 'winning_cost', 'winning_item_num', 'created_at', 'updated_at' - ]; + ]; - protected $dates = [ + protected $dates = [ 'created_at', 'updated_at' - ]; + ]; - public function items() - { - return $this->hasMany('App\Models\Items', 'winning_item_num', 'iditems'); - } + public function items() + { + return $this->hasMany('App\Models\Items', 'winning_item_num', 'iditems'); + } - public function bidders() - { - return $this->belongsTo('App\Models\Bidders', 'winning_bidder_num', 'idbidders'); - } + public function bidders() + { + return $this->belongsTo('App\Models\Bidders', 'winning_bidder_num', 'idbidders'); + } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e0a6a96..706c003 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -14,7 +14,7 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - Schema::defaultStringLength(191); + Schema::defaultStringLength(191); } /** diff --git a/app/helpers.php b/app/helpers.php index 6cb431d..b5fd139 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -11,91 +11,90 @@ use App\Models\WinningBids; class BidderSelectList { - public static function BidderShowNumbers() - { - $bidder_num_results = Bidders::orderBy('bidder_assigned_number') + public static function BidderShowNumbers() + { + $bidder_num_results = Bidders::orderBy('bidder_assigned_number') ->get(); - $bidder_num = ''; - foreach($bidder_num_results as $bidder_num_result){ - $bidder_num .= ''; - } - return $bidder_num; + $bidder_num = ''; + foreach ($bidder_num_results as $bidder_num_result) { + $bidder_num .= ''; + } + return $bidder_num; } } class CheckoutBidderSelectList { - public static function CheckoutBidderShowNumbers() - { - $checkout_bidder_num_results = Checkout::join('bidders', 'checkout.bidder_num', '=', 'bidders.idbidders') + public static function CheckoutBidderShowNumbers() + { + $checkout_bidder_num_results = Checkout::join('bidders', 'checkout.bidder_num', '=', 'bidders.idbidders') ->orderBy('bidders.bidder_assigned_number', 'asc') ->get(); - $checkout_bidder_num = ''; - foreach($checkout_bidder_num_results as $checkout_bidder_num_result){ - $checkout_bidder_num .= ''; - } - return $checkout_bidder_num; + $checkout_bidder_num = ''; + foreach ($checkout_bidder_num_results as $checkout_bidder_num_result) { + $checkout_bidder_num .= ''; + } + return $checkout_bidder_num; } } class ItemSelectList { - public static function ItemShowNumbers() - { - $item_num_results = Items::orderBy('item_assigned_num') + public static function ItemShowNumbers() + { + $item_num_results = Items::orderBy('item_assigned_num') ->get(); - $item_nums = ''; - foreach($item_num_results as $item_num_result){ - $item_nums .= ''; - } - return $item_nums; + $item_nums = ''; + foreach ($item_num_results as $item_num_result) { + $item_nums .= ''; + } + return $item_nums; } } class PaymentMethodSelectList { - public static function PaymentShowMethods() - { - $payment_method_results = PaymentMethods::orderBy('pm_name') + public static function PaymentShowMethods() + { + $payment_method_results = PaymentMethods::orderBy('pm_name') ->get(); - $payment_methods = ''; - foreach($payment_method_results as $payment_method_result){ - $payment_methods .= ''; - } - return $payment_methods; + $payment_methods = ''; + foreach ($payment_method_results as $payment_method_result) { + $payment_methods .= ''; + } + return $payment_methods; } } class WinningBidSelectList { - public static function WinningBidShowNumbers() - { - $winning_bid_num_results = WinningBids::join('items', 'winning_bids.winning_item_num', '=', 'items.iditems') + public static function WinningBidShowNumbers() + { + $winning_bid_num_results = WinningBids::join('items', 'winning_bids.winning_item_num', '=', 'items.iditems') ->orderBy('items.item_assigned_num') ->get(); - $winning_bid_num = ''; - foreach($winning_bid_num_results as $winning_bid_num_result){ - $winning_bid_num .= ''; - } - return $winning_bid_num; + $winning_bid_num = ''; + foreach ($winning_bid_num_results as $winning_bid_num_result) { + $winning_bid_num .= ''; + } + return $winning_bid_num; } } class WinningBidderSelectList { - public static function WinningBidderShowNumbers() - { + public static function WinningBidderShowNumbers() + { - $winning_bidder_num_results = WinningBids::join('bidders', 'winning_bids.winning_bidder_num', '=', 'bidders.idbidders') + $winning_bidder_num_results = WinningBids::join('bidders', 'winning_bids.winning_bidder_num', '=', 'bidders.idbidders') ->groupBy('winning_bidder_num') ->orderBy('bidders.bidder_assigned_number') ->get(); - $winning_bidder_num = ''; - foreach($winning_bidder_num_results as $winning_bidder_num_result){ - $winning_bidder_num .= ''; - } - return $winning_bidder_num; + $winning_bidder_num = ''; + foreach ($winning_bidder_num_results as $winning_bidder_num_result) { + $winning_bidder_num .= ''; + } + return $winning_bidder_num; } } -?>