-
-
-
-
-
-
-
-
-
-
-@endsection
\ No newline at end of file
+@endsection
From 59f8e8c6968e81c8ab7afc000b1eba4469593d32 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sat, 14 Jan 2023 23:34:54 +0100
Subject: [PATCH 08/22] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Payment=20Creation?=
=?UTF-8?q?=20and=20use=20paymentEvent=20instead=20of=20manual=20invoice?=
=?UTF-8?q?=20creation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PaymentGateways/PayPal/index.php | 89 ++++++++++++-------
1 file changed, 59 insertions(+), 30 deletions(-)
diff --git a/app/Extensions/PaymentGateways/PayPal/index.php b/app/Extensions/PaymentGateways/PayPal/index.php
index fe8958b3..4a260155 100644
--- a/app/Extensions/PaymentGateways/PayPal/index.php
+++ b/app/Extensions/PaymentGateways/PayPal/index.php
@@ -4,12 +4,14 @@ use App\Events\PaymentEvent;
use App\Events\UserUpdateCreditsEvent;
use App\Models\PartnerDiscount;
use App\Models\Payment;
+use App\Models\Product;
use App\Models\ShopProduct;
use App\Models\User;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redirect;
use PayPalCheckoutSdk\Core\PayPalHttpClient;
use PayPalCheckoutSdk\Core\ProductionEnvironment;
use PayPalCheckoutSdk\Core\SandboxEnvironment;
@@ -22,12 +24,29 @@ use PayPalHttp\HttpException;
/**
* @param Request $request
* @param ShopProduct $shopProduct
- * @return RedirectResponse
*/
function PaypalPay(Request $request)
{
+ /** @var User $user */
+ $user = Auth::user();
$shopProduct = ShopProduct::findOrFail($request->shopProduct);
-
+
+ // create a new payment
+ $payment = Payment::create([
+ 'user_id' => $user->id,
+ 'payment_id' => null,
+ 'payment_method' => 'paypal',
+ 'type' => $shopProduct->type,
+ 'status' => 'open',
+ 'amount' => $shopProduct->quantity,
+ 'price' => $shopProduct->price - ($shopProduct->price*PartnerDiscount::getDiscount()/100),
+ 'tax_value' => $shopProduct->getTaxValue(),
+ 'tax_percent' => $shopProduct->getTaxPercent(),
+ 'total_price' => $shopProduct->getTotalPrice(),
+ 'currency_code' => $shopProduct->currency_code,
+ 'shop_item_product_id' => $shopProduct->id,
+ ]);
+
$request = new OrdersCreateRequest();
$request->prefer('return=representation');
$request->body = [
@@ -56,21 +75,27 @@ function PaypalPay(Request $request)
],
"application_context" => [
"cancel_url" => route('payment.Cancel'),
- "return_url" => route('payment.PayPalSuccess'),
+ "return_url" => route('payment.PayPalSuccess', ['payment' => $payment->id]),
'brand_name' => config('app.name', 'Laravel'),
'shipping_preference' => 'NO_SHIPPING'
]
];
+
+
+
try {
// Call API with your client and get a response for your call
$response = getPayPalClient()->execute($request);
- return redirect()->away($response->result->links[1]->href);
- // If call returns body in response, you can get the deserialized version from the result attribute of the response
+
+ Redirect::away($response->result->links[1]->href)->send();
} catch (HttpException $ex) {
- echo $ex->statusCode;
- dd(json_decode($ex->getMessage()));
+ error_log($ex->statusCode);
+ error_log($ex->getMessage());
+
+ $payment->delete();
+ return Redirect::route('payment.Cancel');
}
}
/**
@@ -78,12 +103,13 @@ function PaypalPay(Request $request)
*/
function PaypalSuccess(Request $laravelRequest)
{
- /** @var ShopProduct $shopProduct */
- $shopProduct = ShopProduct::findOrFail($laravelRequest->input('product'));
- /** @var User $user */
$user = Auth::user();
+ $payment = Payment::findOrFail($laravelRequest->payment);
+ $shopProduct = ShopProduct::findOrFail($payment->shop_item_product_id);
+
$request = new OrdersCaptureRequest($laravelRequest->input('token'));
$request->prefer('return=representation');
+
try {
// Call API with your client and get a response for your call
$response = getPayPalClient()->execute($request);
@@ -136,38 +162,41 @@ function PaypalSuccess(Request $laravelRequest)
}
}
- //store payment
- $payment = Payment::create([
- 'user_id' => $user->id,
- 'payment_id' => $response->result->id,
- 'payment_method' => 'paypal',
- 'type' => $shopProduct->type,
- 'status' => 'paid',
- 'amount' => $shopProduct->quantity,
- 'price' => $shopProduct->price - ($shopProduct->price*PartnerDiscount::getDiscount()/100),
- 'tax_value' => $shopProduct->getTaxValue(),
- 'tax_percent' => $shopProduct->getTaxPercent(),
- 'total_price' => $shopProduct->getTotalPrice(),
- 'currency_code' => $shopProduct->currency_code,
- 'shop_item_product_id' => $shopProduct->id,
+
+ //update payment
+ $payment->update([
+ 'status' => 'success',
+ 'payment_id' => $response->result->id,
]);
+
event(new UserUpdateCreditsEvent($user));
event(new PaymentEvent($payment));
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
- }
- // If call returns body in response, you can get the deserialized version from the result attribute of the response
- if (env('APP_ENV') == 'local') {
+
+ error_log("Payment successfull");
+
+ // redirect to the payment success page with success message
+ Redirect::route('home')->with('success', 'Payment successful')->send();
+ } elseif(env('APP_ENV') == 'local') {
+ // If call returns body in response, you can get the deserialized version from the result attribute of the response
+ $payment->delete();
dd($response);
} else {
+ $payment->update([
+ 'status' => 'failed',
+ 'payment_id' => $response->result->id,
+ ]);
abort(500);
}
} catch (HttpException $ex) {
if (env('APP_ENV') == 'local') {
echo $ex->statusCode;
+ $payment->delete();
dd($ex->getMessage());
} else {
+ $payment->update([
+ 'status' => 'failed',
+ 'payment_id' => $response->result->id,
+ ]);
abort(422);
}
}
From 0257bf4e855b4ecd08afe00c2a2bfe5f7bdc4620 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 00:41:31 +0100
Subject: [PATCH 09/22] =?UTF-8?q?feat:=20=E2=9C=A8=20Added=20new=20events?=
=?UTF-8?q?=20to=20extract=20payment=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Events/PaymentEvent.php | 12 +--
...{PaymentListener.php => CreateInvoice.php} | 4 +-
app/Listeners/UserPayment.php | 78 +++++++++++++++++++
app/Providers/EventServiceProvider.php | 6 +-
4 files changed, 91 insertions(+), 9 deletions(-)
rename app/Listeners/{PaymentListener.php => CreateInvoice.php} (93%)
create mode 100644 app/Listeners/UserPayment.php
diff --git a/app/Events/PaymentEvent.php b/app/Events/PaymentEvent.php
index 3157de69..11711200 100644
--- a/app/Events/PaymentEvent.php
+++ b/app/Events/PaymentEvent.php
@@ -3,6 +3,8 @@
namespace App\Events;
use App\Models\Payment;
+use App\Models\ShopProduct;
+use App\Models\User;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
@@ -11,19 +13,19 @@ class PaymentEvent
{
use Dispatchable, InteractsWithSockets, SerializesModels;
- /**
- * @var User
- */
+ public User $user;
public Payment $payment;
-
+ public ShopProduct $shopProduct;
/**
* Create a new event instance.
*
* @return void
*/
- public function __construct(Payment $payment)
+ public function __construct(User $user, Payment $payment, ShopProduct $shopProduct)
{
+ $this->user = $user;
$this->payment = $payment;
+ $this->shopProduct = $shopProduct;
}
}
diff --git a/app/Listeners/PaymentListener.php b/app/Listeners/CreateInvoice.php
similarity index 93%
rename from app/Listeners/PaymentListener.php
rename to app/Listeners/CreateInvoice.php
index af7ab63d..08d772c0 100644
--- a/app/Listeners/PaymentListener.php
+++ b/app/Listeners/CreateInvoice.php
@@ -7,7 +7,7 @@ use App\Traits\Invoiceable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
-class PaymentListener
+class CreateInvoice implements ShouldQueue
{
use Invoiceable;
@@ -23,7 +23,7 @@ class PaymentListener
if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
// get user from payment which does hold the user_id
$user = $event->payment->user;
-
+
// create invoice using the trait
$this->createInvoice($user, $event->payment);
}
diff --git a/app/Listeners/UserPayment.php b/app/Listeners/UserPayment.php
new file mode 100644
index 00000000..e6729d9c
--- /dev/null
+++ b/app/Listeners/UserPayment.php
@@ -0,0 +1,78 @@
+user;
+ $shopProduct = $event->shopProduct;
+
+
+ //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')) {
+ $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
+ }
+ }
+ //update User with bought item
+ if ($shopProduct->type == "Credits") {
+ $user->increment('credits', $shopProduct->quantity);
+ } elseif ($shopProduct->type == "Server slots") {
+ $user->increment('server_limit', $shopProduct->quantity);
+ }
+ //give referral commission always
+ if ((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type == "Credits" && config("SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION") == "true") {
+ if ($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()) {
+ $ref_user = User::findOrFail($ref_user->referral_id);
+ $increment = number_format($shopProduct->quantity * (PartnerDiscount::getCommission($ref_user->id)) / 100, 0, "", "");
+ $ref_user->increment('credits', $increment);
+
+ //LOGS REFERRALS IN THE ACTIVITY LOG
+ activity()
+ ->performedOn($user)
+ ->causedBy($ref_user)
+ ->log('gained ' . $increment . ' ' . config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME") . ' for commission-referral of ' . $user->name . ' (ID:' . $user->id . ')');
+ }
+ }
+ //update role give Referral-reward
+ if ($user->role == 'member') {
+ $user->update(['role' => 'client']);
+
+ //give referral commission only on first purchase
+ if ((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type == "Credits" && config("SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION") == "false") {
+ if ($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()) {
+ $ref_user = User::findOrFail($ref_user->referral_id);
+ $increment = number_format($shopProduct->quantity * (PartnerDiscount::getCommission($ref_user->id)) / 100, 0, "", "");
+ $ref_user->increment('credits', $increment);
+
+ //LOGS REFERRALS IN THE ACTIVITY LOG
+ activity()
+ ->performedOn($user)
+ ->causedBy($ref_user)
+ ->log('gained ' . $increment . ' ' . config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME") . ' for commission-referral of ' . $user->name . ' (ID:' . $user->id . ')');
+ }
+ }
+ }
+
+ // LOGS PAYMENT IN THE ACTIVITY LOG
+ activity()
+ ->performedOn($user)
+ ->causedBy($user)
+ ->log('bought ' . $shopProduct->quantity . ' ' . $shopProduct->type . ' for ' . $shopProduct->price . $shopProduct->currency_code);
+ }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index a63efdd5..585b3e0f 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -4,8 +4,9 @@ namespace App\Providers;
use App\Events\PaymentEvent;
use App\Events\UserUpdateCreditsEvent;
-use App\Listeners\PaymentListener;
+use App\Listeners\CreateInvoice;
use App\Listeners\UnsuspendServers;
+use App\Listeners\UserPayment;
use App\Listeners\Verified;
use Illuminate\Auth\Events\Registered;
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
@@ -28,7 +29,8 @@ class EventServiceProvider extends ServiceProvider
UnsuspendServers::class,
],
PaymentEvent::class => [
- PaymentListener::class,
+ CreateInvoice::class,
+ UserPayment::class,
],
SocialiteWasCalled::class => [
// ... other providers
From b72d142a811fceaccd981575eab283b3c67ee645 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 00:41:57 +0100
Subject: [PATCH 10/22] =?UTF-8?q?chore:=20=F0=9F=94=A5=20Remove=20Paypal?=
=?UTF-8?q?=20Code=20from=20payment=20controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Admin/PaymentController.php | 31 +------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php
index 6bd11122..a543bc02 100644
--- a/app/Http/Controllers/Admin/PaymentController.php
+++ b/app/Http/Controllers/Admin/PaymentController.php
@@ -126,35 +126,6 @@ class PaymentController extends Controller
return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
}
- /**
- * @return PayPalHttpClient
- */
- protected function getPayPalClient()
- {
- $environment = env('APP_ENV') == 'local'
- ? new SandboxEnvironment($this->getPaypalClientId(), $this->getPaypalClientSecret())
- : new ProductionEnvironment($this->getPaypalClientId(), $this->getPaypalClientSecret());
-
- return new PayPalHttpClient($environment);
- }
-
- /**
- * @return string
- */
- protected function getPaypalClientId()
- {
- return env('APP_ENV') == 'local' ? config('SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID') : config('SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID');
- }
-
- /**
- * @return string
- */
- protected function getPaypalClientSecret()
- {
- return env('APP_ENV') == 'local' ? config('SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET') : config('SETTINGS::PAYMENTS:PAYPAL:SECRET');
- }
-
-
public function pay(Request $request)
{
$product = ShopProduct::find($request->product_id);
@@ -168,7 +139,7 @@ class PaymentController extends Controller
*/
public function Cancel(Request $request)
{
- return redirect()->route('store.index')->with('success', 'Payment was Canceled');
+ return redirect()->route('store.index')->with('info', 'Payment was Canceled');
}
/**
From f00a11da0ea394ed2d0402c9f33c0e3a796b010a Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 00:42:20 +0100
Subject: [PATCH 11/22] =?UTF-8?q?refactor:=20=F0=9F=94=A5=20Remove=20activ?=
=?UTF-8?q?tiylog=20from=20payment=20model=20->=20no=20spam?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Models/Payment.php | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index ac281d5e..04c32831 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -7,20 +7,11 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use NumberFormatter;
-use Spatie\Activitylog\LogOptions;
-use Spatie\Activitylog\Traits\LogsActivity;
class Payment extends Model
{
use HasFactory;
- use LogsActivity;
- public function getActivitylogOptions(): LogOptions
- {
- return LogOptions::defaults()
- -> logOnlyDirty()
- -> logOnly(['*'])
- -> dontSubmitEmptyLogs();
- }
+
public $incrementing = false;
/**
From 45aaac4189815252df4615c276c21efc5b10dec5 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 00:43:13 +0100
Subject: [PATCH 12/22] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20Extracte?=
=?UTF-8?q?d=20Payment=20logic=20to=20events?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PaymentGateways/PayPal/index.php | 127 ++++++------------
1 file changed, 39 insertions(+), 88 deletions(-)
diff --git a/app/Extensions/PaymentGateways/PayPal/index.php b/app/Extensions/PaymentGateways/PayPal/index.php
index 4a260155..3cee4748 100644
--- a/app/Extensions/PaymentGateways/PayPal/index.php
+++ b/app/Extensions/PaymentGateways/PayPal/index.php
@@ -31,15 +31,15 @@ function PaypalPay(Request $request)
$user = Auth::user();
$shopProduct = ShopProduct::findOrFail($request->shopProduct);
- // create a new payment
- $payment = Payment::create([
+ // create a new payment
+ $payment = Payment::create([
'user_id' => $user->id,
'payment_id' => null,
'payment_method' => 'paypal',
'type' => $shopProduct->type,
'status' => 'open',
'amount' => $shopProduct->quantity,
- 'price' => $shopProduct->price - ($shopProduct->price*PartnerDiscount::getDiscount()/100),
+ 'price' => $shopProduct->price - ($shopProduct->price * PartnerDiscount::getDiscount() / 100),
'tax_value' => $shopProduct->getTaxValue(),
'tax_percent' => $shopProduct->getTaxPercent(),
'total_price' => $shopProduct->getTotalPrice(),
@@ -50,52 +50,52 @@ function PaypalPay(Request $request)
$request = new OrdersCreateRequest();
$request->prefer('return=representation');
$request->body = [
- "intent" => "CAPTURE",
- "purchase_units" => [
- [
- "reference_id" => uniqid(),
- "description" => $shopProduct->display . (PartnerDiscount::getDiscount()?(" (" . __('Discount') . " " . PartnerDiscount::getDiscount() . '%)'):""),
- "amount" => [
- "value" => $shopProduct->getTotalPrice(),
- 'currency_code' => strtoupper($shopProduct->currency_code),
- 'breakdown' => [
- 'item_total' =>
- [
- 'currency_code' => strtoupper($shopProduct->currency_code),
- 'value' => $shopProduct->getPriceAfterDiscount(),
- ],
- 'tax_total' =>
- [
- 'currency_code' => strtoupper($shopProduct->currency_code),
- 'value' => $shopProduct->getTaxValue(),
- ]
+ "intent" => "CAPTURE",
+ "purchase_units" => [
+ [
+ "reference_id" => uniqid(),
+ "description" => $shopProduct->display . (PartnerDiscount::getDiscount() ? (" (" . __('Discount') . " " . PartnerDiscount::getDiscount() . '%)') : ""),
+ "amount" => [
+ "value" => $shopProduct->getTotalPrice(),
+ 'currency_code' => strtoupper($shopProduct->currency_code),
+ 'breakdown' => [
+ 'item_total' =>
+ [
+ 'currency_code' => strtoupper($shopProduct->currency_code),
+ 'value' => $shopProduct->getPriceAfterDiscount(),
+ ],
+ 'tax_total' =>
+ [
+ 'currency_code' => strtoupper($shopProduct->currency_code),
+ 'value' => $shopProduct->getTaxValue(),
]
]
]
- ],
- "application_context" => [
- "cancel_url" => route('payment.Cancel'),
- "return_url" => route('payment.PayPalSuccess', ['payment' => $payment->id]),
- 'brand_name' => config('app.name', 'Laravel'),
- 'shipping_preference' => 'NO_SHIPPING'
]
+ ],
+ "application_context" => [
+ "cancel_url" => route('payment.Cancel'),
+ "return_url" => route('payment.PayPalSuccess', ['payment' => $payment->id]),
+ 'brand_name' => config('app.name', 'Laravel'),
+ 'shipping_preference' => 'NO_SHIPPING'
+ ]
];
-
-
try {
// Call API with your client and get a response for your call
$response = getPayPalClient()->execute($request);
Redirect::away($response->result->links[1]->href)->send();
+ return;
} catch (HttpException $ex) {
error_log($ex->statusCode);
error_log($ex->getMessage());
$payment->delete();
- return Redirect::route('payment.Cancel');
+ Redirect::route('payment.Cancel');
+ return;
}
}
/**
@@ -104,9 +104,11 @@ function PaypalPay(Request $request)
function PaypalSuccess(Request $laravelRequest)
{
$user = Auth::user();
+ $user = User::findOrFail($user->id);
+
$payment = Payment::findOrFail($laravelRequest->payment);
$shopProduct = ShopProduct::findOrFail($payment->shop_item_product_id);
-
+
$request = new OrdersCaptureRequest($laravelRequest->input('token'));
$request->prefer('return=representation');
@@ -114,55 +116,6 @@ function PaypalSuccess(Request $laravelRequest)
// Call API with your client and get a response for your call
$response = getPayPalClient()->execute($request);
if ($response->statusCode == 201 || $response->statusCode == 200) {
- //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')) {
- $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
- }
- }
- //update User with bought item
- if ($shopProduct->type=="Credits") {
- $user->increment('credits', $shopProduct->quantity);
- }elseif ($shopProduct->type=="Server slots"){
- $user->increment('server_limit', $shopProduct->quantity);
- }
- //give referral commission always
- if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type=="Credits" && config("SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION") == "true"){
- if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
- $ref_user = User::findOrFail($ref_user->referral_id);
- $increment = number_format($shopProduct->quantity*(PartnerDiscount::getCommission($ref_user->id))/100,0,"","");
- $ref_user->increment('credits', $increment);
-
- //LOGS REFERRALS IN THE ACTIVITY LOG
- activity()
- ->performedOn($user)
- ->causedBy($ref_user)
- ->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
- }
-
- }
- //update role give Referral-reward
- if ($user->role == 'member') {
- $user->update(['role' => 'client']);
-
- //give referral commission only on first purchase
- if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type=="Credits" && config("SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION") == "false"){
- if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
- $ref_user = User::findOrFail($ref_user->referral_id);
- $increment = number_format($shopProduct->quantity*(PartnerDiscount::getCommission($ref_user->id))/100,0,"","");
- $ref_user->increment('credits', $increment);
-
- //LOGS REFERRALS IN THE ACTIVITY LOG
- activity()
- ->performedOn($user)
- ->causedBy($ref_user)
- ->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
- }
-
- }
-
- }
-
//update payment
$payment->update([
'status' => 'success',
@@ -170,13 +123,11 @@ function PaypalSuccess(Request $laravelRequest)
]);
event(new UserUpdateCreditsEvent($user));
- event(new PaymentEvent($payment));
-
- error_log("Payment successfull");
+ event(new PaymentEvent($user, $payment, $shopProduct));
// redirect to the payment success page with success message
Redirect::route('home')->with('success', 'Payment successful')->send();
- } elseif(env('APP_ENV') == 'local') {
+ } elseif (env('APP_ENV') == 'local') {
// If call returns body in response, you can get the deserialized version from the result attribute of the response
$payment->delete();
dd($response);
@@ -184,7 +135,7 @@ function PaypalSuccess(Request $laravelRequest)
$payment->update([
'status' => 'failed',
'payment_id' => $response->result->id,
- ]);
+ ]);
abort(500);
}
} catch (HttpException $ex) {
@@ -196,7 +147,7 @@ function PaypalSuccess(Request $laravelRequest)
$payment->update([
'status' => 'failed',
'payment_id' => $response->result->id,
- ]);
+ ]);
abort(422);
}
}
@@ -262,4 +213,4 @@ function getConfig()
],
],
];
-}
\ No newline at end of file
+}
From eb122a99f2ef91166193ed30139926ad44d9eb0c Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 01:39:38 +0100
Subject: [PATCH 13/22] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Give=20Config=20Met?=
=?UTF-8?q?hod=20the=20extension=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Extensions/PaymentGateways/PayPal/index.php | 2 +-
app/Helpers/ExtensionHelper.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/Extensions/PaymentGateways/PayPal/index.php b/app/Extensions/PaymentGateways/PayPal/index.php
index 3cee4748..56314c66 100644
--- a/app/Extensions/PaymentGateways/PayPal/index.php
+++ b/app/Extensions/PaymentGateways/PayPal/index.php
@@ -176,7 +176,7 @@ function getPaypalClientSecret()
{
return env('APP_ENV') == 'local' ? config("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET") : config("SETTINGS::PAYMENTS:PAYPAL:SECRET");
}
-function getConfig()
+function getPayPalConfig()
{
return [
"name" => "PayPal",
diff --git a/app/Helpers/ExtensionHelper.php b/app/Helpers/ExtensionHelper.php
index d302f248..884b9f2f 100644
--- a/app/Helpers/ExtensionHelper.php
+++ b/app/Helpers/ExtensionHelper.php
@@ -16,11 +16,11 @@ class ExtensionHelper
$config = include_once $extension;
// Check if the getConfig function exists
- if (!function_exists('getConfig')) {
+ if (!function_exists('get' . $extensionName . 'Config')) {
return null;
}
- $config = call_user_func('getConfig');
+ $config = call_user_func('get' . $extensionName . 'Config');
// Check if the getConfig function returned an array
if (!is_array($config)) {
@@ -44,4 +44,4 @@ class ExtensionHelper
return $config['payMethod'];
}
-}
\ No newline at end of file
+}
From 8516523efa013e7efd21ba4887224f490d79ddbc Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 01:39:54 +0100
Subject: [PATCH 14/22] =?UTF-8?q?style:=20=F0=9F=92=84=20Margin=20on=20pay?=
=?UTF-8?q?ment=20methods?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
themes/default/views/store/checkout.blade.php | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/themes/default/views/store/checkout.blade.php b/themes/default/views/store/checkout.blade.php
index 749b7c98..39254bba 100644
--- a/themes/default/views/store/checkout.blade.php
+++ b/themes/default/views/store/checkout.blade.php
@@ -79,14 +79,17 @@
-
- {{ config('app.name', 'Laravel') }} - {{ __('Date') }}: - {{ Carbon\Carbon::now()->isoFormat('LL') }} -
+{{ __('Payment Methods') }}:
-
+
@foreach ($paymentGateways as $gateway)
-
+
From e6ef07139db60d52184edbeebb3f6e206999e904 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 01:40:25 +0100
Subject: [PATCH 15/22] =?UTF-8?q?feat:=20=E2=9C=A8=20Moved=20Stripe=20rout?=
=?UTF-8?q?es=20to=20extension?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PaymentGateways/Stripe/routes.php | 22 +++++++++++++++++++
routes/web.php | 11 +++-------
2 files changed, 25 insertions(+), 8 deletions(-)
create mode 100644 app/Extensions/PaymentGateways/Stripe/routes.php
diff --git a/app/Extensions/PaymentGateways/Stripe/routes.php b/app/Extensions/PaymentGateways/Stripe/routes.php
new file mode 100644
index 00000000..9322202a
--- /dev/null
+++ b/app/Extensions/PaymentGateways/Stripe/routes.php
@@ -0,0 +1,22 @@
+name('payment.StripePay');
+
+Route::get(
+ 'payment/StripeSuccess',
+ function () {
+ StripeSuccess(request());
+ }
+)->name('payment.StripeSuccess');
+
+
+// Stripe WebhookRoute -> validation in Route Handler
+Route::post('payment/StripeWebhooks', function () {
+ StripeWebhooks(request());
+})->name('payment.StripeWebhooks');
diff --git a/routes/web.php b/routes/web.php
index 35371bab..709bfff7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -49,17 +49,14 @@ Route::middleware('guest')->get('/', function () {
Auth::routes(['verify' => true]);
-// Stripe WebhookRoute -> validation in Route Handler
-Route::post('payment/StripeWebhooks', [PaymentController::class, 'StripeWebhooks'])->name('payment.StripeWebhooks');
-
Route::get('/privacy', function () {
-return view('information.privacy');
+ return view('information.privacy');
})->name('privacy');
Route::get('/imprint', function () {
-return view('information.imprint');
+ return view('information.imprint');
})->name('imprint');
Route::get('/tos', function () {
-return view('information.tos');
+ return view('information.tos');
})->name('tos');
Route::middleware(['auth', 'checkSuspended'])->group(function () {
@@ -91,8 +88,6 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
//payments
Route::get('checkout/{shopProduct}', [PaymentController::class, 'checkOut'])->name('checkout');
Route::post('payment/pay', [PaymentController::class, 'pay'])->name('payment.pay');
- Route::get('payment/StripePay/{shopProduct}', [PaymentController::class, 'StripePay'])->name('payment.StripePay');
- Route::get('payment/StripeSuccess', [PaymentController::class, 'StripeSuccess'])->name('payment.StripeSuccess');
Route::get('payment/FreePay/{shopProduct}', [PaymentController::class, 'FreePay'])->name('payment.FreePay');
Route::get('payment/Cancel', [PaymentController::class, 'Cancel'])->name('payment.Cancel');
From a34825a6920fc7c917c555138c909ad0ac55a488 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 01:41:16 +0100
Subject: [PATCH 16/22] =?UTF-8?q?feat:=20=E2=9C=A8=20Moved=20Stripe=20func?=
=?UTF-8?q?tions=20to=20extension?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PaymentGateways/Stripe/index.php | 400 ++++++++++++++++
.../Controllers/Admin/PaymentController.php | 443 +-----------------
2 files changed, 416 insertions(+), 427 deletions(-)
create mode 100644 app/Extensions/PaymentGateways/Stripe/index.php
diff --git a/app/Extensions/PaymentGateways/Stripe/index.php b/app/Extensions/PaymentGateways/Stripe/index.php
new file mode 100644
index 00000000..134ca414
--- /dev/null
+++ b/app/Extensions/PaymentGateways/Stripe/index.php
@@ -0,0 +1,400 @@
+shopProduct);
+
+ // check if the price is valid for stripe
+ if (!checkPriceAmount($shopProduct->getTotalPrice(), strtoupper($shopProduct->currency_code), 'stripe')) {
+ Redirect::route('home')->with('error', __('The product you chose can\'t be purchased with this payment method. The total amount is too small. Please buy a bigger amount or try a different payment method.'))->send();
+ return;
+ }
+
+
+ // create payment
+ $payment = Payment::create([
+ 'user_id' => $user->id,
+ 'payment_id' => null,
+ 'payment_method' => 'stripe',
+ 'type' => $shopProduct->type,
+ 'status' => 'open',
+ 'amount' => $shopProduct->quantity,
+ 'price' => $shopProduct->price - ($shopProduct->price * PartnerDiscount::getDiscount() / 100),
+ 'tax_value' => $shopProduct->getTaxValue(),
+ 'total_price' => $shopProduct->getTotalPrice(),
+ 'tax_percent' => $shopProduct->getTaxPercent(),
+ 'currency_code' => $shopProduct->currency_code,
+ 'shop_item_product_id' => $shopProduct->id,
+ ]);
+
+ $stripeClient = getStripeClient();
+ $request = $stripeClient->checkout->sessions->create([
+ 'line_items' => [
+ [
+ 'price_data' => [
+ 'currency' => $shopProduct->currency_code,
+ 'product_data' => [
+ 'name' => $shopProduct->display . (PartnerDiscount::getDiscount() ? (' (' . __('Discount') . ' ' . PartnerDiscount::getDiscount() . '%)') : ''),
+ 'description' => $shopProduct->description,
+ ],
+ 'unit_amount_decimal' => round($shopProduct->getPriceAfterDiscount() * 100, 2),
+ ],
+ 'quantity' => 1,
+ ],
+ [
+ 'price_data' => [
+ 'currency' => $shopProduct->currency_code,
+ 'product_data' => [
+ 'name' => __('Tax'),
+ 'description' => $shopProduct->getTaxPercent() . '%',
+ ],
+ 'unit_amount_decimal' => round($shopProduct->getTaxValue(), 2) * 100,
+ ],
+ 'quantity' => 1,
+ ],
+ ],
+
+ 'mode' => 'payment',
+ 'payment_method_types' => str_getcsv(config('SETTINGS::PAYMENTS:STRIPE:METHODS')),
+ 'success_url' => route('payment.StripeSuccess', ['payment' => $payment->id]) . '&session_id={CHECKOUT_SESSION_ID}',
+ 'cancel_url' => route('payment.Cancel'),
+ ]);
+
+ Redirect::to($request->url)->send();
+}
+
+/**
+ * @param Request $request
+ */
+function StripeSuccess(Request $request)
+{
+ $user = Auth::user();
+ error_log('StripeSuccess');
+ $payment = Payment::findOrFail($request->input('payment'));
+ $shopProduct = ShopProduct::findOrFail($payment->shop_item_product_id);
+
+
+ $stripeClient = getStripeClient();
+ try {
+ //get stripe data
+ $paymentSession = $stripeClient->checkout->sessions->retrieve($request->input('session_id'));
+ $paymentIntent = $stripeClient->paymentIntents->retrieve($paymentSession->payment_intent);
+
+ //get DB entry of this payment ID if existing
+ $paymentDbEntry = Payment::where('payment_id', $paymentSession->payment_intent)->count();
+
+ // check if payment is 100% completed and payment does not exist in db already
+ if ($paymentSession->status == 'complete' && $paymentIntent->status == 'succeeded' && $paymentDbEntry == 0) {
+
+ //update payment
+ $payment->update([
+ 'payment_id' => $paymentSession->payment_intent,
+ 'status' => 'paid',
+ ]);
+
+ //payment notification
+ $user->notify(new ConfirmPaymentNotification($payment));
+
+ event(new UserUpdateCreditsEvent($user));
+ event(new PaymentEvent($user, $payment, $shopProduct));
+
+ //redirect back to home
+ Redirect::route('home')->with('success', 'Payment successful')->send();
+ } else {
+ if ($paymentIntent->status == 'processing') {
+
+ //update payment
+ $payment->update([
+ 'payment_id' => $paymentSession->payment_intent,
+ 'status' => 'processing',
+ ]);
+
+ // todo invoice
+ event(new PaymentEvent($user, $payment, $shopProduct));
+
+ Redirect::route('home')->with('success', 'Your payment is being processed')->send();
+ }
+
+ if ($paymentDbEntry == 0 && $paymentIntent->status != 'processing') {
+ $stripeClient->paymentIntents->cancel($paymentIntent->id);
+
+ //redirect back to home
+ Redirect::route('home')->with('info', __('Your payment has been canceled!'))->send();
+ } else {
+ abort(402);
+ }
+ }
+ } catch (Exception $e) {
+ if (env('APP_ENV') == 'local') {
+ dd($e->getMessage());
+ } else {
+ abort(422);
+ }
+ }
+}
+
+/**
+ * @param Request $request
+ */
+function handleStripePaymentSuccessHook($paymentIntent)
+{
+ try {
+ // Get payment db entry
+ $payment = Payment::where('payment_id', $paymentIntent->id)->first();
+ $user = User::where('id', $payment->user_id)->first();
+ $shopProduct = ShopProduct::findOrFail($payment->shop_item_product_id);
+
+ if ($paymentIntent->status == 'succeeded' && $payment->status == 'processing') {
+
+
+ //update payment db entry status
+ $payment->update(['status' => 'paid']);
+
+ //payment notification
+ $user->notify(new ConfirmPaymentNotification($payment));
+ event(new UserUpdateCreditsEvent($user));
+ event(new PaymentEvent($user, $payment, $shopProduct));
+ }
+ } catch (Exception $ex) {
+ abort(422);
+ }
+}
+
+/**
+ * @param Request $request
+ */
+function StripeWebhooks(Request $request)
+{
+ Stripe::setApiKey(getStripeSecret());
+
+ try {
+ $payload = @file_get_contents('php://input');
+ $sig_header = $request->header('Stripe-Signature');
+ $event = null;
+ $event = \Stripe\Webhook::constructEvent(
+ $payload,
+ $sig_header,
+ getStripeEndpointSecret()
+ );
+ } catch (\UnexpectedValueException $e) {
+ // Invalid payload
+
+ abort(400);
+ } catch (SignatureVerificationException $e) {
+ // Invalid signature
+
+ abort(400);
+ }
+
+ // Handle the event
+ switch ($event->type) {
+ case 'payment_intent.succeeded':
+ $paymentIntent = $event->data->object; // contains a \Stripe\PaymentIntent
+ handleStripePaymentSuccessHook($paymentIntent);
+ break;
+ default:
+ echo 'Received unknown event type ' . $event->type;
+ }
+}
+
+/**
+ * @return \Stripe\StripeClient
+ */
+function getStripeClient()
+{
+ return new StripeClient(getStripeSecret());
+}
+
+/**
+ * @return string
+ */
+function getStripeSecret()
+{
+ return env('APP_ENV') == 'local'
+ ? config('SETTINGS::PAYMENTS:STRIPE:TEST_SECRET')
+ : config('SETTINGS::PAYMENTS:STRIPE:SECRET');
+}
+
+/**
+ * @return string
+ */
+function getStripeEndpointSecret()
+{
+ return env('APP_ENV') == 'local'
+ ? config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET')
+ : config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET');
+}
+/**
+ * @param $amount
+ * @param $currencyCode
+ * @param $payment_method
+ * @return bool
+ * @description check if the amount is higher than the minimum amount for the stripe gateway
+ */
+function checkPriceAmount($amount, $currencyCode, $payment_method)
+{
+ $minimums = [
+ "USD" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "AED" => [
+ "paypal" => 0,
+ "stripe" => 2
+ ],
+ "AUD" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "BGN" => [
+ "paypal" => 0,
+ "stripe" => 1
+ ],
+ "BRL" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "CAD" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "CHF" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "CZK" => [
+ "paypal" => 0,
+ "stripe" => 15
+ ],
+ "DKK" => [
+ "paypal" => 0,
+ "stripe" => 2.5
+ ],
+ "EUR" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "GBP" => [
+ "paypal" => 0,
+ "stripe" => 0.3
+ ],
+ "HKD" => [
+ "paypal" => 0,
+ "stripe" => 4
+ ],
+ "HRK" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "HUF" => [
+ "paypal" => 0,
+ "stripe" => 175
+ ],
+ "INR" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "JPY" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "MXN" => [
+ "paypal" => 0,
+ "stripe" => 10
+ ],
+ "MYR" => [
+ "paypal" => 0,
+ "stripe" => 2
+ ],
+ "NOK" => [
+ "paypal" => 0,
+ "stripe" => 3
+ ],
+ "NZD" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "PLN" => [
+ "paypal" => 0,
+ "stripe" => 2
+ ],
+ "RON" => [
+ "paypal" => 0,
+ "stripe" => 2
+ ],
+ "SEK" => [
+ "paypal" => 0,
+ "stripe" => 3
+ ],
+ "SGD" => [
+ "paypal" => 0,
+ "stripe" => 0.5
+ ],
+ "THB" => [
+ "paypal" => 0,
+ "stripe" => 10
+ ]
+ ];
+ return $amount >= $minimums[$currencyCode][$payment_method];
+}
+
+function getStripeConfig()
+{
+ return [
+ "name" => "Stripe",
+ "description" => "Stripe payment gateway",
+ "mode" => [
+ "type" => "select",
+ "label" => "Mode",
+ "value" => config("APP_ENV") == 'local' ? "sandbox" : "live",
+ "options" => [
+ "sandbox" => "Sandbox",
+ "live" => "Live",
+ ],
+ ],
+ "TEST_SECRET" => [
+ "type" => "text",
+ "label" => "Test Secret Key",
+ "value" => config("SETTINGS::PAYMENTS:STRIPE:TEST_SECRET"),
+ ],
+ "SECRET" => [
+ "type" => "text",
+ "label" => "Live Secret Key",
+ "value" => config("SETTINGS::PAYMENTS:STRIPE:SECRET"),
+ ],
+ "ENDPOINT_TEST_SECRET" => [
+ "type" => "text",
+ "label" => "Test Endpoint Secret",
+ "value" => config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET"),
+ ],
+ "ENDPOINT_SECRET" => [
+ "type" => "text",
+ "label" => "Live Endpoint Secret",
+ "value" => config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET"),
+ ],
+ ];
+}
diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php
index a543bc02..11cf78c3 100644
--- a/app/Http/Controllers/Admin/PaymentController.php
+++ b/app/Http/Controllers/Admin/PaymentController.php
@@ -60,8 +60,7 @@ class PaymentController extends Controller
$paymentGateways[] = $payment;
}
}
-
-
+
return view('store.checkout')->with([
'product' => $shopProduct,
'discountpercent' => PartnerDiscount::getDiscount(),
@@ -83,8 +82,8 @@ class PaymentController extends Controller
{
//dd($shopProduct);
//check if the product is really free or the discount is 100%
- if($shopProduct->getTotalPrice()>0) return redirect()->route('home')->with('error', __('An error ocured. Please try again.'));
-
+ if ($shopProduct->getTotalPrice() > 0) return redirect()->route('home')->with('error', __('An error ocured. Please try again.'));
+
//give product
/** @var User $user */
$user = Auth::user();
@@ -92,14 +91,14 @@ class PaymentController extends Controller
//not updating server limit
//update User with bought item
- if ($shopProduct->type=="Credits") {
+ if ($shopProduct->type == "Credits") {
$user->increment('credits', $shopProduct->quantity);
- }elseif ($shopProduct->type=="Server slots"){
+ } elseif ($shopProduct->type == "Server slots") {
$user->increment('server_limit', $shopProduct->quantity);
}
//skipped the referral commission, because the user did not pay anything.
-
+
//not giving client role
//store payment
@@ -110,7 +109,7 @@ class PaymentController extends Controller
'type' => $shopProduct->type,
'status' => 'paid',
'amount' => $shopProduct->quantity,
- 'price' => $shopProduct->price - ($shopProduct->price*PartnerDiscount::getDiscount()/100),
+ 'price' => $shopProduct->price - ($shopProduct->price * PartnerDiscount::getDiscount() / 100),
'tax_value' => $shopProduct->getTaxValue(),
'tax_percent' => $shopProduct->getTaxPercent(),
'total_price' => $shopProduct->getTotalPrice(),
@@ -126,8 +125,8 @@ class PaymentController extends Controller
return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
}
- public function pay(Request $request)
- {
+ public function pay(Request $request)
+ {
$product = ShopProduct::find($request->product_id);
$paymentGateway = $request->payment_method;
@@ -142,416 +141,6 @@ class PaymentController extends Controller
return redirect()->route('store.index')->with('info', 'Payment was Canceled');
}
- /**
- * @param Request $request
- * @param ShopProduct $shopProduct
- * @return RedirectResponse
- */
- public function StripePay(Request $request, ShopProduct $shopProduct)
- {
- if(!$this->checkAmount($shopProduct->getTotalPrice(), strtoupper($shopProduct->currency_code), "stripe")) return redirect()->route('home')->with('error', __('The product you chose can´t be purchased with this payment method. The total amount is too small. Please buy a bigger amount or try a different payment method.'));
- $stripeClient = $this->getStripeClient();
-
- $request = $stripeClient->checkout->sessions->create([
- 'line_items' => [
- [
- 'price_data' => [
- 'currency' => $shopProduct->currency_code,
- 'product_data' => [
- 'name' => $shopProduct->display.(PartnerDiscount::getDiscount() ? (' ('.__('Discount').' '.PartnerDiscount::getDiscount().'%)') : ''),
- 'description' => $shopProduct->description,
- ],
- 'unit_amount_decimal' => round($shopProduct->getPriceAfterDiscount() * 100, 2),
- ],
- 'quantity' => 1,
- ],
- [
- 'price_data' => [
- 'currency' => $shopProduct->currency_code,
- 'product_data' => [
- 'name' => __('Tax'),
- 'description' => $shopProduct->getTaxPercent().'%',
- ],
- 'unit_amount_decimal' => round($shopProduct->getTaxValue(), 2) * 100,
- ],
- 'quantity' => 1,
- ],
- ],
-
- 'mode' => 'payment',
- 'payment_method_types' => str_getcsv(config('SETTINGS::PAYMENTS:STRIPE:METHODS')),
- 'success_url' => route('payment.StripeSuccess', ['product' => $shopProduct->id]).'&session_id={CHECKOUT_SESSION_ID}',
- 'cancel_url' => route('payment.Cancel'),
- ]);
-
- return redirect($request->url, 303);
- }
-
- /**
- * @param Request $request
- */
- public function StripeSuccess(Request $request)
- {
- /** @var ShopProduct $shopProduct */
- $shopProduct = ShopProduct::findOrFail($request->input('product'));
-
- /** @var User $user */
- $user = Auth::user();
-
- $stripeClient = $this->getStripeClient();
-
- try {
- //get stripe data
- $paymentSession = $stripeClient->checkout->sessions->retrieve($request->input('session_id'));
- $paymentIntent = $stripeClient->paymentIntents->retrieve($paymentSession->payment_intent);
-
- //get DB entry of this payment ID if existing
- $paymentDbEntry = Payment::where('payment_id', $paymentSession->payment_intent)->count();
-
- // check if payment is 100% completed and payment does not exist in db already
- if ($paymentSession->status == 'complete' && $paymentIntent->status == 'succeeded' && $paymentDbEntry == 0) {
-
- //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')) {
- $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
- }
- }
-
- //update User with bought item
- if ($shopProduct->type == 'Credits') {
- $user->increment('credits', $shopProduct->quantity);
- } elseif ($shopProduct->type == 'Server slots') {
- $user->increment('server_limit', $shopProduct->quantity);
- }
-
- //update role give Referral-reward
- if ($user->role == 'member') {
- $user->update(['role' => 'client']);
-
- if ((config('SETTINGS::REFERRAL:MODE') == 'commission' || config('SETTINGS::REFERRAL:MODE') == 'both') && $shopProduct->type == 'Credits') {
- if ($ref_user = DB::table('user_referrals')->where('registered_user_id', '=', $user->id)->first()) {
- $ref_user = User::findOrFail($ref_user->referral_id);
- $increment = number_format($shopProduct->quantity / 100 * config('SETTINGS::REFERRAL:PERCENTAGE'), 0, '', '');
- $ref_user->increment('credits', $increment);
-
- //LOGS REFERRALS IN THE ACTIVITY LOG
- activity()
- ->performedOn($user)
- ->causedBy($ref_user)
- ->log('gained '.$increment.' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
- }
- }
- }
-
- //store paid payment
- $payment = Payment::create([
- 'user_id' => $user->id,
- 'payment_id' => $paymentSession->payment_intent,
- 'payment_method' => 'stripe',
- 'type' => $shopProduct->type,
- 'status' => 'paid',
- 'amount' => $shopProduct->quantity,
- 'price' => $shopProduct->price - ($shopProduct->price * PartnerDiscount::getDiscount() / 100),
- '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
- $user->notify(new ConfirmPaymentNotification($payment));
-
- event(new UserUpdateCreditsEvent($user));
-
- //only create invoice if SETTINGS::INVOICE:ENABLED is true
- if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
- $this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
- }
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
- } else {
- if ($paymentIntent->status == 'processing') {
-
- //store processing payment
- $payment = Payment::create([
- 'user_id' => $user->id,
- 'payment_id' => $paymentSession->payment_intent,
- 'payment_method' => 'stripe',
- 'type' => $shopProduct->type,
- 'status' => 'processing',
- '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', $shopProduct->currency_code);
- }
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your payment is being processed!'));
- }
- if ($paymentDbEntry == 0 && $paymentIntent->status != 'processing') {
- $stripeClient->paymentIntents->cancel($paymentIntent->id);
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your payment has been canceled!'));
- } else {
- abort(402);
- }
- }
- } catch (HttpException $ex) {
- if (env('APP_ENV') == 'local') {
- echo $ex->statusCode;
- dd($ex->getMessage());
- } else {
- abort(422);
- }
- }
- }
-
- /**
- * @param Request $request
- */
- protected function handleStripePaymentSuccessHook($paymentIntent)
- {
- try {
- // Get payment db entry
- $payment = Payment::where('payment_id', $paymentIntent->id)->first();
- $user = User::where('id', $payment->user_id)->first();
-
- if ($paymentIntent->status == 'succeeded' && $payment->status == 'processing') {
-
- //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')) {
- $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
- }
- }
- //update User with bought item
- if ($shopProduct->type == 'Credits') {
- $user->increment('credits', $shopProduct->quantity);
- } elseif ($shopProduct->type == 'Server slots') {
- $user->increment('server_limit', $shopProduct->quantity);
- }
-
- //update role give Referral-reward
- if ($user->role == 'member') {
- $user->update(['role' => 'client']);
-
- if ((config('SETTINGS::REFERRAL:MODE') == 'commission' || config('SETTINGS::REFERRAL:MODE') == 'both') && $shopProduct->type == 'Credits') {
- if ($ref_user = DB::table('user_referrals')->where('registered_user_id', '=', $user->id)->first()) {
- $ref_user = User::findOrFail($ref_user->referral_id);
- $increment = number_format($shopProduct->quantity / 100 * config('SETTINGS::REFERRAL:PERCENTAGE'), 0, '', '');
- $ref_user->increment('credits', $increment);
-
- //LOGS REFERRALS IN THE ACTIVITY LOG
- activity()
- ->performedOn($user)
- ->causedBy($ref_user)
- ->log('gained '.$increment.' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
- }
- }
- }
-
- //update payment db entry status
- $payment->update(['status' => 'paid']);
-
- //payment notification
- $user->notify(new ConfirmPaymentNotification($payment));
- event(new UserUpdateCreditsEvent($user));
-
- //only create invoice if SETTINGS::INVOICE:ENABLED is true
- if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
- $this->createInvoice($user, $payment, 'paid', strtoupper($paymentIntent->currency));
- }
- }
- } catch (HttpException $ex) {
- abort(422);
- }
- }
-
- /**
- * @param Request $request
- */
- public function StripeWebhooks(Request $request)
- {
- \Stripe\Stripe::setApiKey($this->getStripeSecret());
-
- try {
- $payload = @file_get_contents('php://input');
- $sig_header = $request->header('Stripe-Signature');
- $event = null;
- $event = \Stripe\Webhook::constructEvent(
- $payload,
- $sig_header,
- $this->getStripeEndpointSecret()
- );
- } catch (\UnexpectedValueException $e) {
- // Invalid payload
-
- abort(400);
- } catch (\Stripe\Exception\SignatureVerificationException $e) {
- // Invalid signature
-
- abort(400);
- }
-
- // Handle the event
- switch ($event->type) {
- case 'payment_intent.succeeded':
- $paymentIntent = $event->data->object; // contains a \Stripe\PaymentIntent
- $this->handleStripePaymentSuccessHook($paymentIntent);
- break;
- default:
- echo 'Received unknown event type '.$event->type;
- }
- }
-
- /**
- * @return \Stripe\StripeClient
- */
- protected function getStripeClient()
- {
- return new \Stripe\StripeClient($this->getStripeSecret());
- }
-
- /**
- * @return string
- */
- protected function getStripeSecret()
- {
- return env('APP_ENV') == 'local'
- ? config('SETTINGS::PAYMENTS:STRIPE:TEST_SECRET')
- : config('SETTINGS::PAYMENTS:STRIPE:SECRET');
- }
-
- /**
- * @return string
- */
- protected function getStripeEndpointSecret()
- {
- return env('APP_ENV') == 'local'
- ? config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET')
- : config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET');
- }
-
- public function checkAmount($amount, $currencyCode, $payment_method)
- {
- $minimums = [
- "USD" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "AED" => [
- "paypal" => 0,
- "stripe" => 2
- ],
- "AUD" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "BGN" => [
- "paypal" => 0,
- "stripe" => 1
- ],
- "BRL" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "CAD" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "CHF" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "CZK" => [
- "paypal" => 0,
- "stripe" => 15
- ],
- "DKK" => [
- "paypal" => 0,
- "stripe" => 2.5
- ],
- "EUR" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "GBP" => [
- "paypal" => 0,
- "stripe" => 0.3
- ],
- "HKD" => [
- "paypal" => 0,
- "stripe" => 4
- ],
- "HRK" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "HUF" => [
- "paypal" => 0,
- "stripe" => 175
- ],
- "INR" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "JPY" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "MXN" => [
- "paypal" => 0,
- "stripe" => 10
- ],
- "MYR" => [
- "paypal" => 0,
- "stripe" => 2
- ],
- "NOK" => [
- "paypal" => 0,
- "stripe" => 3
- ],
- "NZD" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "PLN" => [
- "paypal" => 0,
- "stripe" => 2
- ],
- "RON" => [
- "paypal" => 0,
- "stripe" => 2
- ],
- "SEK" => [
- "paypal" => 0,
- "stripe" => 3
- ],
- "SGD" => [
- "paypal" => 0,
- "stripe" => 0.5
- ],
- "THB" => [
- "paypal" => 0,
- "stripe" => 10
- ]
- ];
- return $amount >= $minimums[$currencyCode][$payment_method];
- }
-
-
/**
* @return JsonResponse|mixed
*
@@ -564,9 +153,7 @@ class PaymentController extends Controller
return datatables($query)
->addColumn('user', function (Payment $payment) {
- return
- ($payment->user)?''.$payment->user->name.'':__('Unknown user');
-
+ return ($payment->user) ? '' . $payment->user->name . '' : __('Unknown user');
})
->editColumn('price', function (Payment $payment) {
return $payment->formatToCurrency($payment->price);
@@ -575,18 +162,20 @@ class PaymentController extends Controller
return $payment->formatToCurrency($payment->tax_value);
})
->editColumn('tax_percent', function (Payment $payment) {
- return $payment->tax_percent.' %';
+ return $payment->tax_percent . ' %';
})
->editColumn('total_price', function (Payment $payment) {
return $payment->formatToCurrency($payment->total_price);
})
->editColumn('created_at', function (Payment $payment) {
- return ['display' => $payment->created_at ? $payment->created_at->diffForHumans() : '',
- 'raw' => $payment->created_at ? strtotime($payment->created_at) : ''];
+ return [
+ 'display' => $payment->created_at ? $payment->created_at->diffForHumans() : '',
+ 'raw' => $payment->created_at ? strtotime($payment->created_at) : ''
+ ];
})
->addColumn('actions', function (Payment $payment) {
- return '';
+ return '';
})
->rawColumns(['actions', 'user'])
->make(true);
From 11a8e50d2e6ecce8b3a4cc1306b0cb52c741e444 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 01:41:42 +0100
Subject: [PATCH 17/22] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Only=20update=20use?=
=?UTF-8?q?r=20credits=20etc.=20when=20paid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Listeners/UserPayment.php | 12 ++++++++----
app/Traits/Invoiceable.php | 5 ++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/app/Listeners/UserPayment.php b/app/Listeners/UserPayment.php
index e6729d9c..be947087 100644
--- a/app/Listeners/UserPayment.php
+++ b/app/Listeners/UserPayment.php
@@ -22,19 +22,23 @@ class UserPayment
$user = $event->user;
$shopProduct = $event->shopProduct;
+ // only update user if payment is paid
+ if ($event->payment->status != "paid") {
+ return;
+ }
//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')) {
- $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
- }
+ if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0 && $user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) {
+ $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
}
+
//update User with bought item
if ($shopProduct->type == "Credits") {
$user->increment('credits', $shopProduct->quantity);
} elseif ($shopProduct->type == "Server slots") {
$user->increment('server_limit', $shopProduct->quantity);
}
+
//give referral commission always
if ((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type == "Credits" && config("SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION") == "true") {
if ($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()) {
diff --git a/app/Traits/Invoiceable.php b/app/Traits/Invoiceable.php
index 4618215e..c9073d36 100644
--- a/app/Traits/Invoiceable.php
+++ b/app/Traits/Invoiceable.php
@@ -65,8 +65,8 @@ trait Invoiceable
->delimiter("-")
->sequence($newInvoiceID)
->serialNumberFormat(config("SETTINGS::INVOICE:PREFIX") . '{DELIMITER}{SERIES}{SEQUENCE}')
- ->currencyCode($payment->currency_code)
- ->currencySymbol(Currencies::getSymbol($payment->currency_code))
+ ->currencyCode(strtoupper($payment->currency_code))
+ ->currencySymbol(Currencies::getSymbol(strtoupper($payment->currency_code)))
->notes($notes);
if (file_exists($logoPath)) {
@@ -89,4 +89,3 @@ trait Invoiceable
$user->notify(new InvoiceNotification($invoice, $user, $payment));
}
}
-
From 314d4de81653c633c230ced43d42c98f0da47b22 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 02:22:03 +0100
Subject: [PATCH 18/22] =?UTF-8?q?fix:=20=F0=9F=90=9B=20TypeError?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Extensions/PaymentGateways/Stripe/index.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/Extensions/PaymentGateways/Stripe/index.php b/app/Extensions/PaymentGateways/Stripe/index.php
index 134ca414..ea0369e8 100644
--- a/app/Extensions/PaymentGateways/Stripe/index.php
+++ b/app/Extensions/PaymentGateways/Stripe/index.php
@@ -93,7 +93,7 @@ function StripePay(Request $request)
function StripeSuccess(Request $request)
{
$user = Auth::user();
- error_log('StripeSuccess');
+ $user = User::findOrFail($user->id);
$payment = Payment::findOrFail($request->input('payment'));
$shopProduct = ShopProduct::findOrFail($payment->shop_item_product_id);
@@ -133,7 +133,6 @@ function StripeSuccess(Request $request)
'status' => 'processing',
]);
- // todo invoice
event(new PaymentEvent($user, $payment, $shopProduct));
Redirect::route('home')->with('success', 'Your payment is being processed')->send();
@@ -179,6 +178,9 @@ function handleStripePaymentSuccessHook($paymentIntent)
event(new UserUpdateCreditsEvent($user));
event(new PaymentEvent($user, $payment, $shopProduct));
}
+
+ // return 200
+ return response()->json(['success' => true], 200);
} catch (Exception $ex) {
abort(422);
}
From c0ae772981eb5ffbd2a2107b46e2a90cb985f2ae Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Sun, 15 Jan 2023 02:24:16 +0100
Subject: [PATCH 19/22] =?UTF-8?q?chore:=20=E2=9A=B0=EF=B8=8F=20Remove=20de?=
=?UTF-8?q?ad=20"use"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Admin/PaymentController.php | 8 --------
1 file changed, 8 deletions(-)
diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php
index 11cf78c3..7ace1eef 100644
--- a/app/Http/Controllers/Admin/PaymentController.php
+++ b/app/Http/Controllers/Admin/PaymentController.php
@@ -8,7 +8,6 @@ use App\Models\PartnerDiscount;
use App\Models\Payment;
use App\Models\User;
use App\Models\ShopProduct;
-use App\Notifications\ConfirmPaymentNotification;
use Exception;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
@@ -17,12 +16,6 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use PayPalCheckoutSdk\Core\PayPalHttpClient;
-use PayPalCheckoutSdk\Core\ProductionEnvironment;
-use PayPalCheckoutSdk\Core\SandboxEnvironment;
-use PayPalHttp\HttpException;
-use Stripe\Stripe;
use App\Helpers\ExtensionHelper;
@@ -80,7 +73,6 @@ class PaymentController extends Controller
*/
public function FreePay(ShopProduct $shopProduct)
{
- //dd($shopProduct);
//check if the product is really free or the discount is 100%
if ($shopProduct->getTotalPrice() > 0) return redirect()->route('home')->with('error', __('An error ocured. Please try again.'));
From 41f8fd9550dffa5ddf93b2851a2c1a620f939afb Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Tue, 17 Jan 2023 15:35:53 +0100
Subject: [PATCH 20/22] =?UTF-8?q?fix:=20=F0=9F=90=9B=20PayPalSuccess=20pay?=
=?UTF-8?q?ment=20status=20"paid"=20&=20Require=20auth=20on=20payment=20ro?=
=?UTF-8?q?utes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PaymentGateways/PayPal/index.php | 6 +++---
.../PaymentGateways/PayPal/routes.php | 19 ++++++++++-------
.../PaymentGateways/Stripe/routes.php | 21 ++++++++++---------
3 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/app/Extensions/PaymentGateways/PayPal/index.php b/app/Extensions/PaymentGateways/PayPal/index.php
index 56314c66..aeb2310b 100644
--- a/app/Extensions/PaymentGateways/PayPal/index.php
+++ b/app/Extensions/PaymentGateways/PayPal/index.php
@@ -118,7 +118,7 @@ function PaypalSuccess(Request $laravelRequest)
if ($response->statusCode == 201 || $response->statusCode == 200) {
//update payment
$payment->update([
- 'status' => 'success',
+ 'status' => 'paid',
'payment_id' => $response->result->id,
]);
@@ -133,7 +133,7 @@ function PaypalSuccess(Request $laravelRequest)
dd($response);
} else {
$payment->update([
- 'status' => 'failed',
+ 'status' => 'cancelled',
'payment_id' => $response->result->id,
]);
abort(500);
@@ -145,7 +145,7 @@ function PaypalSuccess(Request $laravelRequest)
dd($ex->getMessage());
} else {
$payment->update([
- 'status' => 'failed',
+ 'status' => 'cancelled',
'payment_id' => $response->result->id,
]);
abort(422);
diff --git a/app/Extensions/PaymentGateways/PayPal/routes.php b/app/Extensions/PaymentGateways/PayPal/routes.php
index 714dfe9a..56497768 100644
--- a/app/Extensions/PaymentGateways/PayPal/routes.php
+++ b/app/Extensions/PaymentGateways/PayPal/routes.php
@@ -1,13 +1,18 @@
name('payment.PayPalPay');
+Route::middleware(['web', 'auth'])->group(function () {
+ Route::get('payment/PayPalPay/{shopProduct}', function () {
+ PaypalPay(request());
+ })->name('payment.PayPalPay');
-Route::get('payment/PayPalSuccess', function () {
- PaypalSuccess(request());
-}
-)->name('payment.PayPalSuccess');
+ Route::get(
+ 'payment/PayPalSuccess',
+ function () {
+ PaypalSuccess(request());
+ }
+ )->name('payment.PayPalSuccess');
+});
diff --git a/app/Extensions/PaymentGateways/Stripe/routes.php b/app/Extensions/PaymentGateways/Stripe/routes.php
index 9322202a..adf481da 100644
--- a/app/Extensions/PaymentGateways/Stripe/routes.php
+++ b/app/Extensions/PaymentGateways/Stripe/routes.php
@@ -3,17 +3,18 @@
use Illuminate\Support\Facades\Route;
include_once(__DIR__ . '/index.php');
+Route::middleware(['web', 'auth'])->group(function () {
+ Route::get('payment/StripePay/{shopProduct}', function () {
+ StripePay(request());
+ })->name('payment.StripePay');
-Route::get('payment/StripePay/{shopProduct}', function () {
- StripePay(request());
-})->name('payment.StripePay');
-
-Route::get(
- 'payment/StripeSuccess',
- function () {
- StripeSuccess(request());
- }
-)->name('payment.StripeSuccess');
+ Route::get(
+ 'payment/StripeSuccess',
+ function () {
+ StripeSuccess(request());
+ }
+ )->name('payment.StripeSuccess');
+});
// Stripe WebhookRoute -> validation in Route Handler
From 30f70b35a2148cb4acbecd24826368720bddeaf9 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Wed, 18 Jan 2023 18:01:54 +0100
Subject: [PATCH 21/22] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Disabled=20submit?=
=?UTF-8?q?=20button=20when=20no=20method=20choosen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
themes/default/views/store/checkout.blade.php | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/themes/default/views/store/checkout.blade.php b/themes/default/views/store/checkout.blade.php
index 39254bba..cab3d937 100644
--- a/themes/default/views/store/checkout.blade.php
+++ b/themes/default/views/store/checkout.blade.php
@@ -28,7 +28,7 @@
+
+
@endforeach
-