Refactoring

app/Http/Controllers/Admin/PaymentController.php

@@ -6,7 +6,7 @@ use App\Events\UserUpdateCreditsEvent;
 use App\Http\Controllers\Controller;
 use App\Models\InvoiceSettings;
 use App\Models\Payment;
-use App\Models\CreditProduct;
+use App\Models\ShopProduct;
 use App\Models\Settings;
 use App\Models\User;
 use App\Notifications\InvoiceNotification;
@@ -49,25 +49,25 @@ class PaymentController extends Controller
 
     /**
      * @param Request $request
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return Application|Factory|View
      */
-    public function checkOut(Request $request, CreditProduct $creditProduct)
+    public function checkOut(Request $request, ShopProduct $shopProduct)
     {
         return view('store.checkout')->with([
-            'product'      => $creditProduct,
-            'taxvalue'     => $creditProduct->getTaxValue(),
-            'taxpercent'   => $creditProduct->getTaxPercent(),
-            'total'        => $creditProduct->getTotalPrice()
+            'product'      => $shopProduct,
+            'taxvalue'     => $shopProduct->getTaxValue(),
+            'taxpercent'   => $shopProduct->getTaxPercent(),
+            'total'        => $shopProduct->getTotalPrice()
         ]);
     }
 
     /**
      * @param Request $request
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return RedirectResponse
      */
-    public function PaypalPay(Request $request, CreditProduct $creditProduct)
+    public function PaypalPay(Request $request, ShopProduct $shopProduct)
     {
         $request = new OrdersCreateRequest();
         $request->prefer('return=representation');
@@ -76,20 +76,20 @@ class PaymentController extends Controller
             "purchase_units" => [
                 [
                     "reference_id" => uniqid(),
-                    "description" => $creditProduct->description,
+                    "description" => $shopProduct->description,
                     "amount"       => [
-                        "value"         => $creditProduct->getTotalPrice(),
-                        'currency_code' => strtoupper($creditProduct->currency_code),
+                        "value"         => $shopProduct->getTotalPrice(),
+                        'currency_code' => strtoupper($shopProduct->currency_code),
                         'breakdown' => [
                             'item_total' =>
                             [
-                                'currency_code' => strtoupper($creditProduct->currency_code),
-                                'value' => $creditProduct->price,
+                                'currency_code' => strtoupper($shopProduct->currency_code),
+                                'value' => $shopProduct->price,
                             ],
                             'tax_total' =>
                             [
-                                'currency_code' => strtoupper($creditProduct->currency_code),
-                                'value' => $creditProduct->getTaxValue(),
+                                'currency_code' => strtoupper($shopProduct->currency_code),
+                                'value' => $shopProduct->getTaxValue(),
                             ]
                         ]
                     ]
@@ -97,7 +97,7 @@ class PaymentController extends Controller
             ],
             "application_context" => [
                 "cancel_url" => route('payment.Cancel'),
-                "return_url" => route('payment.PaypalSuccess', ['product' => $creditProduct->id]),
+                "return_url" => route('payment.PaypalSuccess', ['product' => $shopProduct->id]),
                 'brand_name' =>  config('app.name', 'Laravel'),
                 'shipping_preference'  => 'NO_SHIPPING'
             ]
@@ -151,8 +151,8 @@ class PaymentController extends Controller
      */
     public function PaypalSuccess(Request $laravelRequest)
     {
-        /** @var CreditProduct $creditProduct */
-        $creditProduct = CreditProduct::findOrFail($laravelRequest->input('product'));
+        /** @var ShopProduct $shopProduct */
+        $shopProduct = ShopProduct::findOrFail($laravelRequest->input('product'));
 
         /** @var User $user */
         $user = Auth::user();
@@ -172,10 +172,10 @@ class PaymentController extends Controller
                 }
 
                 //update User with bought item
-                if ($creditProduct->type=="Credits") {
-                    $user->increment('credits', $creditProduct->quantity);
-                }elseif ($creditProduct->type=="Server slots"){
-                    $user->increment('server_limit', $creditProduct->quantity);
+                if ($shopProduct->type=="Credits") {
+                    $user->increment('credits', $shopProduct->quantity);
+                }elseif ($shopProduct->type=="Server slots"){
+                    $user->increment('server_limit', $shopProduct->quantity);
                 }
 
 
@@ -189,15 +189,15 @@ class PaymentController extends Controller
                     'user_id' => $user->id,
                     'payment_id' => $response->result->id,
                     'payment_method' => 'paypal',
-                    'type' => $creditProduct->type,
+                    'type' => $shopProduct->type,
                     'status' => 'paid',
-                    'amount' => $creditProduct->quantity,
-                    'price' => $creditProduct->price,
-                    'tax_value' => $creditProduct->getTaxValue(),
-                    'tax_percent' => $creditProduct->getTaxPercent(),
-                    'total_price' => $creditProduct->getTotalPrice(),
-                    'currency_code' => $creditProduct->currency_code,
-                    'credit_product_id' => $creditProduct->id,
+                    'amount' => $shopProduct->quantity,
+                    'price' => $shopProduct->price,
+                    'tax_value' => $shopProduct->getTaxValue(),
+                    'tax_percent' => $shopProduct->getTaxPercent(),
+                    'total_price' => $shopProduct->getTotalPrice(),
+                    'currency_code' => $shopProduct->currency_code,
+                    'shop_item_product_id' => $shopProduct->id,
                 ]);
 
 
@@ -205,7 +205,7 @@ class PaymentController extends Controller
 
                 //only create invoice if SETTINGS::INVOICE:ENABLED is true
                 if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
-                    $this->createInvoice($user, $payment, 'paid', $creditProduct->currency_code);
+                    $this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
                 }
 
 
@@ -241,10 +241,10 @@ class PaymentController extends Controller
 
     /**
      * @param Request $request
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return RedirectResponse
      */
-    public function StripePay(Request $request, CreditProduct $creditProduct)
+    public function StripePay(Request $request, ShopProduct $shopProduct)
     {
         $stripeClient = $this->getStripeClient();
 
@@ -253,23 +253,23 @@ class PaymentController extends Controller
             'line_items' => [
                 [
                     'price_data' => [
-                        'currency' => $creditProduct->currency_code,
+                        'currency' => $shopProduct->currency_code,
                         'product_data' => [
-                            'name' => $creditProduct->display,
-                            'description' => $creditProduct->description,
+                            'name' => $shopProduct->display,
+                            'description' => $shopProduct->description,
                         ],
-                        'unit_amount_decimal' => round($creditProduct->price * 100, 2),
+                        'unit_amount_decimal' => round($shopProduct->price * 100, 2),
                     ],
                     'quantity' => 1,
                 ],
                 [
                     'price_data' => [
-                        'currency' => $creditProduct->currency_code,
+                        'currency' => $shopProduct->currency_code,
                         'product_data' => [
                             'name' => 'Product Tax',
-                            'description' => $creditProduct->getTaxPercent() . "%",
+                            'description' => $shopProduct->getTaxPercent() . "%",
                         ],
-                        'unit_amount_decimal' => round($creditProduct->getTaxValue(), 2) * 100,
+                        'unit_amount_decimal' => round($shopProduct->getTaxValue(), 2) * 100,
                     ],
                     'quantity' => 1,
                 ]
@@ -277,7 +277,7 @@ class PaymentController extends Controller
 
             'mode' => 'payment',
             "payment_method_types" => str_getcsv(config("SETTINGS::PAYMENTS:STRIPE:METHODS")),
-            'success_url' => route('payment.StripeSuccess',  ['product' => $creditProduct->id]) . '&session_id={CHECKOUT_SESSION_ID}',
+            'success_url' => route('payment.StripeSuccess',  ['product' => $shopProduct->id]) . '&session_id={CHECKOUT_SESSION_ID}',
             'cancel_url' => route('payment.Cancel'),
         ]);
 
@@ -291,8 +291,8 @@ class PaymentController extends Controller
      */
     public function StripeSuccess(Request $request)
     {
-        /** @var CreditProduct $creditProduct */
-        $creditProduct = CreditProduct::findOrFail($request->input('product'));
+        /** @var ShopProduct $shopProduct */
+        $shopProduct = ShopProduct::findOrFail($request->input('product'));
 
         /** @var User $user */
         $user = Auth::user();
@@ -320,10 +320,10 @@ class PaymentController extends Controller
                 }
 
                 //update User with bought item
-                if ($creditProduct->type=="Credits") {
-                    $user->increment('credits', $creditProduct->quantity);
-                }elseif ($creditProduct->type=="Server slots"){
-                    $user->increment('server_limit', $creditProduct->quantity);
+                if ($shopProduct->type=="Credits") {
+                    $user->increment('credits', $shopProduct->quantity);
+                }elseif ($shopProduct->type=="Server slots"){
+                    $user->increment('server_limit', $shopProduct->quantity);
                 }
 
                 //update role
@@ -336,15 +336,15 @@ class PaymentController extends Controller
                     'user_id' => $user->id,
                     'payment_id' => $paymentSession->payment_intent,
                     'payment_method' => 'stripe',
-                    'type' => $creditProduct->type,
+                    'type' => $shopProduct->type,
                     'status' => 'paid',
-                    'amount' => $creditProduct->quantity,
-                    'price' => $creditProduct->price,
-                    'tax_value' => $creditProduct->getTaxValue(),
-                    'total_price' => $creditProduct->getTotalPrice(),
-                    'tax_percent' => $creditProduct->getTaxPercent(),
-                    'currency_code' => $creditProduct->currency_code,
-                    'credit_product_id' => $creditProduct->id,
+                    'amount' => $shopProduct->quantity,
+                    'price' => $shopProduct->price,
+                    'tax_value' => $shopProduct->getTaxValue(),
+                    'total_price' => $shopProduct->getTotalPrice(),
+                    'tax_percent' => $shopProduct->getTaxPercent(),
+                    'currency_code' => $shopProduct->currency_code,
+                    'shop_item_product_id' => $shopProduct->id,
                 ]);
 
                 //payment notification
@@ -354,7 +354,7 @@ class PaymentController extends Controller
 
                 //only create invoice if SETTINGS::INVOICE:ENABLED is true
                 if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
-                    $this->createInvoice($user, $payment, 'paid', $creditProduct->currency_code);
+                    $this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
                 }
 
                 //redirect back to home
@@ -367,20 +367,20 @@ class PaymentController extends Controller
                         'user_id' => $user->id,
                         'payment_id' => $paymentSession->payment_intent,
                         'payment_method' => 'stripe',
-                        'type' => $creditProduct->type,
+                        'type' => $shopProduct->type,
                         'status' => 'processing',
-                        'amount' => $creditProduct->quantity,
-                        'price' => $creditProduct->price,
-                        'tax_value' => $creditProduct->getTaxValue(),
-                        'total_price' => $creditProduct->getTotalPrice(),
-                        'tax_percent' => $creditProduct->getTaxPercent(),
-                        'currency_code' => $creditProduct->currency_code,
-                        'credit_product_id' => $creditProduct->id,
+                        'amount' => $shopProduct->quantity,
+                        'price' => $shopProduct->price,
+                        'tax_value' => $shopProduct->getTaxValue(),
+                        'total_price' => $shopProduct->getTotalPrice(),
+                        'tax_percent' => $shopProduct->getTaxPercent(),
+                        'currency_code' => $shopProduct->currency_code,
+                        'shop_item_product_id' => $shopProduct->id,
                     ]);
 
                     //only create invoice if SETTINGS::INVOICE:ENABLED is true
                     if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
-                        $this->createInvoice($user, $payment, 'paid', $creditProduct->currency_code);
+                        $this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
                     }
 
                     //redirect back to home
@@ -425,10 +425,10 @@ class PaymentController extends Controller
                     }
                 }
                 //update User with bought item
-                if ($creditProduct->type=="Credits") {
-                    $user->increment('credits', $creditProduct->quantity);
-                }elseif ($creditProduct->type=="Server slots"){
-                    $user->increment('server_limit', $creditProduct->quantity);
+                if ($shopProduct->type=="Credits") {
+                    $user->increment('credits', $shopProduct->quantity);
+                }elseif ($shopProduct->type=="Server slots"){
+                    $user->increment('server_limit', $shopProduct->quantity);
                 }
 
                 //update role
@@ -521,7 +521,7 @@ class PaymentController extends Controller
 
     protected function createInvoice($user, $payment, $paymentStatus, $currencyCode)
     {
-        $creditProduct = CreditProduct::where('id', $payment->credit_product_id)->first();
+        $shopProduct = ShopProduct::where('id', $payment->shop_item_product_id)->first();
         //create invoice
         $lastInvoiceID = \App\Models\Invoice::where("invoice_name", "like", "%" . now()->format('mY') . "%")->count("id");
         $newInvoiceID = $lastInvoiceID + 1;
@@ -547,8 +547,8 @@ class PaymentController extends Controller
             ],
         ]);
         $item = (new InvoiceItem())
-            ->title($creditProduct->description)
-            ->pricePerUnit($creditProduct->price);
+            ->title($shopProduct->description)
+            ->pricePerUnit($shopProduct->price);
 
         $notes = [
             __("Payment method") . ": " . $payment->payment_method,
@@ -562,7 +562,7 @@ class PaymentController extends Controller
             ->buyer($customer)
             ->seller($seller)
             ->discountByPercent(0)
-            ->taxRate(floatval($creditProduct->getTaxPercent()))
+            ->taxRate(floatval($shopProduct->getTaxPercent()))
             ->shipping(0)
             ->addItem($item)
             ->status(__($paymentStatus))

app/Http/Controllers/Admin/CreditProductController.php → app/Http/Controllers/Admin/ShopProductController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Models\CreditProduct;
+use App\Models\ShopProduct;
 use App\Models\Settings;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
@@ -13,7 +13,7 @@ use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
 use Illuminate\Validation\Rule;
 
-class CreditProductController extends Controller
+class ShopProductController extends Controller
 {
     /**
      * Display a listing of the resource.
@@ -66,7 +66,7 @@ class CreditProductController extends Controller
         ]);
 
         $disabled = !is_null($request->input('disabled'));
-        CreditProduct::create(array_merge($request->all(), ['disabled' => $disabled]));
+        ShopProduct::create(array_merge($request->all(), ['disabled' => $disabled]));
 
         return redirect()->route('admin.store.index')->with('success', __('Store item has been created!'));
     }
@@ -74,10 +74,10 @@ class CreditProductController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return Response
      */
-    public function show(CreditProduct $creditProduct)
+    public function show(ShopProduct $shopProduct)
     {
         //
     }
@@ -85,14 +85,14 @@ class CreditProductController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return Application|Factory|View|Response
      */
-    public function edit(CreditProduct $creditProduct)
+    public function edit(ShopProduct $shopProduct)
     {
         return view('admin.store.edit', [
             'currencyCodes' => config('currency_codes'),
-            'creditProduct' => $creditProduct
+            'shopProduct' => $shopProduct
         ]);
     }
 
@@ -100,10 +100,10 @@ class CreditProductController extends Controller
      * Update the specified resource in storage.
      *
      * @param Request $request
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return RedirectResponse
      */
-    public function update(Request $request, CreditProduct $creditProduct)
+    public function update(Request $request, ShopProduct $shopProduct)
     {
         $request->validate([
             "disabled"      => "nullable",
@@ -116,19 +116,19 @@ class CreditProductController extends Controller
         ]);
 
         $disabled = !is_null($request->input('disabled'));
-        $creditProduct->update(array_merge($request->all(), ['disabled' => $disabled]));
+        $shopProduct->update(array_merge($request->all(), ['disabled' => $disabled]));
 
         return redirect()->route('admin.store.index')->with('success', __('Store item has been updated!'));
     }
 
     /**
      * @param Request $request
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return RedirectResponse
      */
-    public function disable(Request $request, CreditProduct $creditProduct)
+    public function disable(Request $request, ShopProduct $shopProduct)
     {
-        $creditProduct->update(['disabled' => !$creditProduct->disabled]);
+        $shopProduct->update(['disabled' => !$shopProduct->disabled]);
 
         return redirect()->route('admin.store.index')->with('success', __('Product has been updated!'));
     }
@@ -136,50 +136,50 @@ class CreditProductController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param CreditProduct $creditProduct
+     * @param ShopProduct $shopProduct
      * @return RedirectResponse
      */
-    public function destroy(CreditProduct $creditProduct)
+    public function destroy(ShopProduct $shopProduct)
     {
-        $creditProduct->delete();
+        $shopProduct->delete();
         return redirect()->back()->with('success', __('Store item has been removed!'));
     }
 
 
     public function dataTable()
     {
-        $query = CreditProduct::query();
+        $query = ShopProduct::query();
 
         return datatables($query)
-            ->addColumn('actions', function (CreditProduct $creditProduct) {
+            ->addColumn('actions', function (ShopProduct $shopProduct) {
                 return '
-                            <a data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.store.edit', $creditProduct->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
+                            <a data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.store.edit', $shopProduct->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
 
-                           <form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.store.destroy', $creditProduct->id) . '">
+                           <form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.store.destroy', $shopProduct->id) . '">
                             ' . csrf_field() . '
                             ' . method_field("DELETE") . '
                            <button data-content="' . __("Delete") . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
                        </form>
                 ';
             })
-            ->addColumn('disabled', function (CreditProduct $creditProduct) {
-                $checked = $creditProduct->disabled == false ? "checked" : "";
+            ->addColumn('disabled', function (ShopProduct $shopProduct) {
+                $checked = $shopProduct->disabled == false ? "checked" : "";
                 return '
-                                <form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.store.disable', $creditProduct->id) . '">
+                                <form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.store.disable', $shopProduct->id) . '">
                             ' . csrf_field() . '
                             ' . method_field("PATCH") . '
                             <div class="custom-control custom-switch">
-                            <input ' . $checked . ' name="disabled" onchange="this.form.submit()" type="checkbox" class="custom-control-input" id="switch' . $creditProduct->id . '">
-                            <label class="custom-control-label" for="switch' . $creditProduct->id . '"></label>
+                            <input ' . $checked . ' name="disabled" onchange="this.form.submit()" type="checkbox" class="custom-control-input" id="switch' . $shopProduct->id . '">
+                            <label class="custom-control-label" for="switch' . $shopProduct->id . '"></label>
                           </div>
                        </form>
                 ';
             })
-            ->editColumn('created_at', function (CreditProduct $creditProduct) {
-                return $creditProduct->created_at ? $creditProduct->created_at->diffForHumans() : '';
+            ->editColumn('created_at', function (ShopProduct $shopProduct) {
+                return $shopProduct->created_at ? $shopProduct->created_at->diffForHumans() : '';
             })
-            ->editColumn('price', function (CreditProduct $creditProduct) {
-                return $creditProduct->formatToCurrency($creditProduct->price);
+            ->editColumn('price', function (ShopProduct $shopProduct) {
+                return $shopProduct->formatToCurrency($shopProduct->price);
             })
             ->rawColumns(['actions', 'disabled'])
             ->make();

app/Http/Controllers/StoreController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\CreditProduct;
+use App\Models\ShopProduct;
 use App\Models\Settings;
 use Illuminate\Support\Facades\Auth;
 
@@ -30,7 +30,7 @@ class StoreController extends Controller
         }
 
         return view('store.index')->with([
-            'products' => CreditProduct::where('disabled', '=', false)->orderBy('type', 'asc')->orderBy('price', 'asc')->get(),
+            'products' => ShopProduct::where('disabled', '=', false)->orderBy('type', 'asc')->orderBy('price', 'asc')->get(),
             'isPaymentSetup' => $isPaymentSetup,
         ]);
     }

app/Models/Payment.php

@@ -32,7 +32,7 @@ class Payment extends Model
         'total_price',
         'tax_percent',
         'currency_code',
-        'credit_product_id',
+        'shop_item_product_id',
     ];
 
     public static function boot()

app/Models/CreditProduct.php → app/Models/ShopProduct.php

@@ -8,7 +8,7 @@ use NumberFormatter;
 use Spatie\Activitylog\Traits\LogsActivity;
 use App\Models\Configuration;
 
-class CreditProduct extends Model
+class ShopProduct extends Model
 {
     use LogsActivity;
     /**
@@ -33,10 +33,10 @@ class CreditProduct extends Model
     {
         parent::boot();
 
-        static::creating(function (CreditProduct $creditProduct) {
+        static::creating(function (ShopProduct $shopProduct) {
             $client = new Client();
 
-            $creditProduct->{$creditProduct->getKeyName()} = $client->generateId($size = 21);
+            $shopProduct->{$shopProduct->getKeyName()} = $client->generateId($size = 21);
         });
     }
 

database/migrations/2021_12_15_120346_update_to_payments_table.php

@@ -19,7 +19,7 @@ class UpdateToPaymentsTable extends Migration
             $table->string('payment_method');
             $table->dropColumn('payer');
             $table->dropColumn('payer_id');
-            $table->string('credit_product_id');
+            $table->string('shop_item_product_id');
         });
 
         DB::statement('UPDATE payments SET payment_method="paypal"');
@@ -36,7 +36,7 @@ class UpdateToPaymentsTable extends Migration
             $table->dropColumn('payment_method');
             $table->string('payer_id')->nullable();
             $table->text('payer')->nullable();
-            $table->dropColumn('credit_product_id');
+            $table->dropColumn('shop_item_product_id');
         });
     }
 }

database/migrations/2022_05_30_085900_rename_credits_product.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RenameCreditsProduct extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::rename('credit_products', 'shop_products');
+        Schema::table('payments', function(Blueprint $table) {
+            $table->renameColumn('credit_product_id', 'shop_item_product_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::rename('shop_products', 'credit_products');
+
+        Schema::table('payments', function(Blueprint $table) {
+            $table->renameColumn('shop_item_product_id', 'credit_product_id');
+        });
+    }
+}

database/seeders/ExampleItemsSeeder.php

@@ -3,7 +3,7 @@
 namespace Database\Seeders;
 
 use Database\Seeders\Seeds\ProductSeeder;
-use Database\Seeders\Seeds\CreditProductSeeder;
+use Database\Seeders\Seeds\ShopProductSeeder;
 use Database\Seeders\Seeds\ApplicationApiSeeder;
 use Database\Seeders\Seeds\UsefulLinksSeeder;
 use Illuminate\Database\Seeder;
@@ -19,7 +19,7 @@ class ExampleItemsSeeder extends Seeder
     {
         $this->call([
             ProductSeeder::class,
-            CreditProductSeeder::class,
+            ShopProductSeeder::class,
             ApplicationApiSeeder::class,
             UsefulLinksSeeder::class
         ]);

database/seeders/Seeds/CreditProductSeeder.php

@@ -2,10 +2,10 @@
 
 namespace Database\Seeders\Seeds;
 
-use App\Models\CreditProduct;
+use App\Models\ShopProduct;
 use Illuminate\Database\Seeder;
 
-class CreditProductSeeder extends Seeder
+class ShopProductSeeder extends Seeder
 {
     /**
      * Run the database seeds.
@@ -14,7 +14,7 @@ class CreditProductSeeder extends Seeder
      */
     public function run()
     {
-        CreditProduct::create([
+        ShopProduct::create([
             'type' => 'Credits',
             'display' => '350',
             'description' => 'Adds 350 credits to your account',
@@ -24,7 +24,7 @@ class CreditProductSeeder extends Seeder
             'disabled' => false,
         ]);
 
-        CreditProduct::create([
+        ShopProduct::create([
             'type' => 'Credits',
             'display' => '875 + 125',
             'description' => 'Adds 1000 credits to your account',
@@ -34,7 +34,7 @@ class CreditProductSeeder extends Seeder
             'disabled' => false,
         ]);
 
-        CreditProduct::create([
+        ShopProduct::create([
             'type' => 'Credits',
             'display' => '1750 + 250',
             'description' => 'Adds 2000 credits to your account',
@@ -44,7 +44,7 @@ class CreditProductSeeder extends Seeder
             'disabled' => false,
         ]);
 
-        CreditProduct::create([
+        ShopProduct::create([
             'type' => 'Credits',
             'display' => '3500 + 500',
             'description' => 'Adds 4000 credits to your account',

resources/views/admin/payments/index.blade.php

@@ -72,6 +72,7 @@
                 serverSide: true,
                 stateSave: true,
                 ajax: "{{ route('admin.payments.datatable') }}",
+                order: [[ 9, "asc" ]],
                 columns: [
                     {data: 'id',name: 'payments.id'},
                     {data: 'type'},

resources/views/admin/store/edit.blade.php

@@ -13,7 +13,7 @@
                         <li class="breadcrumb-item"><a href="{{ route('home') }}">{{ __('Dashboard') }}</a></li>
                         <li class="breadcrumb-item"><a href="{{ route('admin.store.index') }}">{{ __('Store') }}</a></li>
                         <li class="breadcrumb-item"><a class="text-muted"
-                                href="{{ route('admin.store.edit', $creditProduct->id) }}">{{ __('Edit') }}</a>
+                                href="{{ route('admin.store.edit', $shopProduct->id) }}">{{ __('Edit') }}</a>
                         </li>
                     </ol>
                 </div>
@@ -30,12 +30,12 @@
                 <div class="col-lg-6">
                     <div class="card">
                         <div class="card-body">
-                            <form action="{{ route('admin.store.update', $creditProduct->id) }}" method="POST">
+                            <form action="{{ route('admin.store.update', $shopProduct->id) }}" method="POST">
                                 @csrf
                                 @method('PATCH')
                                 <div class="d-flex flex-row-reverse">
                                     <div class="custom-control custom-switch">
-                                        <input type="checkbox" @if ($creditProduct->disabled) checked @endif name="disabled"
+                                        <input type="checkbox" @if ($shopProduct->disabled) checked @endif name="disabled"
                                             class="custom-control-input custom-control-input-danger" id="switch1">
                                         <label class="custom-control-label" for="switch1">{{ __('Disabled') }} <i
                                                 data-toggle="popover" data-trigger="hover"
@@ -62,7 +62,7 @@
                                     <select required name="currency_code" id="currency_code"
                                         class="custom-select  @error('name') is-invalid @enderror">
                                         @foreach ($currencyCodes as $code)
-                                            <option @if ($creditProduct->currency_code == $code) selected @endif value="{{ $code }}">
+                                            <option @if ($shopProduct->currency_code == $code) selected @endif value="{{ $code }}">
                                                 {{ $code }}</option>
                                         @endforeach
                                     </select>
@@ -80,7 +80,7 @@
 
                                 <div class="form-group">
                                     <label for="price">Price</label>
-                                    <input value="{{ $creditProduct->price }}" id="price" name="price" type="number"
+                                    <input value="{{ $shopProduct->price }}" id="price" name="price" type="number"
                                         placeholder="10.00" step="any"
                                         class="form-control @error('price') is-invalid @enderror" required="required">
                                     @error('price')
@@ -92,7 +92,7 @@
 
                                 <div class="form-group">
                                     <label for="quantity">Quantity</label>
-                                    <input value="{{ $creditProduct->quantity }}" id="quantity" name="quantity"
+                                    <input value="{{ $shopProduct->quantity }}" id="quantity" name="quantity"
                                         type="number" placeholder="1000"
                                         class="form-control @error('quantity') is-invalid @enderror" required="required">
                                     @error('quantity')
@@ -107,7 +107,7 @@
 
                                 <div class="form-group">
                                     <label for="display">Display</label>
-                                    <input value="{{ $creditProduct->display }}" id="display" name="display" type="text"
+                                    <input value="{{ $shopProduct->display }}" id="display" name="display" type="text"
                                         placeholder="750 + 250" class="form-control @error('display') is-invalid @enderror"
                                         required="required">
                                     @error('display')
@@ -122,7 +122,7 @@
 
                                 <div class="form-group">
                                     <label for="description">Description</label>
-                                    <input value="{{ $creditProduct->description }}" id="description" name="description"
+                                    <input value="{{ $shopProduct->description }}" id="description" name="description"
                                         type="text" placeholder="{{ __('Adds 1000 credits to your account') }}"
                                         class="form-control @error('description') is-invalid @enderror" required="required">
                                     @error('description')

resources/views/admin/users/index.blade.php

@@ -79,7 +79,7 @@
                 serverSide: true,
                 stateSave: true,
                 ajax: "{{route('admin.users.datatable')}}",
-                order: [[ 10, "desc" ]],
+                order: [[ 10, "asc" ]],
                 columns: [
                     {data: 'discordId', visible: false, name: 'discordUser.id'},
                     {data: 'pterodactyl_id', visible: false},

resources/views/store/index.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.main')
-<?php use App\Models\CreditProduct; ?>
+<?php use App\Models\ShopProduct; ?>
 
 @section('content')
     <!-- CONTENT HEADER -->
@@ -49,7 +49,7 @@
                             </tr>
                             </thead>
                             <tbody>
-                            <?php /** @var $product CreditProduct */
+                            <?php /** @var $product ShopProduct */
                             ?>
                             @foreach ($products as $product)
                                 <tr>

routes/web.php

@@ -7,7 +7,7 @@ use App\Http\Controllers\Admin\ApplicationApiController;
 use App\Http\Controllers\Admin\InvoiceController;
 use App\Http\Controllers\Admin\OverViewController;
 use App\Http\Controllers\Admin\PaymentController;
-use App\Http\Controllers\Admin\CreditProductController;
+use App\Http\Controllers\Admin\ShopProductController;
 use App\Http\Controllers\Admin\ProductController;
 use App\Http\Controllers\Admin\ServerController as AdminServerController;
 use App\Http\Controllers\Admin\SettingsController;
@@ -70,10 +70,10 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
     Route::get('/products/products/{egg?}/{node?}', [FrontProductController::class, 'getProductsBasedOnNode'])->name('products.products.node');
 
     #payments
-    Route::get('checkout/{creditProduct}', [PaymentController::class, 'checkOut'])->name('checkout');
-    Route::get('payment/PaypalPay/{creditProduct}', [PaymentController::class, 'PaypalPay'])->name('payment.PaypalPay');
+    Route::get('checkout/{shopProduct}', [PaymentController::class, 'checkOut'])->name('checkout');
+    Route::get('payment/PaypalPay/{shopProduct}', [PaymentController::class, 'PaypalPay'])->name('payment.PaypalPay');
     Route::get('payment/PaypalSuccess', [PaymentController::class, 'PaypalSuccess'])->name('payment.PaypalSuccess');
-    Route::get('payment/StripePay/{creditProduct}', [PaymentController::class, 'StripePay'])->name('payment.StripePay');
+    Route::get('payment/StripePay/{shopProduct}', [PaymentController::class, 'StripePay'])->name('payment.StripePay');
     Route::get('payment/StripeSuccess', [PaymentController::class, 'StripeSuccess'])->name('payment.StripeSuccess');
     Route::get('payment/Cancel', [PaymentController::class, 'Cancel'])->name('payment.Cancel');
 
@@ -120,10 +120,10 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
         Route::resource('products', ProductController::class);
 
         #store
-        Route::get('store/datatable', [CreditProductController::class, 'datatable'])->name('store.datatable');
-        Route::patch('store/disable/{creditProduct}', [CreditProductController::class, 'disable'])->name('store.disable');
-        Route::resource('store', CreditProductController::class)->parameters([
-            'store' => 'creditProduct',
+        Route::get('store/datatable', [ShopProductController::class, 'datatable'])->name('store.datatable');
+        Route::patch('store/disable/{shopProduct}', [ShopProductController::class, 'disable'])->name('store.disable');
+        Route::resource('store', ShopProductController::class)->parameters([
+            'store' => 'shopProduct',
         ]);
 
         #payments