diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 9ba7bbac..8f4f4b67 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -185,7 +185,7 @@ class PaymentController extends Controller if ($user->role == 'member') { $user->update(['role' => 'client']); - if(config("SETTINGS::REFERRAL:MODE") == "commission" && $shopProduct->type=="Credits"){ + 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,"",""); @@ -342,7 +342,7 @@ class PaymentController extends Controller if ($user->role == 'member') { $user->update(['role' => 'client']); - if(config("SETTINGS::REFERRAL:MODE") == "commission" && $shopProduct->type=="Credits"){ + 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,"",""); @@ -457,7 +457,7 @@ class PaymentController extends Controller if ($user->role == 'member') { $user->update(['role' => 'client']); - if(config("SETTINGS::REFERRAL:MODE") == "commission" && $shopProduct->type=="Credits"){ + 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,"",""); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 03d982f5..f96a8cc8 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -139,7 +139,7 @@ class RegisterController extends Controller $ref_code = $data['referral_code']; $new_user = $user->id; if($ref_user = User::query()->where('referral_code', '=', $ref_code)->first()) { - if(config("SETTINGS::REFERRAL:MODE" == "sign-up")) { + if(config("SETTINGS::REFERRAL:MODE" == "sign-up") || config("SETTINGS::REFERRAL:MODE" == "both")) { $ref_user->increment('credits', config("SETTINGS::REFERRAL::REWARD")); $ref_user->notify(new ReferralNotification($ref_user->id, $new_user)); } diff --git a/resources/views/admin/settings/tabs/misc.blade.php b/resources/views/admin/settings/tabs/misc.blade.php index b0c13e0e..08a8f508 100644 --- a/resources/views/admin/settings/tabs/misc.blade.php +++ b/resources/views/admin/settings/tabs/misc.blade.php @@ -213,6 +213,8 @@ @endif>{{ __("Commission") }} +