diff --git a/app/Extensions/PaymentGateways/Mollie/web_routes.php b/app/Extensions/PaymentGateways/Mollie/web_routes.php
index 2314774a..6d07f533 100644
--- a/app/Extensions/PaymentGateways/Mollie/web_routes.php
+++ b/app/Extensions/PaymentGateways/Mollie/web_routes.php
@@ -4,10 +4,6 @@ use Illuminate\Support\Facades\Route;
use App\Extensions\PaymentGateways\Mollie\MollieExtension;
Route::middleware(['web', 'auth'])->group(function () {
- Route::get('payment/MolliePay/{shopProduct}', function (MollieExtension $mollieExtension) {
- $mollieExtension->pay(request());
- })->name('payment.MolliePay');
-
Route::get(
'payment/MollieSuccess',
function () {
diff --git a/app/Extensions/PaymentGateways/PayPal/web_routes.php b/app/Extensions/PaymentGateways/PayPal/web_routes.php
index 17d1ed02..75b1da19 100644
--- a/app/Extensions/PaymentGateways/PayPal/web_routes.php
+++ b/app/Extensions/PaymentGateways/PayPal/web_routes.php
@@ -4,10 +4,6 @@ use Illuminate\Support\Facades\Route;
use App\Extensions\PaymentGateways\PayPal\PayPalExtension;
Route::middleware(['web', 'auth'])->group(function () {
- Route::get('payment/PayPalPay/{shopProduct}', function (PayPalExtension $payPalExtension) {
- $payPalExtension->PaypalPay(request());
- })->name('payment.PayPalPay');
-
Route::get(
'payment/PayPalSuccess',
function () {
diff --git a/app/Extensions/PaymentGateways/Stripe/web_routes.php b/app/Extensions/PaymentGateways/Stripe/web_routes.php
index c5640aba..742940d8 100644
--- a/app/Extensions/PaymentGateways/Stripe/web_routes.php
+++ b/app/Extensions/PaymentGateways/Stripe/web_routes.php
@@ -4,10 +4,6 @@ use Illuminate\Support\Facades\Route;
use App\Extensions\PaymentGateways\Stripe\StripeExtension;
Route::middleware(['web', 'auth'])->group(function () {
- Route::get('payment/StripePay/{shopProduct}', function (StripeExtension $stripeExtension) {
- $stripeExtension->StripePay(request());
- })->name('payment.StripePay');
-
Route::get(
'payment/StripeSuccess',
function () {
diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php
index 866d8ece..2b0a4f69 100644
--- a/app/Http/Controllers/Admin/OverViewController.php
+++ b/app/Http/Controllers/Admin/OverViewController.php
@@ -37,7 +37,9 @@ class OverViewController extends Controller
//Get counters
$counters = collect();
//Set basic variables in the collection
- $counters->put('users', User::query()->count());
+ $counters->put('users', collect());
+ $counters['users']->active = User::where("suspended", 0)->count();
+ $counters['users']->total = User::query()->count();
$counters->put('credits', number_format(User::query()->whereHas("roles", function($q){ $q->where("id", "!=", "1"); })->sum('credits'), 2, '.', ''));
$counters->put('payments', Payment::query()->count());
$counters->put('eggs', Egg::query()->count());
diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php
index 9a521938..b10c1b01 100644
--- a/app/Http/Controllers/Admin/RoleController.php
+++ b/app/Http/Controllers/Admin/RoleController.php
@@ -203,7 +203,7 @@ class RoleController extends Controller
})
->editColumn('name', function (Role $role) {
- return "color\">$role->name";
+ return "$role->name";
})
->editColumn('usercount', function ($query) {
return $query->users_count;
diff --git a/app/Http/Controllers/Admin/VoucherController.php b/app/Http/Controllers/Admin/VoucherController.php
index f39f9c33..ec6c5232 100644
--- a/app/Http/Controllers/Admin/VoucherController.php
+++ b/app/Http/Controllers/Admin/VoucherController.php
@@ -245,10 +245,10 @@ class VoucherController extends Controller
})
->editColumn('expires_at', function (Voucher $voucher) {
if (! $voucher->expires_at) {
- return '';
+ return __("Never");
}
- return $voucher->expires_at ? $voucher->expires_at->diffForHumans() : '';
+ return $voucher->expires_at ? $voucher->expires_at->diffForHumans() : __("Never");
})
->editColumn('code', function (Voucher $voucher) {
return "{$voucher->code}
";
diff --git a/public/install/functions.php b/public/install/functions.php
index ebba003b..8eb1318c 100644
--- a/public/install/functions.php
+++ b/public/install/functions.php
@@ -19,7 +19,7 @@ $required_extensions = ['openssl', 'gd', 'mysql', 'PDO', 'mbstring', 'tokenizer'
$requirements = [
'minPhp' => '8.1',
- 'maxPhp' => '8.2', // This version is not supported
+ 'maxPhp' => '8.3', // This version is not supported
'mysql' => '5.7.22',
];
diff --git a/themes/default/views/admin/overview/index.blade.php b/themes/default/views/admin/overview/index.blade.php
index 6b5bd411..5a6fc1d5 100644
--- a/themes/default/views/admin/overview/index.blade.php
+++ b/themes/default/views/admin/overview/index.blade.php
@@ -58,7 +58,12 @@
{{ __('Reward per registered user') }} | @endif - @if(in_array($referral_settings->mode, ["Sign-Up","Both"])){{ __('New user payment commision') }} | @endif + @if(in_array($referral_settings->mode, ["comission","both"])){{ __('Reward per registered user') }} | @endif + @if(in_array($referral_settings->mode, ["sign-up","both"])){{ __('New user payment commision') }} | @endif
---|---|---|---|
{{ $referral_settings->reward }} {{ $general_settings->credits_display_name }} | @endif - @if(in_array($referral_settings->mode, ["Sign-Up","Both"])){{ $referral_settings->percentage }}% | @endif + @if(in_array($referral_settings->mode, ["comission","both"])){{ $referral_settings->reward }} {{ $general_settings->credits_display_name }} | @endif + @if(in_array($referral_settings->mode, ["sign-up","both"])){{ $referral_settings->percentage }}% | @endif