diff --git a/app/Http/Controllers/Admin/AdminLoginController.php b/app/Http/Controllers/Admin/AdminLoginController.php index eca7330..496ff84 100644 --- a/app/Http/Controllers/Admin/AdminLoginController.php +++ b/app/Http/Controllers/Admin/AdminLoginController.php @@ -68,7 +68,7 @@ class AdminLoginController extends Controller 'last_login' => now() ]); // $redirectPage = Iam_App_Resource_Action_Link::where('user_xid',$user->id)->first(); - return response()->json(['status' => 200, 'message' => 'Welcome!']); + return response()->json(['status' => 200, 'message' => 'Welcome!','return_to_page'=>$user->role == 1 ? route('dashboard'):route('welcome-to-dashboard')]); } return response()->json(['status' => 401, 'message' => 'OTP has expired!']); } else { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php index 2d43a96..7f23db3 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php @@ -8,6 +8,7 @@ use App\Imports\BondImport; use App\Imports\CleanAndGreenAssetImport; use App\Imports\FundImport; use App\Imports\StockFundsRealEstateExchangeImport; +use App\Models\VentureDebt; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Maatwebsite\Excel\Facades\Excel; @@ -76,6 +77,27 @@ class ManageFreeUInvestmentController extends Controller { // dd($request->all()); $product = Product::where('id', $request->id)->delete(); + // $FREProduct = FractionalRealEstate::where('products_id',$request->id)->first(); + if (FractionalRealEstate::where('products_id', $request->id)->exists()) { + FractionalRealEstate::where('products_id', $request->id)->delete(); + } elseif (AlternativeInvestmentFund::where('products_id', $request->id)->exists()) { + AlternativeInvestmentFund::where('products_id', $request->id)->delete(); + } elseif (RealEstate::where('products_id', $request->id)->exists()) { + RealEstate::where('products_id', $request->id)->delete(); + } elseif (Fund::where('products_id', $request->id)->exists()) { + Fund::where('products_id', $request->id)->delete(); + } elseif (IndianFinancialAssets::where('products_id', $request->id)->exists()) { + IndianFinancialAssets::where('products_id', $request->id)->delete(); + } elseif (StockFundsRealEstateExchange::where('products_id', $request->id)->exists()) { + StockFundsRealEstateExchange::where('products_id', $request->id)->delete(); + } elseif (VentureDebt::where('products_id', $request->id)->exists()) { + VentureDebt::where('products_id', $request->id)->delete(); + } elseif (VentureDebt::where('products_id', $request->id)->exists()) { + VentureDebt::where('products_id', $request->id)->delete(); + } elseif (InvoiceDiscounting::where('products_id', $request->id)->exists()) { + InvoiceDiscounting::where('products_id', $request->id)->delete(); + } + if ($product) { return response(['status' => 200, 'message' => 'Product deleted successfully']); } else { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php index 408d081..abfe30d 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php @@ -192,13 +192,14 @@ class FractionalRealEstateController extends Controller if ($request->hasFile('images')) { - // dd($request->hasFile('images')); + dd($request->hasFile('images')); // $edit_program_images = ProgramImage::where('programs_xid', $program_id)->delete(); foreach ($request->file('images') as $key => $file) { $filename = date('YmdHi') . '_' . $file->getClientOriginalName(); $file->move(public_path('assets/uploads/fractionalrealestate_images'), $filename); $images = 'assets/uploads/fractionalrealestate_images/' . $filename; + $fractionalRealEstate = new ProductImage(); $fractionalRealEstate->product_xid = $request->product_id; $fractionalRealEstate->images = $images; diff --git a/app/Http/Controllers/Frontend/FractionalRealEstateController.php b/app/Http/Controllers/Frontend/FractionalRealEstateController.php index 90f660f..58aac2e 100644 --- a/app/Http/Controllers/Frontend/FractionalRealEstateController.php +++ b/app/Http/Controllers/Frontend/FractionalRealEstateController.php @@ -15,13 +15,13 @@ class FractionalRealEstateController extends Controller public function index() { $fractionalRealEstate = $this->fractData()->getData(); - $openFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies','categorys')->open()->active()->latest()->get(); - $resaleFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies','categorys')->resale()->active()->latest()->get(); - $fullyFundedFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies','categorys')->fullyFunded()->active()->latest()->get(); + $openFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies', 'categorys')->open()->active()->latest()->get(); + $resaleFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies', 'categorys')->resale()->active()->latest()->get(); + $fullyFundedFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies', 'categorys')->fullyFunded()->active()->latest()->get(); $learnMore = (new FractionalRealEstateFontendController)->fractionalRealEstateQuestionAndAnswer()->getData(); // $faqs = (new FractionalRealEstateFontendController)->fractionalRealEstateQuestionAndAnswerFaqs()->getData(); // dd($openFRE); - return view('Frontend.Pages.fractional-real-estate.index', compact('fractionalRealEstate','learnMore','openFRE', 'resaleFRE', 'fullyFundedFRE')); + return view('Frontend.Pages.fractional-real-estate.index', compact('fractionalRealEstate', 'learnMore', 'openFRE', 'resaleFRE', 'fullyFundedFRE')); } public function product($slug) @@ -32,27 +32,26 @@ class FractionalRealEstateController extends Controller ->where(['status' => true, 'categories_id' => 2]) ->where('slug', '!=', $slug) ->get(); - // dd($fractionalRealEstate); - - $productData = FractionalRealEstate::where('slug','=',$slug)->first(); - $productData = Product::where('id','=',$productData->products_id)->first(); + // dd($fractionalRealEstate); + + $productData = FractionalRealEstate::where('slug', '=', $slug)->first(); + $productData = Product::with('product_images')->where('id', $productData->products_id)->first(); + // dd($productData); // $productData['presentation_file'] = $productData->getRawOriginal('presentation'); // $productData['fact_sheet_file'] = $productData->getRawOriginal('fact_sheet'); // dd($fractionalRealEstate); - return view('Frontend.Pages.fractional-real-estate.product', compact('fractionalRealEstate','otherFRE','productData')); + return view('Frontend.Pages.fractional-real-estate.product', compact('fractionalRealEstate', 'otherFRE', 'productData')); } - - public function downloadFilePersantation($filename){ + + public function downloadFilePersantation($filename) + { // dd($filename); - if(\File::exists('public/uploads/product/presentation/'.$filename)) - { + if (\File::exists('public/uploads/product/presentation/' . $filename)) { // dd('hello'); - return response()->download(public_path('/uploads/product/presentation/'.$filename)); - } - else if(\File::exists('public/uploads/product/fact_sheet/'.$filename)) - { - return response()->download(public_path('/uploads/product/fact_sheet/'.$filename)); - }else{ + return response()->download(public_path('/uploads/product/presentation/' . $filename)); + } else if (\File::exists('public/uploads/product/fact_sheet/' . $filename)) { + return response()->download(public_path('/uploads/product/fact_sheet/' . $filename)); + } else { return "file not found"; } dd('hello'); @@ -62,8 +61,7 @@ class FractionalRealEstateController extends Controller { try { $product = Product::has('fractional_real_estate')->with('fractional_real_estate.companies')->active()->get(); - foreach($product as $fre) - { + foreach ($product as $fre) { $fre->fractional_real_estate->property_img = $fre->fractional_real_estate->getRawOriginal('property_image'); } return (new test($product)) @@ -74,9 +72,10 @@ class FractionalRealEstateController extends Controller } } - public function fractionalRealEstateData($slug){ + public function fractionalRealEstateData($slug) + { try { - return (new FractionalRealEstateResource(FractionalRealEstate::where('slug',$slug)->first())) + return (new FractionalRealEstateResource(FractionalRealEstate::where('slug', $slug)->first())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/Http/Resources/FractionalRealEstateResource.php b/app/Http/Resources/FractionalRealEstateResource.php index 24f5013..465be7d 100644 --- a/app/Http/Resources/FractionalRealEstateResource.php +++ b/app/Http/Resources/FractionalRealEstateResource.php @@ -18,8 +18,8 @@ class FractionalRealEstateResource extends JsonResource return [ 'id' => $this->id, 'products_id' => $this->products_id, - 'presentation' => Product::find($this->products_id)->value('presentation'), - 'fact_sheet' => Product::find($this->products_id)->value('fact_sheet'), + 'presentation' => Product::find($this->products_id) ? Product::find($this->products_id)->value('presentation') : null, + 'fact_sheet' => Product::find($this->products_id) ? Product::find($this->products_id)->value('fact_sheet') : null, 'companies_id' => $this->companies_id, 'slug' => $this->slug, 'property_name_and_location' => $this->property_name_and_location, diff --git a/app/Models/AlternativeInvestmentFund.php b/app/Models/AlternativeInvestmentFund.php index 08b2435..605f32d 100644 --- a/app/Models/AlternativeInvestmentFund.php +++ b/app/Models/AlternativeInvestmentFund.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class AlternativeInvestmentFund extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $hidden = ['created_at','updated_at']; diff --git a/app/Models/FractionalRealEstate.php b/app/Models/FractionalRealEstate.php index f4bf617..6be0ded 100644 --- a/app/Models/FractionalRealEstate.php +++ b/app/Models/FractionalRealEstate.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class FractionalRealEstate extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $hidden = ['created_at','updated_at']; diff --git a/app/Models/Fund.php b/app/Models/Fund.php index d61ee77..e29e49f 100644 --- a/app/Models/Fund.php +++ b/app/Models/Fund.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class Fund extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $fillable = ['products_id','slug','issuer','fund_name','fund_type','about_issuer','fund_description','sharpe_ratio','annualized_volatility','max_dropdown','isin','inception_date','fund_aum','expense_ratio','nav_per_unit','minimum_investment','ytd','year1_return','year3_return']; diff --git a/app/Models/IndianFinancialAssets.php b/app/Models/IndianFinancialAssets.php index 50d5d1d..6eb4924 100644 --- a/app/Models/IndianFinancialAssets.php +++ b/app/Models/IndianFinancialAssets.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class IndianFinancialAssets extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $fillable = ['products_id','type','slug','product_name','investment_platform','counter_party','investment_date','amount_invested','total_gross_repaid_amount','tenure','principal_payment_frequency','interest_payment_frequency','next_repayment_due_date','maturity_date','next_repayment_amount','expected_irr']; } diff --git a/app/Models/InvoiceDiscounting.php b/app/Models/InvoiceDiscounting.php index 28a7c59..dd453ac 100644 --- a/app/Models/InvoiceDiscounting.php +++ b/app/Models/InvoiceDiscounting.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class InvoiceDiscounting extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $hidden = ['created_at','updated_at']; diff --git a/app/Models/RealEstate.php b/app/Models/RealEstate.php index 3a3687a..24a4448 100644 --- a/app/Models/RealEstate.php +++ b/app/Models/RealEstate.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class RealEstate extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $fillable = ['products_id','slug','property_name','property_location','project_type','current_status','price_per_sq_ft','booking_amount','price_range','total_price','transaction_type','project_code_or_rera_id','built_up_area','carpet_area','area_in_sq_ft','construction_status','launch_date','completed_in','total_units','unit_type','no_of_bedrooms','no_of_restrooms','no_of_floors','furnished_status','commencement_certificate','occupancy_certificate','total_towers','builder_details','landmarks','amenities','elevators','car_parking','electricity_status','fire_safety_measures','water_facility','price_negotiable','maintenance_fees','nearest_railway_metro_station','pre_leased','tenant_details','facilities_features','construction_age','remarks','location','country']; diff --git a/app/Models/StockFundsRealEstateExchange.php b/app/Models/StockFundsRealEstateExchange.php index 4a71e0d..4d2b3f3 100644 --- a/app/Models/StockFundsRealEstateExchange.php +++ b/app/Models/StockFundsRealEstateExchange.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class StockFundsRealEstateExchange extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $fillable = ['products_id','name','type','slug','ticker','exchange','about','industry','market_cap','pe_ratio','dividend_yield','beta','provider','category','expense_ratio','month1_return','month6_return','year1_return','year3_return']; } diff --git a/app/Models/VentureDebt.php b/app/Models/VentureDebt.php index d768308..cbb951f 100644 --- a/app/Models/VentureDebt.php +++ b/app/Models/VentureDebt.php @@ -4,10 +4,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class VentureDebt extends Model { - use HasFactory; + use HasFactory, SoftDeletes; protected $hidden = ['created_at','updated_at']; diff --git a/app/helper.php b/app/helper.php index 8137569..d2d8b83 100644 --- a/app/helper.php +++ b/app/helper.php @@ -45,7 +45,7 @@ function imagePath($path = null) $finalPath = "https://staging.jerichoalternatives.in/"; } if (env('APP_ENV') == 'local') { - $finalPath = "http://localhost/my-freeu/"; + $finalPath = "http://localhost/jericho_28_march/"; } return $finalPath . $path; } diff --git a/public/assets/uploads/fractionalrealestate_images/202404101147_contact.png b/public/assets/uploads/fractionalrealestate_images/202404101147_contact.png new file mode 100644 index 0000000..9a4bd73 Binary files /dev/null and b/public/assets/uploads/fractionalrealestate_images/202404101147_contact.png differ diff --git a/public/assets/uploads/fractionalrealestate_images/202404101147_faq.png b/public/assets/uploads/fractionalrealestate_images/202404101147_faq.png new file mode 100644 index 0000000..c0a4d34 Binary files /dev/null and b/public/assets/uploads/fractionalrealestate_images/202404101147_faq.png differ diff --git a/public/assets/uploads/fractionalrealestate_images/202404101147_privacy-policy.png b/public/assets/uploads/fractionalrealestate_images/202404101147_privacy-policy.png new file mode 100644 index 0000000..90d39eb Binary files /dev/null and b/public/assets/uploads/fractionalrealestate_images/202404101147_privacy-policy.png differ diff --git a/public/assets/uploads/fractionalrealestate_images/202404101553_image.png b/public/assets/uploads/fractionalrealestate_images/202404101553_image.png new file mode 100644 index 0000000..0513644 Binary files /dev/null and b/public/assets/uploads/fractionalrealestate_images/202404101553_image.png differ diff --git a/resources/views/Admin/edit-sub-admin.blade.php b/resources/views/Admin/edit-sub-admin.blade.php index 8785a97..e4d0805 100644 --- a/resources/views/Admin/edit-sub-admin.blade.php +++ b/resources/views/Admin/edit-sub-admin.blade.php @@ -154,7 +154,7 @@ {{-- --}} -
@@ -241,7 +241,7 @@ {{-- --}} -
@@ -349,7 +349,7 @@ {{-- --}} -
@@ -475,7 +475,7 @@
-
@@ -577,7 +577,7 @@
-
@@ -725,7 +725,7 @@
-
@@ -922,7 +922,7 @@
@@ -1219,9 +1219,9 @@ } } else { if ($('#dashboardOne').hasClass('show') == true) { - $('#dashboardOne').removeClass('show'); - $('#dashboard').addClass('collapsed'); - $('#dashboard').prop('aria-expanded', false); + // $('#dashboardOne').removeClass('show'); + // $('#dashboard').addClass('collapsed'); + // $('#dashboard').prop('aria-expanded', false); } unCheckCheckbox('#dashboard'); } @@ -1237,9 +1237,9 @@ } } else { if ($('#manageCommissionOne').hasClass('show') == true) { - $('#manageCommissionOne').removeClass('show'); - $('#manageCommission').addClass('collapsed'); - $('#manageCommission').prop('aria-expanded', false); + // $('#manageCommissionOne').removeClass('show'); + // $('#manageCommission').addClass('collapsed'); + // $('#manageCommission').prop('aria-expanded', false); } unCheckCheckbox('#manageCommission'); } @@ -1256,9 +1256,9 @@ } } else { if ($('#investorOne').hasClass('show') == true) { - $('#investorOne').removeClass('show'); - $('#investor').addClass('collapsed'); - $('#investor').prop('aria-expanded', false); + // $('#investorOne').removeClass('show'); + // $('#investor').addClass('collapsed'); + // $('#investor').prop('aria-expanded', false); } unCheckCheckbox('#investor'); } @@ -1274,9 +1274,9 @@ } } else { if ($('#primary_market').hasClass('show') == true) { - $('#primary_market').removeClass('show'); - $('#primaryMarket').addClass('collapsed'); - $('#primaryMarket').prop('aria-expanded', false); + // $('#primary_market').removeClass('show'); + // $('#primaryMarket').addClass('collapsed'); + // $('#primaryMarket').prop('aria-expanded', false); } unCheckCheckbox('#primaryMarket'); } @@ -1293,9 +1293,9 @@ } } else { if ($('#secondaryMarketThree').hasClass('show') == true) { - $('#secondaryMarketThree').removeClass('show'); - $('#secondary_market').addClass('collapsed'); - $('#secondary_market').prop('aria-expanded', false); + // $('#secondaryMarketThree').removeClass('show'); + // $('#secondary_market').addClass('collapsed'); + // $('#secondary_market').prop('aria-expanded', false); } unCheckCheckbox('#secondary_market'); } @@ -1312,9 +1312,9 @@ } } else { if ($('#cmsPanelFour').hasClass('show') == true) { - $('#cmsPanelFour').removeClass('show'); - $('#cms_panel').addClass('collapsed'); - $('#cms_panel').prop('aria-expanded', false); + // $('#cmsPanelFour').removeClass('show'); + // $('#cms_panel').addClass('collapsed'); + // $('#cms_panel').prop('aria-expanded', false); } unCheckCheckbox('#cms_panel'); } @@ -1330,9 +1330,9 @@ } } else { if ($('#manageSubAdminFive').hasClass('show') == true) { - $('#manageSubAdminFive').removeClass('show'); - $('#manage_sub_admin').addClass('collapsed'); - $('#manage_sub_admin').prop('aria-expanded', false); + // $('#manageSubAdminFive').removeClass('show'); + // $('#manage_sub_admin').addClass('collapsed'); + // $('#manage_sub_admin').prop('aria-expanded', false); } unCheckCheckbox('#manage_sub_admin'); } diff --git a/resources/views/Admin/login/otp.blade.php b/resources/views/Admin/login/otp.blade.php index 799bff5..0c72e63 100644 --- a/resources/views/Admin/login/otp.blade.php +++ b/resources/views/Admin/login/otp.blade.php @@ -200,7 +200,8 @@ // window.location.href='/dashboard'; setTimeout(() => { // location.reload(); - window.location.href = "{{route('dashboard')}}"; + // window.location.href = "{{route('welcome-to-dashboard')}}"; + window.location.href = result.return_to_page; }, 1000); } if (result.status == 400) { diff --git a/resources/views/Admin/welcome_to_dashboard.blade.php b/resources/views/Admin/welcome_to_dashboard.blade.php new file mode 100644 index 0000000..838e0b5 --- /dev/null +++ b/resources/views/Admin/welcome_to_dashboard.blade.php @@ -0,0 +1,12 @@ +@extends('Admin.layouts.master') +@section('content') +
+
+ logo +
+
+

Welcome to dashboard

+
+
+@endsection diff --git a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php index d51326f..c731c32 100644 --- a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php +++ b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php @@ -1,5 +1,58 @@ @extends('Frontend.layouts.master') @section('content') +
@@ -55,6 +108,36 @@
+ @if ($productData && $productData->product_images != null) + + @endif +
diff --git a/resources/views/Frontend/Pages/index.blade.php b/resources/views/Frontend/Pages/index.blade.php index 76d8764..dc9e13b 100644 --- a/resources/views/Frontend/Pages/index.blade.php +++ b/resources/views/Frontend/Pages/index.blade.php @@ -400,7 +400,7 @@ @endif -

{{ $pick->product_name }}-{{ $pick->categories_id }}

+

{{ $pick->product_name }}

Category: {{ $pick->category_name }}

diff --git a/resources/views/Frontend/Pages/marketplace/index.blade.php b/resources/views/Frontend/Pages/marketplace/index.blade.php index fecf553..306defd 100644 --- a/resources/views/Frontend/Pages/marketplace/index.blade.php +++ b/resources/views/Frontend/Pages/marketplace/index.blade.php @@ -168,7 +168,7 @@ @php($style = '') @endif {{ $data->discount }}% + style="{{ $style }}">{{ number_format((float)$data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -181,7 +181,7 @@ @php($style = '') @endif {{ $data->bid }}% + style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}% {{ $data->discount }}% + style="{{ $style }}">{{ number_format((float)$data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -260,7 +260,7 @@ @php($style = '') @endif {{ $data->bid }}% + style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}% {{ $data->discount }}% + style="{{ $style }}">{{ number_format((float)$data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -332,7 +332,7 @@ @php($style = '') @endif {{ $data->bid }}% + style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}% {{ $data->discount }}% + style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -467,7 +467,7 @@ @php($style = '') @endif {{ $data->bid }}% + style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}% {{ $data->discount }}% + style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -538,7 +538,7 @@ @php($style = '') @endif {{ $data->bid }}% + style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}% {{ $data->discount }}% + style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -610,7 +610,7 @@ @php($style = '') @endif {{ $data->bid }}% + style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}% + +
-->

Currently, No Secondary Sale Opportunities Available.

diff --git a/resources/views/Frontend/Pages/marketplace/view-offering.blade.php b/resources/views/Frontend/Pages/marketplace/view-offering.blade.php index 9bbff8f..e469d39 100644 --- a/resources/views/Frontend/Pages/marketplace/view-offering.blade.php +++ b/resources/views/Frontend/Pages/marketplace/view-offering.blade.php @@ -8,7 +8,9 @@ {{-- @dd($offering->sold_status) --}} {{-- @dd($investedData) --}} - @if ($investedData && $investedData->status != 'Sold') + @if ( + ($investedData && $investedData->status != 'Sold') || + ($investedData != null ? $investedData->status == 'OPEN' : true)) @if ($logged_in) @if (!$ownProduct) @if (!$invested) @@ -20,30 +22,35 @@ id="" data-product-id="{{ $offering->products_id }}" data-bs-target="#recipes-pop-four">Added To Investment Watchlist! --}} - slug) }}" class="yellow-btn grow_skew_forward" + id="" data-product-id="{{ $offering->products_id }}" + data-bs-target="#recipes-pop-four" + style=" padding: 10px; height: 34px; - ">Edit Your Bid + ">Edit + Your Bid @endif @endif @else @endif + {{ $totalInterestedBuyers }} + @else + {{-- @if ($investedData && $investedData->status == 'OPEN') --}} +

"We're pleased to announce the successful sale of this product and therefore this opportunity is no + longer available in our secondary offerings."

@endif - {{ $totalInterestedBuyers }} {{-- Show Interest --}} - {{-- @if ($offering->sold_status == 'OPEN') --}} - + {{-- @if ($offering->sold_status == 'OPEN') --}} + + - {{-- Edit Your Bid --}} - {{-- @endif --}} + {{-- @endif --}}
diff --git a/resources/views/Frontend/footer.blade.php b/resources/views/Frontend/footer.blade.php index a0011a7..af6fa9e 100644 --- a/resources/views/Frontend/footer.blade.php +++ b/resources/views/Frontend/footer.blade.php @@ -134,10 +134,10 @@ required>
-
+
{{-- --}} - +
diff --git a/routes/web.php b/routes/web.php index 719befd..1032eca 100644 --- a/routes/web.php +++ b/routes/web.php @@ -858,6 +858,7 @@ Route::middleware([BackendAccess::class])->group(function () { Route::get("role_list", 'addPage')->name('role_list')->name('role_list'); Route::post("view_role", 'store')->name('view_role')->name('view_role'); Route::post("status", 'status')->name('status'); + Route::view('welcome-to-dashboard', 'Admin.welcome_to_dashboard')->name('welcome-to-dashboard'); }); // Manage Sub Admin middleware