From a3e45938127c3aa35f7d1869f768ccede6f3b09a Mon Sep 17 00:00:00 2001 From: sayliraut Date: Fri, 2 Aug 2024 16:02:52 +0530 Subject: [PATCH] changes --- .../APIs/Customer_API/SubscriptionController.php | 6 +++--- app/Http/Controllers/Admin/DashboardController.php | 9 ++++++--- app/Models/ReferralUsers.php | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php b/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php index ff54f69..6904e91 100644 --- a/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php +++ b/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php @@ -243,13 +243,13 @@ class SubscriptionController extends Controller public function subscriptionToPlan(Request $request) { - dd($request->all()); + // dd($request->all()); try { $isCustomReferralCodeApplied = 0; $customReferralCode = CustomReferralCode::where('is_active',1)->first(); - if($customReferralCode && $customReferralCode->referral_code && + if($customReferralCode && $customReferralCode->referral_code && $customReferralCode->referral_code == $request->referral_code_to_check){ $isCustomReferralCodeApplied = 1; }else{ @@ -425,7 +425,7 @@ class SubscriptionController extends Controller return response()->json(['success' => true, 'message' => 'Successfully applied referral code!', 'referralUserId' => $code->id ,'referral_code'=>$referralCode]); } else if( $customCode) { return response()->json(['success' => true, 'message' => 'Successfully applied referral code!', 'referralUserId' => $customCode->id ,'referral_code'=>$referralCode]); - + }else{ return response()->json(['success' => false, 'message' => 'Invalid referral code.']); } diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index 0bf4bf0..8bbc4a1 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -12,6 +12,7 @@ use App\Models\Subscriptions; use Carbon\Carbon; use App\Exports\DashboardExportUser; use App\Exports\DashboardSelectedExportUser; +use App\Models\ReferralUsers; use Maatwebsite\Excel\Facades\Excel; @@ -147,6 +148,7 @@ class DashboardController extends Controller 'next_payment_date' => $transaction->next_payment_date ? Carbon::parse($transaction->next_payment_date)->format('m/d/Y') : null, ]; })->toArray(); + $refrralUsers = ReferralUsers::with(['referredUser','refeersUser'])->latest()->get(); return view('Admin.dashboard', compact( @@ -165,13 +167,14 @@ class DashboardController extends Controller 'defaultData', 'formattedDefaultData', 'quarterlyData', - 'yearlyData' + 'yearlyData', + 'refrralUsers' ) ); } /* - Created By : Hritik + Created By : Hritik Created at : 02 Aug 2024 Use : To Store or Update Custom Referral Code */ @@ -188,7 +191,7 @@ class DashboardController extends Controller if($request->id){ CustomReferralCode::updateOrCreate(['id', $request->id], [ 'referral_code' => $request->referral_code, - ]); + ]); }else{ CustomReferralCode::updateOrCreate([ 'referral_code' => $request->referral_code, diff --git a/app/Models/ReferralUsers.php b/app/Models/ReferralUsers.php index 1716237..a6af25a 100644 --- a/app/Models/ReferralUsers.php +++ b/app/Models/ReferralUsers.php @@ -23,7 +23,7 @@ class ReferralUsers extends Model 'modified_by', 'created_at', 'updated_at' - + ]; public function referredUser() @@ -35,5 +35,5 @@ public function refeersUser() { return $this->belongsTo(IamPrincipal::class, 'referred_user_xid', 'id'); } - + }