Merge branch 'main' of http://git.wdipl.com/Ritikesh.Yadav/freeu-project into megha

Reviewed-on: Ritikesh.Yadav/freeu-project#2

app/Http/Controllers/Admin/OverviewController.php

@@ -35,20 +35,18 @@ class OverviewController extends Controller
         // dd($freMarketPlace);
         $opMarketPlace = MarketplaceOtherProductsSeller::where('status', 'Approved')->latest()->get();
         $allMarketPlace = collect();
-        foreach($aifMarketPlace as $data)
-        {
+        foreach ($aifMarketPlace as $data) {
             $data->table = 'marketplace_aif_sellers';
             $allMarketPlace->push($data);
         }
-        foreach($freMarketPlace as $data)
-        {
+        foreach ($freMarketPlace as $data) {
             $data->table = 'marketplace_fre_sellers';
             $allMarketPlace->push($data);
         }
 
         $allMarketPlace = $allMarketPlace->sortByDesc('created_at');
         // dd($allMarketPlace);
-        return view('Admin.Pages.pre_owned_investment.pre_owned_investment', compact('aifMarketPlace', 'freMarketPlace', 'opMarketPlace', 'totalSellerProfile', 'completedTransactions', 'totalInvestmentListed','allMarketPlace'));
+        return view('Admin.Pages.pre_owned_investment.pre_owned_investment', compact('aifMarketPlace', 'freMarketPlace', 'opMarketPlace', 'totalSellerProfile', 'completedTransactions', 'totalInvestmentListed', 'allMarketPlace'));
     }
 
     public function downloadInvestment()
@@ -62,8 +60,7 @@ class OverviewController extends Controller
         $allMarketPlace = collect();
         $newData = [];
         $count = 0;
-        foreach($aifMarketPlace as $data)
-        {
+        foreach ($aifMarketPlace as $data) {
             // $data['table'] = 'marketplace_aif_sellers';
             // $newData[$count]['Product'] = $data->name_of_the_aif_fund;
             // $newData[$count]['ExpectedSellingPrice'] = $data->expected_sale_per_unit ;
@@ -84,8 +81,7 @@ class OverviewController extends Controller
             $allMarketPlace->push($newData);
             $count++;
         }
-        foreach($freMarketPlace as $data)
-        {
+        foreach ($freMarketPlace as $data) {
             // $newData[$count]['Product'] = $data->property_name;
             // $newData[$count]['ExpectedSellingPrice'] = $data->expected_selling_price ;
             // $newData[$count]['SellerName'] = $data->seller->name;
@@ -95,7 +91,7 @@ class OverviewController extends Controller
             // $newData[$count]['CreatedAt'] = $data->created_at->format('F d, o');
             $newData = array(
                 "Product" => $data->property_name,
-                "ExpectedSellingPrice" => $data->expected_selling_price ,
+                "ExpectedSellingPrice" => $data->expected_selling_price,
                 "SellerName" => $data->seller->name,
                 "Email" => $data->seller->email,
                 "Contact" => $data->seller->contact_number,
@@ -114,7 +110,7 @@ class OverviewController extends Controller
 
     public function interestedBuyers($id, $table)
     {
-        $interestedBuyers = MarketplaceBuyerForm::where(['associated_id' => $id, 'table' => $table])->orderBy('updated_at','DESC')->get();
+        $interestedBuyers = MarketplaceBuyerForm::where(['associated_id' => $id, 'table' => $table])->orderBy('updated_at', 'DESC')->get();
 
         if ($table == 'marketplace_fre_sellers') {
             $data = MarketplaceFractionalRealEstateSeller::with('seller')->where('id', $id)->firstOrFail();
@@ -157,8 +153,7 @@ class OverviewController extends Controller
         ]);
         // if ($changeListingStatus && $listingStatus != 'Hide') {
         if ($listingStatus != 'Hide') {
-            if( $listingStatus != 'Non-Featured')
-            {                
+            if ($listingStatus != 'Non-Featured') {
                 $user = User::find($data->users_id);
                 $productName = $data->security_name ?? $data->property_name ?? $data->name_of_the_aif_fund;
                 $notify['message'] = "Congratulations, Your investment($productName) has been assigned to $listingStatus section!";
@@ -215,32 +210,26 @@ class OverviewController extends Controller
         $marketPlaceId = $getMarketplaceBuyerUnit->associated_id;
         $getUnits = (int)$getMarketplaceBuyerUnit->no_of_units_you_wish_to_buy ?? 0;
         $getBuyingPurchaseValue = (int)$getMarketplaceBuyerUnit->getAttributes()['total_purchase_value'];
-        if(MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->exists() && $getMarketplaceBuyerUnit->table == 'marketplace_aif_sellers')
-        {
-            $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->first();
+        if (MarketplaceAlternativeInvestmentFundSeller::where('id', $marketPlaceId)->exists() && $getMarketplaceBuyerUnit->table == 'marketplace_aif_sellers') {
+            $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id', $marketPlaceId)->first();
             $product_name .= $getAIFData->name_of_the_aif_fund;
-            if($status == 'Sold'){
+            if ($status == 'Sold') {
                 $oldUnit = (int)$getAIFData->no_of_units_you_wish_to_sell;
                 $newUnits = $oldUnit - (int)$getUnits;
-                if($newUnits >= 0)
-                {
-                    $updateUnits = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->update([
+                if ($newUnits >= 0) {
+                    $updateUnits = MarketplaceAlternativeInvestmentFundSeller::where('id', $marketPlaceId)->update([
                         'no_of_units_you_wish_to_sell' => $newUnits,
                     ]);
-                }
-                else{
-                    return response()->json(['status' => 400, 'message' => 'Bid units is more than seller units with '.abs($newUnits).' units']);
+                } else {
+                    return response()->json(['status' => 400, 'message' => 'Bid units is more than seller units with ' . abs($newUnits) . ' units']);
                 }
             }
-                    
-        }else if(MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->exists() && $getMarketplaceBuyerUnit->table == 'marketplace_fre_sellers')
-        {
+        } else if (MarketplaceFractionalRealEstateSeller::where('id', $marketPlaceId)->exists() && $getMarketplaceBuyerUnit->table == 'marketplace_fre_sellers') {
             // dd('inside');
-            $getFREData = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->first();
+            $getFREData = MarketplaceFractionalRealEstateSeller::where('id', $marketPlaceId)->first();
             $product_name .= $getFREData->property_name;
-            if($status == 'Sold'){
-                if((int)$getFREData->current_market_value_of_the_property <= 0)
-                {
+            if ($status == 'Sold') {
+                if ((int)$getFREData->current_market_value_of_the_property <= 0) {
                     return response()->json(['status' => 400, 'message' => 'Product cannot be sold. because product has no value.']);
                 }
                 $freValue = (int)$getFREData->current_market_value_of_the_property;
@@ -251,14 +240,13 @@ class OverviewController extends Controller
                 $expectedSellingPrice = (int)$getFREData->expected_selling_price;
                 $updateExpectedSellingPrice = $expectedSellingPrice * ($percentage / 100);
                 // dd($percentage,$updateExpectedSellingPrice);
-                if($nowValue <= 0)
-                {
-                    $updatePrice = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->update([
+                if ($nowValue <= 0) {
+                    $updatePrice = MarketplaceFractionalRealEstateSeller::where('id', $marketPlaceId)->update([
                         'current_market_value_of_the_property' => 0,
                         'expected_selling_price' => 0,
                     ]);
-                }else if($nowValue > 0){
-                    $updatePrice = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->update([
+                } else if ($nowValue > 0) {
+                    $updatePrice = MarketplaceFractionalRealEstateSeller::where('id', $marketPlaceId)->update([
                         'current_market_value_of_the_property' => $nowValue,
                         'expected_selling_price' => $updateExpectedSellingPrice,
                     ]);
@@ -347,10 +335,10 @@ class OverviewController extends Controller
         } elseif ($table == 3) {
             $data = MarketplaceOtherProductsSeller::with('seller')->where('id', $id)->firstOrFail();
         }
-        $anyOneBuyed = MarketplaceBuyerForm::where(['associated_id'=>$id,'table'=>$tableName])->exists();
+        $anyOneBuyed = MarketplaceBuyerForm::where(['associated_id' => $id, 'table' => $tableName])->exists();
         // dd($data);
 
-        return view('Admin.Pages.pre_owned_investment.pending_investment_view', compact('data', 'table','anyOneBuyed'));
+        return view('Admin.Pages.pre_owned_investment.pending_investment_view', compact('data', 'table', 'anyOneBuyed'));
     }
 
     public function listingStatus(Request $request)
@@ -401,17 +389,15 @@ class OverviewController extends Controller
         // $opBuyerForm = MarketplaceOtherProductsSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_op_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_op_sellers.created_at')->get();
 
 
-        $marketPlaceBuyerFrom = MarketplaceBuyerForm::where('status','Sold')->get();
+        $marketPlaceBuyerFrom = MarketplaceBuyerForm::where('status', 'Sold')->get();
         $newData = collect();
-        foreach($marketPlaceBuyerFrom as $item){
-            if($item->table == 'marketplace_fre_sellers'){
-                $item['data'] = MarketplaceFractionalRealEstateSeller::with('seller.users', 'company',)->where('id',$item->associated_id)->first();
+        foreach ($marketPlaceBuyerFrom as $item) {
+            if ($item->table == 'marketplace_fre_sellers') {
+                $item['data'] = MarketplaceFractionalRealEstateSeller::with('seller.users', 'company',)->where('id', $item->associated_id)->first();
                 $newData->push($item);
                 // dd( $item['data']);
-            }
-            else if($item->table == 'marketplace_aif_sellers')
-            {
-                $item['data'] = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company',)->where('id',$item->associated_id)->first();
+            } else if ($item->table == 'marketplace_aif_sellers') {
+                $item['data'] = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company',)->where('id', $item->associated_id)->first();
                 $newData->push($item);
             }
         }
@@ -428,7 +414,7 @@ class OverviewController extends Controller
         $companies = Company::active()->pluck('company_name', 'id');
         // dd($newData[0]);
         // return view('Admin.Pages.pre_owned_investment.transactions', compact('aifBuyerForm', 'freBuyerForm', 'opBuyerForm', 'companies','newData'));
-        return view('Admin.Pages.pre_owned_investment.transactions', compact('companies','newData'));
+        return view('Admin.Pages.pre_owned_investment.transactions', compact('companies', 'newData'));
     }
 
     // public function manage_seller_profile()

app/Http/Controllers/Frontend/HomeController.php

@@ -33,7 +33,7 @@ class HomeController extends Controller
         // dd($this->getAllTopPickProducts()['data']->toArray());
         return view('Frontend.Pages.index', [
             'topPicks' => $this->getAllTopPickProducts(),
-            'testimonial' => Testimonial::where('is_active',true)->get(),
+            'testimonial' => Testimonial::where('is_active', true)->get(),
         ]);
     }
 
@@ -43,15 +43,14 @@ class HomeController extends Controller
         session()->forget('risk_disclosure');
         $checkRiskDisclosure = $request->checked_risk_disclosure == 'true' ? Session::put('risk_disclosure', 'true') : Session::put('risk_disclosure', 'false');
         // dd(Session::get('risk_disclosure'));
-        if(Session::get('risk_disclosure') == 'true')
-        {
-            return response()->json(['status'=>200]);
+        if (Session::get('risk_disclosure') == 'true') {
+            return response()->json(['status' => 200]);
         }
     }
 
     public function getAllTopPickProducts()
     {
-        $data['data'] = Product::getAllDetails()->where('top_pick',true)->where('products.status',1)->where('categories.status',true)->get();
+        $data['data'] = Product::getAllDetails()->where('top_pick', true)->where('products.status', 1)->where('categories.status', true)->get();
         // dd($data['data']);
         // foreach($data['data'] as $row)
         // {
@@ -234,7 +233,7 @@ class HomeController extends Controller
     {
         $user = User::find($request->user()->id);
         $count = $user->unreadNotifications->count();
-        return response()->json(['status'=>200,'count'=>$count]);
+        return response()->json(['status' => 200, 'count' => $count]);
     }
 
     public function getAllNotificationsApi(Request $request)

app/Imports/ImportMontlyUpdateFractionalRealEstate.php

@@ -48,13 +48,14 @@ class ImportMontlyUpdateFractionalRealEstate implements ToCollection, WithHeadin
 
         foreach ($rows as $row) {
             // dd($row);
+            // dd(getConvertedDate($row['investment_date']));
             if($row['investment_value'] != null && $row['total_net_interest'] != null && $row['total_gross_interest'] != null && $row['total_value_of_the_property'] != null)
             {
                 $latestId = MonthlyUpdateFractionalRealEstate::insertGetId([
                     'custom_id' => $row['custom_id'],
                     'total_value_of_the_property' => $row['total_value_of_the_property'] ?? 0,
                     'investment_value' => $row['investment_value'] ?? 0,
-                    'investment_date' => $row['investment_date'],
+                    'investment_date' => getConvertedDate($row['investment_date']) ?? 0,
                     'total_gross_interest' => $row['total_gross_interest'] ?? 0,
                     'tds' => $row['tds'] ?? 0,
                     'total_net_interest' => $row['total_net_interest'] ?? 0,

app/helper.php

@@ -63,7 +63,7 @@ function getConvertedDate($date)
         // $newDate = str_split($dateArray[0], 1);
         return '0'.(string)$dateArray[0] . '-' . (string)$dateArray[1].(string)$dateArray[2] . '-' . (string)$dateArray[3]. (string)$dateArray[4]. (string)$dateArray[5]. (string)$dateArray[6];
     }
-    return null;
+    return $date;
 }
 
 function imagePath($path = null)

public/assets/css/FrontendCss/style.css

@@ -6664,3 +6664,8 @@ ul#user_notification {
   min-height: 480px;
   margin-bottom: 30px;
 }
+.marketplace-table a.green-btn,
+.marketplace-table a.golden-btn,
+.marketplace-table a.sliver-btn {
+  pointer-events: none;
+}

resources/views/Admin/Pages/contact_form_leads/contact_form_leads.blade.php

@@ -324,6 +324,7 @@
                 $('#reply_mail_form').validate({
                     ignore: [],
                     debug: false,
+                    scrollX: true,
                     rules: {
                         subject: 'required',
                         reply: 'required',

resources/views/Admin/Pages/manage_commission/manage_commission.blade.php

@@ -339,6 +339,7 @@
             var table = $('#manageCommissionTable').DataTable({
                 dom: 'Bfrtip',
                 ordering: false,
+                scrollX: true,
                 buttons: [{
                     extend: 'excel',
                     title: 'Product Commission',

resources/views/Admin/Pages/manage_commission/user_commission.blade.php

@@ -389,6 +389,7 @@
         var table = $('#manageCommissionTable').DataTable({
             dom: 'Bfrtip',
             ordering: false,
+            scrollX: true,
             buttons: [{
                 extend: 'excel',
                 title: 'Product Commission',

resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php

@@ -560,6 +560,7 @@ $(document).ready(function() {
     var table = $('#total_active_investors').DataTable({
         dom: 'Bfrtip',
         ordering: false,
+        scrollX: true,
         buttons: [{
             extend: 'excel',
             title: 'Product List',

resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php

@@ -191,9 +191,10 @@
                                         <label> <b class='fw-bold'>Accepting Overseas Investment</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->accepting_overseas_investment ?? 'N/A'}}</label>
                                     </div>
                                 </div>
-                                <div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->target_irr)}}">
+                                <div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->getRawOriginal('target_irr'))}}">
                                     <div class="veiw_detials_area">
-                                        <label> <b class='fw-bold'>Target IRR(%)</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->target_irr ?? 'N/A'}}</label>
+                                        {{-- @dd($alternativeInvestmentFund->alternativeInvestmentFund->getRawOriginal('target_irr')) --}}
+                                        <label> <b class='fw-bold'>Target IRR(%)</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->getRawOriginal('target_irr') ?? 'N/A'}}</label>
                                     </div>
                                 </div>
                                 <div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->management_fees_and_carry)}}">

resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php

@@ -283,7 +283,7 @@
                                                             <!--begin::Input-->
                                                             <div class="form-control form-control-solid">
                                                                 @if($data->getRawOriginal('total_fees_paid'))
-                                                                    ₹{{$data->getRawOriginal('total_fees_paid')}}
+                                                                    {{$data->getRawOriginal('total_fees_paid')}}
                                                                 @else
                                                                     N/A
                                                                 @endif

resources/views/Admin/Pages/manage_investors/manage_investors.blade.php

@@ -259,6 +259,7 @@
                 ordering: false,
                 processing: true,
                 serverSide: true,
+                scrollX: true,
                 "lengthMenu": [10, 25, 50, 75, 100],
                 ajax: {
                     url: "{{ route('kyc.manage-investors-datatable') }}",

resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php

@@ -298,7 +298,7 @@
                                 <div class="col-md-6 fv-row">
                                     <label class="required fs-6 fw-semibold mb-2">Investment Date</label>
 
-                                    <input class="form-control form-control-solid " type="date"
+                                    <input class="form-control form-control-solid " type="text"
                                         name="investment_date" id="einvestment_Date" />
                                 </div>
                                 <div class="col-md-6 fv-row">
@@ -358,21 +358,24 @@
                 $('#totalvalue_of_the_property').html($(this).data("total-value-of-the-property"));
                 $('#investment_value').html($(this).data("investment-value"));
                 // $('#investment_Date').html($(this).data("investment-date"));
+                // $('#investment_Date').val($(this).data('investment-date'));
                 var investmentDate = $(this).data("investment-date");
-                if (investmentDate) {
-                    var parsedDate = new Date(investmentDate);
-                    var day = parsedDate.getDate();
-                    var month = parsedDate.getMonth() + 1; // January is 0, so we add 1
-                    var year = parsedDate.getFullYear();
+                $('#investment_Date').val($(this).data(investmentDate));
+                // alert(investmentDate);
+                // if (investmentDate) {
+                //     var parsedDate = new Date(investmentDate);
+                //     var day = parsedDate.getDate();
+                //     var month = parsedDate.getMonth() + 1; // January is 0, so we add 1
+                //     var year = parsedDate.getFullYear();
                     
-                    // Format the date in DD-MM-YYYY format
-                    var formattedDate = ('0' + day).slice(-2) + '-' + ('0' + month).slice(-2) + '-' + year;
+                //     // Format the date in DD-MM-YYYY format
+                //     var formattedDate = ('0' + day).slice(-2) + '-' + ('0' + month).slice(-2) + '-' + year;
                     
-                    // Update the HTML content of #investment_Date element
-                    $('#investment_Date').html(formattedDate);
-                } else {
-                    $('#investment_Date').html(''); // Handle case where investmentDate is not available
-                }
+                //     // Update the HTML content of #investment_Date element
+                //     $('#investment_Date').html(formattedDate);
+                // } else {
+                //     $('#investment_Date').html(''); // Handle case where investmentDate is not available
+                // }
                 $('#total_gross_interest').html($(this).data("total-gross-interest"));
                 $('#tds').html($(this).data("tds"));
                 $('#total_net_interest').html($(this).data("total-net-interest"));

resources/views/Admin/Pages/manage_leads/manage_leads.blade.php

@@ -327,6 +327,7 @@
         $(function() {
             var table = $('#manage-leads').DataTable({
                 dom: "Bfrtip",
+                scrollX: true,
                 buttons: [{
                     extend: "excel",
                     title: "Leads List",

resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php

@@ -458,6 +458,7 @@
         $(function() {
             var approveTable = $('#approve_investors_list').DataTable({
                 dom: "Bfrtip",
+                scrollX: true,
                 buttons: [{
                     extend: "excel",
                     title: "Marketplace Investment List",
@@ -477,6 +478,7 @@
         $(function() {
             var pendingTable = $('#pending_investors_list').DataTable({
                 dom: "Bfrtip",
+                scrollX: true,
                 buttons: [{
                     extend: "excel",
                     title: "Marketplace Investment List",
@@ -496,6 +498,7 @@
         $(function() {
             var rejectedTable = $('#rejected_table').DataTable({
                 dom: "Bfrtip",
+                scrollX: true,
                 buttons: [{
                     extend: "excel",
                     title: "Marketplace Investment List",

resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php

@@ -299,6 +299,7 @@
     $(function() {
         var table = $('#transactions').DataTable({
             dom: "Bfrtip",
+            scrollX: true,
             buttons: [{
                 extend: "excel",
                 title: "Completed Transactions List",

resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php

@@ -196,7 +196,7 @@
                                     {{-- <span>{{ $infrastructureFund->website_of_the_fund ?? '--' }}</span> --}}
                                     <span>
                                     @if($infrastructureFund->website_of_the_fund)
-                                    <a href="{{'http://'.$infrastructureFund->website_of_the_fund}}" target=”_blank”>{{$infrastructureFund->website_of_the_fund}}<a>
+                                    <a href="{{'http://'.$infrastructureFund->website_of_the_fund}}" target=”_blank”>{{$infrastructureFund->website_of_the_fund}}</a>
                                     @else
                                     {{'--'}}
                                     @endif

routes/api.php

@@ -1,5 +1,7 @@
 <?php
 
+// hello testing
+
 use App\Http\Controllers\Admin\ManageFreeUInvestments\ManageCategoriesController;
 use App\Http\Controllers\Admin\ManageFreeUInvestmentController;
 use App\Http\Controllers\Admin\ManageFreeUInvestments\FractionalRealEstateController as FractionalRealEstateFontendController;
@@ -225,11 +227,11 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::post("marketplace/other-products/seller-form", [DashboardController::class, 'marketplaceOPFormAPI']);
 
     // get Companies
-    Route::get('get-companies',[ManageCompaniesController::class,'getCompaniesData']);
+    Route::get('get-companies', [ManageCompaniesController::class, 'getCompaniesData']);
 
     // get chat 
-    Route::get('get-unread-message-count',[ManageChatController::class,'getMessageCount']);
-    Route::get('read-user-message',[ManageChatController::class,'getAllMessage']);
+    Route::get('get-unread-message-count', [ManageChatController::class, 'getMessageCount']);
+    Route::get('read-user-message', [ManageChatController::class, 'getAllMessage']);
 
     //Marketplace Buyer Form
     Route::get('/buyer-form/{slug}', [MarketPlaceController::class, 'buyerFormAPI']);