From dff9f9aac6047bc4455efaf67cdc19bf704dd88c Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Wed, 5 Jun 2024 18:53:41 +0530 Subject: [PATCH 1/5] added original value while edit --- .../edit-product/alternative-investment-fund.blade.php | 4 ++-- .../alternative-investment-fund/angel-fund-product.blade.php | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php index 134977c..c746e5a 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php @@ -608,7 +608,7 @@ - + @@ -740,7 +740,7 @@ - + diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php index 1472cc1..9b4ba11 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php @@ -94,6 +94,7 @@
+ {{-- @dd($productData) --}} @if ($productData && $productData->product_images != null)
-
+ {{--
@@ -370,7 +371,7 @@
-
+
--}} {{--
From 284e54e3b0f9049c3fcb100008eab61858eaea2f Mon Sep 17 00:00:00 2001 From: meghamalore Date: Wed, 5 Jun 2024 18:57:53 +0530 Subject: [PATCH 2/5] bugs fixining --- app/Models/AlternativeInvestmentFund.php | 7 +++++++ .../angel-fund-product.blade.php | 6 ++++++ .../infrastructure-fund-product.blade.php | 21 ++++++++++++------- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/Models/AlternativeInvestmentFund.php b/app/Models/AlternativeInvestmentFund.php index 0942bf2..fa8c6f7 100644 --- a/app/Models/AlternativeInvestmentFund.php +++ b/app/Models/AlternativeInvestmentFund.php @@ -34,4 +34,11 @@ class AlternativeInvestmentFund extends Model // dd($value); return $value == null ? '--' : $value; } + + public function getIntialDrawdownAttribute($value) + { + // dd($); + return $value == null ? '--' : $value.' %'; + // return $value; + } } diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php index 1472cc1..654a5b1 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php @@ -290,7 +290,9 @@

Accepting Overseas investment?

{{ $angelFund->accepting_overseas_investment ?? '-' }}
+
{{-- @dd($productData->involved_in_short_selling); --}} +

Involved In Short Selling

{{ $productData->involved_in_short_selling }} @@ -300,6 +302,8 @@

Trading Strategy

{{ $productData->trading_strategy }}
+
+

Focused Funds

@@ -310,6 +314,8 @@

Valuation Per Sector

{{ $productData->valuation_per_sector }}
+
+

Return On Investment

diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php index f75f152..d7fa1af 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php @@ -140,10 +140,9 @@

Fund structure

{{ $infrastructureFund->fund_structure ?? '-' }}
-
-

Fund strategy

- {{ $infrastructureFund->fund_strategy ?? '-' }} -
+ {{--
+ +
--}}
{{--

Description

@@ -151,6 +150,14 @@
--}}
+
+
+
+

Fund strategy

+ {{ $infrastructureFund->fund_strategy ?? '-' }} +
+
+
@@ -310,7 +317,7 @@ {{ $infrastructureFund->other_expenses ?? '-' }}
-

isin code

+

ISIN code

{{ $infrastructureFund->isin_code ?? '-' }}
@@ -364,10 +371,10 @@

Regions Covered (Geographical Locations covered by the fund)

{{ $infrastructureFund->regions_covered ?? '-' }}
-
+ {{--

company

{{ $infrastructureFund->company->company_name ?? '-' }} -
+
--}} From 7ffa5a9830950d45566557142eb6a13f4b92750f Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Thu, 6 Jun 2024 11:24:37 +0530 Subject: [PATCH 3/5] increased time of disable popup in list your asset --- .../profile/market-list/alternative-investment-fund.blade.php | 2 +- .../Pages/profile/market-list/fractional-real-estate.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php index c96b560..7339a18 100644 --- a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php @@ -290,7 +290,7 @@ setTimeout(() => { $('#successSubmitedModal').modal('hide'); window.location.href = "{{ route('profile_dashboard') }}" - }, 4000); + }, 8000); } if (result.status == 400) { toastr.warning(result.message); diff --git a/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php index dba7922..011cda9 100644 --- a/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php @@ -210,7 +210,7 @@ setTimeout(() => { $('#successSubmitedModal').modal('hide'); window.location.href = "{{ route('profile_dashboard') }}" - }, 4000); + }, 8000); } if (result.status == 400) { toastr.warning(result.message); From 2b561065823674621156f1af3e2b2c036be4cdb8 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Thu, 6 Jun 2024 12:30:03 +0530 Subject: [PATCH 4/5] user notification issue fix --- .../views/Frontend/menu-after-lg.blade.php | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/resources/views/Frontend/menu-after-lg.blade.php b/resources/views/Frontend/menu-after-lg.blade.php index 9e59efd..867d3b5 100644 --- a/resources/views/Frontend/menu-after-lg.blade.php +++ b/resources/views/Frontend/menu-after-lg.blade.php @@ -554,7 +554,7 @@
No notifications found
@endforelse - +{{--
  • Congratulations, Your investment(Cheryl Donovan) has @@ -573,7 +573,7 @@

    4 hours ago

    -
    • + --}} @@ -693,23 +693,3 @@ -@section('scripts') - -@endsection From 980469b41769a32e24910c3a98365defe378fccc Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Thu, 6 Jun 2024 13:08:43 +0530 Subject: [PATCH 5/5] view and edit commission issue fix --- .../Admin/Pages/manage_commission/edit_commission.blade.php | 5 +++++ .../Admin/Pages/manage_commission/view_commission.blade.php | 6 ++++++ 2 files changed, 11 insertions(+) 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 b927c2a..da22ee1 100644 --- a/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php @@ -44,6 +44,10 @@ + @if($product->commission_type) + + @else + @endif
    diff --git a/resources/views/Admin/Pages/manage_commission/view_commission.blade.php b/resources/views/Admin/Pages/manage_commission/view_commission.blade.php index 458da3e..ce51f98 100644 --- a/resources/views/Admin/Pages/manage_commission/view_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/view_commission.blade.php @@ -43,6 +43,7 @@
    + @if($product->commission_type == 'One-Time Commission' || $product->commission_type == 'Hybrid Structure' || $product->commission_type == null)
    + @endif + @if($product->commission_type == 'Hybrid Structure' || $product->commission_type == 'Trail Commission' || $product->commission_type == null)
    + @endif
    + @if($product->commission_type == 'Trail Commission' || $product->commission_type == 'Hybrid Structure' || $product->commission_type == null)
    + @endif