From a7b199c01aa0d96754a33cc7698bf45fb049dc44 Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 30 May 2022 09:23:35 +0200 Subject: [PATCH 1/9] Add the ability to sell server slots --- .../Controllers/Admin/PaymentController.php | 36 +++++++++---- app/Http/Controllers/StoreController.php | 2 +- resources/views/admin/store/create.blade.php | 1 + resources/views/store/index.blade.php | 51 ++++++++++--------- 4 files changed, 56 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 72d5e9d2..32bb5c77 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -164,9 +164,6 @@ class PaymentController extends Controller $response = $this->getPayPalClient()->execute($request); if ($response->statusCode == 201 || $response->statusCode == 200) { - //update credits - $user->increment('credits', $creditProduct->quantity); - //update server limit if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) { @@ -174,6 +171,14 @@ 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); + } + + //update role if ($user->role == 'member') { $user->update(['role' => 'client']); @@ -184,7 +189,7 @@ class PaymentController extends Controller 'user_id' => $user->id, 'payment_id' => $response->result->id, 'payment_method' => 'paypal', - 'type' => 'Credits', + 'type' => $creditProduct->type, 'status' => 'paid', 'amount' => $creditProduct->quantity, 'price' => $creditProduct->price, @@ -305,8 +310,7 @@ class PaymentController extends Controller // check if payment is 100% completed and payment does not exist in db already if ($paymentSession->status == "complete" && $paymentIntent->status == "succeeded" && $paymentDbEntry == 0) { - //update credits - $user->increment('credits', $creditProduct->quantity); + //update server limit if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { @@ -315,6 +319,13 @@ 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); + } + //update role if ($user->role == 'member') { $user->update(['role' => 'client']); @@ -325,7 +336,7 @@ class PaymentController extends Controller 'user_id' => $user->id, 'payment_id' => $paymentSession->payment_intent, 'payment_method' => 'stripe', - 'type' => 'Credits', + 'type' => $creditProduct->type, 'status' => 'paid', 'amount' => $creditProduct->quantity, 'price' => $creditProduct->price, @@ -356,7 +367,7 @@ class PaymentController extends Controller 'user_id' => $user->id, 'payment_id' => $paymentSession->payment_intent, 'payment_method' => 'stripe', - 'type' => 'Credits', + 'type' => $creditProduct->type, 'status' => 'processing', 'amount' => $creditProduct->quantity, 'price' => $creditProduct->price, @@ -405,8 +416,7 @@ class PaymentController extends Controller $user = User::where('id', $payment->user_id)->first(); if ($paymentIntent->status == 'succeeded' && $payment->status == 'processing') { - // Increment User Credits - $user->increment('credits', $payment->amount); + //update server limit if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { @@ -414,6 +424,12 @@ class PaymentController extends Controller $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]); } } + //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); + } //update role if ($user->role == 'member') { diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index c3717653..6b6b3148 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -30,7 +30,7 @@ class StoreController extends Controller } return view('store.index')->with([ - 'products' => CreditProduct::where('disabled', '=', false)->orderBy('price', 'asc')->get(), + 'products' => CreditProduct::where('disabled', '=', false)->orderBy('type', 'asc')->orderBy('price', 'asc')->get(), 'isPaymentSetup' => $isPaymentSetup, ]); } diff --git a/resources/views/admin/store/create.blade.php b/resources/views/admin/store/create.blade.php index b09d4bdf..c7c17ed7 100644 --- a/resources/views/admin/store/create.blade.php +++ b/resources/views/admin/store/create.blade.php @@ -50,6 +50,7 @@ @error('name')
diff --git a/resources/views/store/index.blade.php b/resources/views/store/index.blade.php index 0b6220b2..31b78f87 100644 --- a/resources/views/store/index.blade.php +++ b/resources/views/store/index.blade.php @@ -12,9 +12,9 @@
  1. {{ __('Dashboard') }}
    2. + href="{{ route('home') }}">{{ __('Dashboard') }}
  2. {{ __('Store') }}
    3. + href="{{ route('store.index') }}">{{ __('Store') }}
@@ -41,27 +41,34 @@
- - - - - - + + + + + + - - @foreach ($products as $product) - - - - - - - @endforeach + + @foreach ($products as $product) + + + + + + + @endforeach
{{ __('Price') }}{{ __('Type') }}{{ __('Description') }}
{{ __('Price') }}{{ __('Type') }}{{ __('Description') }}
{{ $product->formatToCurrency($product->price) }}{{ strtolower($product->type) == 'credits' ? CREDITS_DISPLAY_NAME : $product->type }} - {{ $product->display }}{{ __('Purchase') }} -
{{ $product->formatToCurrency($product->price) }}{{ strtolower($product->type) == 'credits' ? CREDITS_DISPLAY_NAME : $product->type }} + + @if(strtolower($product->type) == 'credits') + + @elseif (strtolower($product->type) == 'server slots') + + @endif + + {{ $product->display }}{{ __('Purchase') }} +
@@ -87,7 +94,6 @@ const urlParams = new URLSearchParams(queryString); return urlParams.get(param); } - const voucherCode = getUrlParameter('voucher'); //if voucherCode not empty, open the modal and fill the input if (voucherCode) { @@ -95,7 +101,6 @@ $('#redeemVoucherModal').modal('show'); $('#redeemVoucherCode').val(voucherCode); }); - } From 74d315810ea11f29472dac52819c296da9449efc Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 30 May 2022 09:24:17 +0200 Subject: [PATCH 2/9] Update Version --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index 4f4fc7a4..7f38ae77 100644 --- a/config/app.php +++ b/config/app.php @@ -4,7 +4,7 @@ use App\Models\Settings; return [ - 'version' => '0.7.4', + 'version' => '0.7.5', /* |-------------------------------------------------------------------------- From 8e052572f7b7fd819fa271fda81f0c0d8b735859 Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 30 May 2022 09:53:11 +0200 Subject: [PATCH 3/9] Remove Discord button if not set || translation strings on welcome || total credits no admins --- .../Controllers/Admin/OverViewController.php | 2 +- app/Notifications/WelcomeMessage.php | 23 ++++++++++--------- resources/views/layouts/main.blade.php | 2 ++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php index 1fa022ec..29049b8f 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -23,7 +23,7 @@ class OverViewController extends Controller }); $creditCount = Cache::remember('credit:count', self::TTL, function () { - return User::query()->sum('credits'); + return User::query()->where("role","!=","admin")->sum('credits'); }); $paymentCount = Cache::remember('payment:count', self::TTL, function () { diff --git a/app/Notifications/WelcomeMessage.php b/app/Notifications/WelcomeMessage.php index a7854478..3841fc83 100644 --- a/app/Notifications/WelcomeMessage.php +++ b/app/Notifications/WelcomeMessage.php @@ -42,17 +42,17 @@ class WelcomeMessage extends Notification implements ShouldQueue $AdditionalLine = ""; if (config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL') != 0) { - $AdditionalLine .= "Verifying your e-mail address will grant you " . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL') . " additional " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ".
"; + $AdditionalLine .= __("Verifying your e-mail address will grant you ") . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL'). " " . __("additional") . " " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ".
"; } if (config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') != 0) { - $AdditionalLine .= "Verifying your e-mail will also increase your Server Limit by " . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') . ".
"; + $AdditionalLine .= __("Verifying your e-mail will also increase your Server Limit by ") . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') . ".
"; } $AdditionalLine .= "
"; if (config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD') != 0) { - $AdditionalLine .= "You can also verify your discord account to get another " . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD') . " " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ".
"; + $AdditionalLine .= __("You can also verify your discord account to get another ") . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD') . " " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ".
"; } if (config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') != 0) { - $AdditionalLine .= "Verifying your Discord account will also increase your Server Limit by " . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') . ".
"; + $AdditionalLine .= __("Verifying your Discord account will also increase your Server Limit by ") . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') . ".
"; } return $AdditionalLine; @@ -65,19 +65,20 @@ class WelcomeMessage extends Notification implements ShouldQueue */ public function toArray($notifiable) { + return [ 'title' => __("Getting started!"), 'content' => " -

Hello {$this->user->name}, Welcome to our dashboard!

-
Verification
-

You can verify your e-mail address and link/verify your Discord account.

+

".__("Hello")." {$this->user->name}, ".__("Welcome to our dashboard")."!

+
".__("Verification")."
+

".__("You can verify your e-mail address and link/verify your Discord account.")."

" . $this->AdditionalLines() . "

-
Information
-

This dashboard can be used to create and delete servers.
These servers can be used and managed on our pterodactyl panel.
If you have any questions, please join our Discord server and #create-a-ticket.

-

We hope you can enjoy this hosting experience and if you have any suggestions please let us know!

-

Regards,
" . config('app.name', 'Laravel') . "

+
".__("Information")."
+

".__("This dashboard can be used to create and delete servers").".
".__("These servers can be used and managed on our pterodactyl panel").".
".__("If you have any questions, please join our Discord server and #create-a-ticket").".

+

".__("We hope you can enjoy this hosting experience and if you have any suggestions please let us know")."!

+

".__("Regards").",
" . config('app.name', 'Laravel') . "

", ]; } diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index a0542815..742bcd02 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -49,10 +49,12 @@ {{ __('Home') }} + @if(config('SETTINGS::DISCORD:INVITE_URL'))
  • {{ __('Discord') }}
    • + @endif @if (config('SETTINGS::LOCALE:CLIENTS_CAN_CHANGE') == 'true')
  • From aea9ee17f25fa17b010646a2a3cabd3e0595654c Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 30 May 2022 10:24:32 +0200 Subject: [PATCH 4/9] Update forms.php --- public/install/forms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/install/forms.php b/public/install/forms.php index 60546f05..b737b031 100644 --- a/public/install/forms.php +++ b/public/install/forms.php @@ -59,7 +59,7 @@ if (isset($_POST['checkGeneral'])) { setEnvironmentValue("APP_NAME", $appname); - setEnvironmentValue("APP_URL", $url); + setEnvironmentValue("APP_URL", $appurl); header("LOCATION: index.php?step=4"); From e19ca0572356fc7a1cef6de44c444697ee2bf06f Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 30 May 2022 11:07:10 +0200 Subject: [PATCH 5/9] Refactoring --- .../Controllers/Admin/PaymentController.php | 148 +++++++++--------- ...ntroller.php => ShopProductController.php} | 60 +++---- app/Http/Controllers/StoreController.php | 4 +- app/Models/Payment.php | 2 +- .../{CreditProduct.php => ShopProduct.php} | 6 +- ..._12_15_120346_update_to_payments_table.php | 4 +- ...22_05_30_085900_rename_credits_product.php | 35 +++++ database/seeders/ExampleItemsSeeder.php | 4 +- .../seeders/Seeds/CreditProductSeeder.php | 12 +- .../views/admin/payments/index.blade.php | 1 + resources/views/admin/store/edit.blade.php | 16 +- resources/views/admin/users/index.blade.php | 2 +- resources/views/store/index.blade.php | 4 +- routes/web.php | 16 +- 14 files changed, 175 insertions(+), 139 deletions(-) rename app/Http/Controllers/Admin/{CreditProductController.php => ShopProductController.php} (73%) rename app/Models/{CreditProduct.php => ShopProduct.php} (89%) create mode 100644 database/migrations/2022_05_30_085900_rename_credits_product.php diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 32bb5c77..c7cf8a1e 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/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)) diff --git a/app/Http/Controllers/Admin/CreditProductController.php b/app/Http/Controllers/Admin/ShopProductController.php similarity index 73% rename from app/Http/Controllers/Admin/CreditProductController.php rename to app/Http/Controllers/Admin/ShopProductController.php index e510f76e..e5930032 100644 --- a/app/Http/Controllers/Admin/CreditProductController.php +++ b/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 ' - + -
    + ' . csrf_field() . ' ' . method_field("DELETE") . '
    '; }) - ->addColumn('disabled', function (CreditProduct $creditProduct) { - $checked = $creditProduct->disabled == false ? "checked" : ""; + ->addColumn('disabled', function (ShopProduct $shopProduct) { + $checked = $shopProduct->disabled == false ? "checked" : ""; return ' -
    + ' . csrf_field() . ' ' . method_field("PATCH") . '
    - - + +
    '; }) - ->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(); diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index 6b6b3148..8995d659 100644 --- a/app/Http/Controllers/StoreController.php +++ b/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, ]); } diff --git a/app/Models/Payment.php b/app/Models/Payment.php index d8151908..df6acb24 100644 --- a/app/Models/Payment.php +++ b/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() diff --git a/app/Models/CreditProduct.php b/app/Models/ShopProduct.php similarity index 89% rename from app/Models/CreditProduct.php rename to app/Models/ShopProduct.php index 52c5873a..4d158be8 100644 --- a/app/Models/CreditProduct.php +++ b/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); }); } diff --git a/database/migrations/2021_12_15_120346_update_to_payments_table.php b/database/migrations/2021_12_15_120346_update_to_payments_table.php index 50900f29..58890184 100644 --- a/database/migrations/2021_12_15_120346_update_to_payments_table.php +++ b/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'); }); } } diff --git a/database/migrations/2022_05_30_085900_rename_credits_product.php b/database/migrations/2022_05_30_085900_rename_credits_product.php new file mode 100644 index 00000000..af4759b2 --- /dev/null +++ b/database/migrations/2022_05_30_085900_rename_credits_product.php @@ -0,0 +1,35 @@ +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'); + }); + } +} diff --git a/database/seeders/ExampleItemsSeeder.php b/database/seeders/ExampleItemsSeeder.php index 33ee0025..42fb4bbc 100644 --- a/database/seeders/ExampleItemsSeeder.php +++ b/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 ]); diff --git a/database/seeders/Seeds/CreditProductSeeder.php b/database/seeders/Seeds/CreditProductSeeder.php index 40596659..0f0c0f98 100644 --- a/database/seeders/Seeds/CreditProductSeeder.php +++ b/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', diff --git a/resources/views/admin/payments/index.blade.php b/resources/views/admin/payments/index.blade.php index de1fc9c1..3ae42a08 100644 --- a/resources/views/admin/payments/index.blade.php +++ b/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'}, diff --git a/resources/views/admin/store/edit.blade.php b/resources/views/admin/store/edit.blade.php index f7a35686..4e16dc42 100644 --- a/resources/views/admin/store/edit.blade.php +++ b/resources/views/admin/store/edit.blade.php @@ -13,7 +13,7 @@
  • {{ __('Dashboard') }}
  • {{ __('Store') }}
  • {{ __('Edit') }} + href="{{ route('admin.store.edit', $shopProduct->id) }}">{{ __('Edit') }}
    • @@ -30,12 +30,12 @@
    -
    + @csrf @method('PATCH')
    - disabled) checked @endif name="disabled" + disabled) checked @endif name="disabled" class="custom-control-input custom-control-input-danger" id="switch1">