diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index 87f49c1..77fc8fb 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -197,9 +197,9 @@ class DashboardController extends Controller $leads = Lead::where('lead_owner', auth()->user()->id)->latest()->get(); // dd(auth()->user()->id); - $tasks = LeadTasksMeeting::where('owner', auth()->user()->id)->tasks()->get(); + $tasks = LeadTasksMeeting::where('owner', auth()->user()->id)->orderBy('created_at', 'desc')->tasks()->get(); // dd($tasks, auth()->user()->id); - $meetings = LeadTasksMeeting::where('host', (string)auth()->user()->id)->meetings()->get(); + $meetings = LeadTasksMeeting::where('host', (string)auth()->user()->id)->orderBy('created_at', 'desc')->meetings()->get(); // dd($meetings); $users = User::admins()->get(); return view('Admin.personal-dashboard', compact('companyCount', 'a', 'leads', 'tasks', 'meetings', 'users', 'userCount', 'investingUserCount', 'totalProductCount')); diff --git a/app/Http/Controllers/Admin/ManageCommissionController.php b/app/Http/Controllers/Admin/ManageCommissionController.php index 461b1a6..cedc06f 100644 --- a/app/Http/Controllers/Admin/ManageCommissionController.php +++ b/app/Http/Controllers/Admin/ManageCommissionController.php @@ -38,7 +38,7 @@ class ManageCommissionController extends Controller abort(404); } $products = Product::query() - ->select(DB::raw('products.id, coalesce(sdi.product_name, p2p.scheme, fre.property_name_and_location,id.company_name,aif.fund_name,caga.project_name,hyf.security_name,lbf.company,sdi.product_name,vd.company_name) as product_name'), DB::raw('DATE_FORMAT(products.created_at, "%d-%b-%Y") as date'), 'categories.category_name', DB::raw('coalesce(sdi.minimum_investment, p2p.minimum_investment, fre.minimum_investment,id.minimum_investment,aif.minimum_investment,caga.minimum_investment,hyf.minimum_investment,lbf.minimum_investment,sdi.minimum_investment,vd.minimum_investment) as minimum_investment'), 'products.commission_type', 'products.rate', 'products.commission', 'products.description', DB::raw('coalesce(fre.companies_id,aif.companies_id,caga.companies_id,vd.companies_id) as companies_id'), 'upfront_rate', 'trail_rate') + ->select(DB::raw('products.id, coalesce(fund.fund_name, re.property_name, sdi.product_name, p2p.scheme, fre.property_name_and_location,id.company_name,aif.fund_name,caga.project_name,hyf.security_name,lbf.company,sdi.product_name,vd.company_name) as product_name'), DB::raw('DATE_FORMAT(products.created_at, "%d-%b-%Y") as date'), 'categories.category_name', DB::raw('coalesce(sdi.minimum_investment,re.total_price, p2p.minimum_investment, fre.minimum_investment,id.minimum_investment,aif.minimum_investment,caga.minimum_investment,hyf.minimum_investment,lbf.minimum_investment,sdi.minimum_investment,vd.minimum_investment,fund.minimum_investment) as minimum_investment'), 'products.commission_type', 'products.rate', 'products.commission', 'products.description', DB::raw('coalesce(fre.companies_id,aif.companies_id,caga.companies_id,vd.companies_id) as companies_id'), 'upfront_rate', 'trail_rate') ->leftJoin('securitized_debt_instruments as sdi', 'products.id', 'sdi.products_id') ->leftJoin('fractional_real_estates as fre', 'products.id', 'fre.products_id') ->leftJoin('peer_to_peer_lendings as p2p', 'products.id', 'p2p.products_id') @@ -48,6 +48,8 @@ class ManageCommissionController extends Controller ->leftJoin('high_yield_finances as hyf', 'products.id', 'hyf.products_id') ->leftJoin('lease_based_financings as lbf', 'products.id', 'lbf.products_id') ->leftJoin('venture_debts as vd', 'products.id', 'vd.products_id') + ->leftJoin('funds as fund', 'products.id', 'fund.products_id') + ->leftJoin('real_estates as re', 'products.id', 're.products_id') // ->join('fractional_real_estates as fr', 'companies.id', 'fr.companies_id') // ->leftJoin('alternative_investment_funds as aifp', 'companies.id', 'aifp.companies_id') // ->leftJoin('clean_and_green_assets as cagap', 'companies.id', 'cagap.companies_id') @@ -56,7 +58,6 @@ 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/Admin/ManagePartnerPlatformController.php b/app/Http/Controllers/Admin/ManagePartnerPlatformController.php index 3f32944..6d7e349 100644 --- a/app/Http/Controllers/Admin/ManagePartnerPlatformController.php +++ b/app/Http/Controllers/Admin/ManagePartnerPlatformController.php @@ -123,6 +123,7 @@ class ManagePartnerPlatformController extends Controller return view('Admin.Pages.manage_investors.manage_partner_details', (['data' => $data])); } + public function updatePartner(Request $request) { @@ -139,7 +140,7 @@ class ManagePartnerPlatformController extends Controller 'password' => $request->password, ]); - dd($data); + // dd($data); $testimonial_id = $data->id; @@ -164,4 +165,10 @@ class ManagePartnerPlatformController extends Controller Mail::to($email)->send(new PartnerCredential($mailData, $data)); return true; } + + public function delete_partner($id) + { + $tagDeleted = UserPartner::where('id',$id)->delete(); + return response()->json(['status' => 200]); + } } diff --git a/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx b/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx index 3d5cd89..2995187 100644 Binary files a/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx and b/public/excel-template/InternationalCommercialRealEstateTemplate.xlsx differ diff --git a/public/excel-template/InternationalIndustrialRealEstateTemplate.xlsx b/public/excel-template/InternationalIndustrialRealEstateTemplate.xlsx index 079768e..ce0f928 100644 Binary files a/public/excel-template/InternationalIndustrialRealEstateTemplate.xlsx and b/public/excel-template/InternationalIndustrialRealEstateTemplate.xlsx differ diff --git a/public/excel-template/InternationalResidentialRealEstateTemplate.xlsx b/public/excel-template/InternationalResidentialRealEstateTemplate.xlsx index 0c186bc..748fc63 100644 Binary files a/public/excel-template/InternationalResidentialRealEstateTemplate.xlsx and b/public/excel-template/InternationalResidentialRealEstateTemplate.xlsx differ 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 91fc3a7..34f7f0f 100644 --- a/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php @@ -96,6 +96,7 @@ @foreach ($products as $product) + {{-- @dd($product); --}}
Sr. No. User Partner + Actions @@ -81,6 +82,16 @@ {{$user->name}} {{$user->company_name}} + +
+ + + +
+ @endforeach @@ -92,6 +103,32 @@
+ @endsection @section('scripts') @endsection \ No newline at end of file diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php index a543333..8bf68c1 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php @@ -145,7 +145,7 @@ Sr. No. User Custom ID - Investor Name + Product Name Category Holding Status Created At @@ -164,7 +164,7 @@ {{ $loop->iteration }} {{ $data->investor->name }} {{ $data->custom_id }} - {{ $data->investor_name }} + {{ $data->product_name }} {{ $data->categories }} {{-- {{ $data->products == null ? 'null' : ($data->products->profit_sharing == null ? $data->products->id : $data->products->profit_sharing) }} diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php index 381fc89..1ad5b91 100644 --- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php @@ -3151,6 +3151,9 @@ success: function(response) { if (response.message === 'Attachment deleted successfully') { toastr.success('Document deleted successfully'); + setTimeout(() => { + location.reload(); + }, 1000); } else { toastr.error('Something went wrong! Please Try Again'); } diff --git a/routes/web.php b/routes/web.php index b8a1f47..421ca3e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -597,6 +597,7 @@ Route::middleware([BackendAccess::class])->group(function () { Route::get("/edit-manage-partner/{id}", 'editPartner')->name('edit-manage-partner'); Route::post("/update-manage-partner", 'updatePartner')->name('update-manage-partner'); Route::get("/view-manage-partner/{id}", 'viewPartnerDetails')->name('view-manage-partner'); + Route::delete("delete-partner/{id}", 'delete_partner')->name('delete_partner'); }); //Manage User Product