From c849fd67553012d812f4768f1a612ee2b57229b8 Mon Sep 17 00:00:00 2001 From: adonis Date: Sun, 7 Jun 2026 19:23:03 +0330 Subject: [PATCH] tahesab 3 --- .../Controllers/Admin/CustomerController.php | 16 ++++++++++++-- .../Customer/CustomerController.php | 22 ++++++++++++++----- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Admin/CustomerController.php b/app/Http/Controllers/Admin/CustomerController.php index 3f392f3..da0c10e 100644 --- a/app/Http/Controllers/Admin/CustomerController.php +++ b/app/Http/Controllers/Admin/CustomerController.php @@ -181,9 +181,21 @@ class CustomerController extends SuperController $companyName = $this->Config('name_fa'); $companyurl = $this->Config('app_url'); - $total_referrals = Customer::where('referral_to_id', $referrer->referral_id)->where('is_legal', '!=', 0)->get()->count(); $referral_limit = Setting::where('key', 'referral_limit')->first(); - $gift_permision = $referral_limit->is_active ? $total_referrals < $referral_limit->value ? true : false : true ; + $limitValue = $referral_limit->value ?? null; + $gift_permision = true; + if ( + $referral_limit + && $referral_limit->is_active + && $limitValue !== null + && $limitValue !== '' + && is_numeric($limitValue) + ) { + $total_referrals = Customer::where('referral_to_id', $referrer->referral_id) + ->where('is_legal', '!=', 0) + ->count(); + $gift_permision = $total_referrals < (int) $limitValue; + } if ($gift_permision && $gift_for_inviter > 0) { // dd($gift_for_inviter > 0, $gift_for_invited > 0); diff --git a/app/Http/Controllers/Customer/CustomerController.php b/app/Http/Controllers/Customer/CustomerController.php index 614d3e1..6386b0d 100644 --- a/app/Http/Controllers/Customer/CustomerController.php +++ b/app/Http/Controllers/Customer/CustomerController.php @@ -148,7 +148,8 @@ class CustomerController extends Controller try { $customer = Customer::findOrFail(auth('customer')->id()); - $updateData = $request->except(['referral_id', 'referral_to_id']); + $wasLegal = (int) $customer->is_legal; + $updateData = $request->except(['referral_id', 'referral_to_id', 'is_legal']); if (isset($request->fname) && isset($request->lname)) { $updateData['name'] = "$request->fname $request->lname"; } @@ -160,7 +161,7 @@ class CustomerController extends Controller // $tah = new TahesabController(); // $tah->store(["customer_id" => $customer->id]); $cfg = app(ConfigService::class); - if (!$customer->is_legal && $cfg->getBool('register_jibit_verify', false)) { + if (!$wasLegal && $cfg->getBool('register_jibit_verify', false)) { $response = $this->jibitNcode($customer->n_code, $customer->mobile); if (isset($response['matched']) and $response['matched'] == true) { @@ -176,11 +177,20 @@ class CustomerController extends Controller $referrer = $customer->referrer(); $gift_permision = true; if ($referrer) { - $total_referrals = Customer::where('referral_to_id', $referrer->referral_id)->where('is_legal', '!=', 0)->count(); $referral_limit = Setting::where('key', 'referral_limit')->first(); - $gift_permision = $referral_limit && $referral_limit->is_active - ? $total_referrals < $referral_limit->value - : true; + $limitValue = $referral_limit->value ?? null; + if ( + $referral_limit + && $referral_limit->is_active + && $limitValue !== null + && $limitValue !== '' + && is_numeric($limitValue) + ) { + $total_referrals = Customer::where('referral_to_id', $referrer->referral_id) + ->where('is_legal', '!=', 0) + ->count(); + $gift_permision = $total_referrals < (int) $limitValue; + } } if ($referrer && $gift_permision && $gift_for_inviter > 0) { // dd($gift_for_inviter > 0, $gift_for_invited > 0);