diff --git a/app/Http/Controllers/Admin/ManageCommissionController.php b/app/Http/Controllers/Admin/ManageCommissionController.php index e004f18..461b1a6 100644 --- a/app/Http/Controllers/Admin/ManageCommissionController.php +++ b/app/Http/Controllers/Admin/ManageCommissionController.php @@ -56,6 +56,7 @@ class ManageCommissionController extends Controller // ->orderBy('products.created_at') ->latest('products.created_at') ->get(); + // dd($products); return view('Admin.Pages.manage_commission.manage_commission', compact('products')); } diff --git a/app/Http/Controllers/Frontend/AccountsController.php b/app/Http/Controllers/Frontend/AccountsController.php index fb60421..8e6a614 100644 --- a/app/Http/Controllers/Frontend/AccountsController.php +++ b/app/Http/Controllers/Frontend/AccountsController.php @@ -73,8 +73,10 @@ class AccountsController extends Controller public function individual() { + $user = User::where('id', auth()->guard('users')->user()->id)->first(); + // dd($user); $this->kyc->blockUser($this->kyc->getUserId(), 'Individual'); - return view('Frontend.Pages.profile.individual'); + return view('Frontend.Pages.profile.individual', compact('user')); } public function createIndividual(StoreIndividualKYC $request) @@ -97,8 +99,10 @@ class AccountsController extends Controller public function huf() { + $user = User::where('id', auth()->guard('users')->id())->first(); + // dd($user); $this->kyc->blockUser($this->kyc->getUserId(), 'HUF'); - return view('Frontend.Pages.profile.huf'); + return view('Frontend.Pages.profile.huf',compact('user')); } public function createHUF(StoreHUFKYC $request) @@ -120,8 +124,10 @@ class AccountsController extends Controller public function nri() { + $user = User::where('id', auth()->guard('users')->id())->first(); + // dd($user); $this->kyc->blockUser($this->kyc->getUserId(), 'NRI'); - return view('Frontend.Pages.profile.nri'); + return view('Frontend.Pages.profile.nri',compact('user')); } public function createNRI(StoreNRIKYC $request) @@ -148,8 +154,10 @@ class AccountsController extends Controller public function company() { + $user = User::where('id', auth()->guard('users')->id())->first(); + // dd($user); $this->kyc->blockUser($this->kyc->getUserId(), 'Company'); - return view('Frontend.Pages.profile.company'); + return view('Frontend.Pages.profile.company',compact('user')); } public function companyKycCreate(StoreCompanyKYC $request) @@ -176,9 +184,11 @@ class AccountsController extends Controller // } public function partnership() - { + { + $user = User::where('id', auth()->guard('users')->id())->first(); + // dd($user); $this->kyc->blockUser($this->kyc->getUserId(), 'Partnership'); - return view('Frontend.Pages.profile.partnership'); + return view('Frontend.Pages.profile.partnership',compact('user')); } public function partnerShipKyc(StorePartnerShipKYC $request) @@ -200,8 +210,10 @@ class AccountsController extends Controller public function others() { + $user = User::where('id', auth()->guard('users')->id())->first(); + // dd($user); $this->kyc->blockUser($this->kyc->getUserId(), 'Others'); - return view('Frontend.Pages.profile.others'); + return view('Frontend.Pages.profile.others',compact('user')); } public function otherKyc(StoreOtherKYC $request) diff --git a/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php b/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php index 8f02f3e..4965490 100644 --- a/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php @@ -240,7 +240,7 @@ if (result.status == 200) { toastr.success(result.message); setTimeout(() => { - // window.location = "{{route('manage_commission')}}" + window.location = "{{route('manage_commission')}}" }, 1000); } if (result.status == 400) { diff --git a/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php b/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php index 45a5efc..e118b65 100644 --- a/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php @@ -110,11 +110,7 @@ {{ $product->minimum_investment }} {{ $product->commission_type }} {{ $product->category_name }} - @if ($product->rate) - {{ $product->rate }}% - @else - - @endif + {{ $product->rate ?? $product->upfront_rate ?? $product->trail_rate }} {{ $product->commission }} diff --git a/resources/views/Frontend/Pages/profile/company.blade.php b/resources/views/Frontend/Pages/profile/company.blade.php index 90536ed..65cae30 100644 --- a/resources/views/Frontend/Pages/profile/company.blade.php +++ b/resources/views/Frontend/Pages/profile/company.blade.php @@ -40,19 +40,19 @@ + class="iv-input form-control p-2" value="{{$user->name}}">
+ class="iv-input form-control p-2" value="{{$user->contact_number}}">
+ class="iv-input form-control p-2" value="{{$user->email}}">
{{--
diff --git a/resources/views/Frontend/Pages/profile/huf.blade.php b/resources/views/Frontend/Pages/profile/huf.blade.php index bbfb7b2..af1e9c5 100644 --- a/resources/views/Frontend/Pages/profile/huf.blade.php +++ b/resources/views/Frontend/Pages/profile/huf.blade.php @@ -38,15 +38,15 @@
- +
- +
- +
diff --git a/resources/views/Frontend/Pages/profile/individual.blade.php b/resources/views/Frontend/Pages/profile/individual.blade.php index bdb64d5..2be8c78 100644 --- a/resources/views/Frontend/Pages/profile/individual.blade.php +++ b/resources/views/Frontend/Pages/profile/individual.blade.php @@ -41,19 +41,19 @@ + class="iv-input form-control p-2" value="{{$user->name}}">
+ class="contact-number iv-input form-control p-2" value="{{$user->contact_number}}">
+ class="iv-input form-control p-2" value="{{$user->email}}">
diff --git a/resources/views/Frontend/Pages/profile/nri.blade.php b/resources/views/Frontend/Pages/profile/nri.blade.php index a0e50db..2ffb71f 100644 --- a/resources/views/Frontend/Pages/profile/nri.blade.php +++ b/resources/views/Frontend/Pages/profile/nri.blade.php @@ -42,16 +42,16 @@
- +
- +
- +
diff --git a/resources/views/Frontend/Pages/profile/others.blade.php b/resources/views/Frontend/Pages/profile/others.blade.php index d38ad99..2dcd4b3 100644 --- a/resources/views/Frontend/Pages/profile/others.blade.php +++ b/resources/views/Frontend/Pages/profile/others.blade.php @@ -38,15 +38,15 @@
- +
- +
- +
diff --git a/resources/views/Frontend/Pages/profile/partnership.blade.php b/resources/views/Frontend/Pages/profile/partnership.blade.php index ff3c9f8..0e3f5bf 100644 --- a/resources/views/Frontend/Pages/profile/partnership.blade.php +++ b/resources/views/Frontend/Pages/profile/partnership.blade.php @@ -41,19 +41,19 @@ + class="iv-input form-control p-2" value="{{$user->name}}">
+ class="iv-input form-control p-2" value="{{$user->contact_number}}">
+ class="iv-input form-control p-2" value="{{$user->email}}">