From de00ea44c682c0f3eb1bb9c460b91cf0cb794129 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Fri, 26 Apr 2024 19:26:00 +0530 Subject: [PATCH 1/6] design bug fixing --- .../Pages/manage_leads/edit-lead.blade.php | 536 ++++++++++++++++++ 1 file changed, 536 insertions(+) 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 7d77412..a43ab42 100644 --- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php @@ -721,6 +721,13 @@ select#cars {
+<<<<<<< HEAD + +======= @@ -843,6 +850,7 @@ select#cars { value='{{ $lead->total_employees }}' />
+>>>>>>> 59cf1f94e432bdda61327fc887fdd097004e075a @@ -954,6 +962,45 @@ select#cars { +<<<<<<< HEAD + + + + + + +
+ @csrf + +
+ +
+ +
+ + +
+
+
+

Attachments

+
+ +
+

Upload + File

+

Link(URL) +

+=======
    @@ -983,6 +1030,7 @@ select#cars { @endforelse
+>>>>>>> 59cf1f94e432bdda61327fc887fdd097004e075a
@@ -1915,7 +1963,11 @@ select#cars { +<<<<<<< HEAD + +======= +>>>>>>> 59cf1f94e432bdda61327fc887fdd097004e075a
@@ -3103,6 +3155,489 @@ select#cars { @endsection @section('scripts') +<<<<<<< HEAD + + - + @endsection diff --git a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php index a3aa852..c60789a 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php @@ -69,7 +69,7 @@ class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0"> Sr no Product - Expected Selling Price + Expected Selling Price Seller Name Email Contact @@ -131,7 +131,7 @@ class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0"> Sr no Product - Expected Selling Price + Expected Selling Price Seller Name Email Contact @@ -192,7 +192,7 @@ class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0"> Sr no Product - Expected Selling Price + Expected Selling Price Seller Name Email Contact diff --git a/resources/views/components/angel-fund-product.blade.php b/resources/views/components/angel-fund-product.blade.php index 9055290..3cdaedd 100644 --- a/resources/views/components/angel-fund-product.blade.php +++ b/resources/views/components/angel-fund-product.blade.php @@ -34,8 +34,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| -

Tenure From Final Date: +

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| +

Tenure From Final Date: {{ $data->alternative_investment_fund->tenure_from_final_date }}

diff --git a/resources/views/components/fund-for-distressed-asset-product.blade.php b/resources/views/components/fund-for-distressed-asset-product.blade.php index 1ffeeea..de4a2db 100644 --- a/resources/views/components/fund-for-distressed-asset-product.blade.php +++ b/resources/views/components/fund-for-distressed-asset-product.blade.php @@ -16,7 +16,7 @@ @else @endif - +

{{$data->alternative_investment_fund->fund_name}}

Category: {{$data->categorys->category_name}}

@@ -29,8 +29,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{$data->alternative_investment_fund->target_irr}}

| -

Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}

+

Target IRR: {{$data->alternative_investment_fund->target_irr}}

| +

Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}

Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}

diff --git a/resources/views/components/global-commercial-real-estate-product.blade.php b/resources/views/components/global-commercial-real-estate-product.blade.php index 8031b3f..026c8cf 100644 --- a/resources/views/components/global-commercial-real-estate-product.blade.php +++ b/resources/views/components/global-commercial-real-estate-product.blade.php @@ -30,7 +30,7 @@

Close Date: Approx. Sep 2030

-

Type : {{$data->real_estate->project_type}}

| +

Type : {{$data->real_estate->project_type}}

|

diff --git a/resources/views/components/global-industrial-real-estate-product.blade.php b/resources/views/components/global-industrial-real-estate-product.blade.php index 290bd4d..5aa7091 100644 --- a/resources/views/components/global-industrial-real-estate-product.blade.php +++ b/resources/views/components/global-industrial-real-estate-product.blade.php @@ -30,8 +30,8 @@

Close Date: Approx. Sep 2030

-

Type : {{$data->real_estate->project_type}}

| -

Price per sqft : {{$data->real_estate->price_per_sq_ft}}

+

Type : {{$data->real_estate->project_type}}

| +

Price per sqft : {{$data->real_estate->price_per_sq_ft}}

Total Price: {{$data->real_estate->total_price}}

diff --git a/resources/views/components/global-private-credit-fund-product.blade.php b/resources/views/components/global-private-credit-fund-product.blade.php index 16a5ec0..aca3f5d 100644 --- a/resources/views/components/global-private-credit-fund-product.blade.php +++ b/resources/views/components/global-private-credit-fund-product.blade.php @@ -36,9 +36,9 @@

Close Date: Approx. Sep 2030

-

1 yrs return: {{ $data->funds->year1_return }}% -

| -

3 yrs return: +

1 yrs return: {{ $data->funds->year1_return }}% +

| +

3 yrs return: {{ $data->funds->year3_return }}%

diff --git a/resources/views/components/global-private-equity-fund-product.blade.php b/resources/views/components/global-private-equity-fund-product.blade.php index d7cf061..25e1535 100644 --- a/resources/views/components/global-private-equity-fund-product.blade.php +++ b/resources/views/components/global-private-equity-fund-product.blade.php @@ -33,8 +33,8 @@

Property Location: {{ $gireData->funds->issuer }}

-

Carpet Area: {{ $gireData->funds->nav_per_unit }}

| -

Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}

+

Carpet Area: {{ $gireData->funds->nav_per_unit }}

| +

Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}

Total Price: {{ $gireData->funds->fund_aum }}

diff --git a/resources/views/components/global-r-e-i-t-s-product.blade.php b/resources/views/components/global-r-e-i-t-s-product.blade.php index 79070d0..c1e670e 100644 --- a/resources/views/components/global-r-e-i-t-s-product.blade.php +++ b/resources/views/components/global-r-e-i-t-s-product.blade.php @@ -36,8 +36,8 @@

Property Location: {{ $gireData->exchanges->name }}

-

Carpet Area: {{ $gireData->exchanges->beta }}

| -

Area in Sq. Ft.: {{ $gireData->exchanges->beta }}

+

Carpet Area: {{ $gireData->exchanges->beta }}

| +

Area in Sq. Ft.: {{ $gireData->exchanges->beta }}

Total Price: {{ $gireData->exchanges->beta }}

diff --git a/resources/views/components/global-residential-real-estate-product.blade.php b/resources/views/components/global-residential-real-estate-product.blade.php index 849d395..c0d5215 100644 --- a/resources/views/components/global-residential-real-estate-product.blade.php +++ b/resources/views/components/global-residential-real-estate-product.blade.php @@ -30,7 +30,7 @@

Close Date: Approx. Sep 2030

-

Type : {{$data->real_estate->project_type}}

| +

Type : {{$data->real_estate->project_type}}

|

diff --git a/resources/views/components/global-venture-capital-fund-product.blade.php b/resources/views/components/global-venture-capital-fund-product.blade.php index c8879ab..ff5f6c6 100644 --- a/resources/views/components/global-venture-capital-fund-product.blade.php +++ b/resources/views/components/global-venture-capital-fund-product.blade.php @@ -66,9 +66,9 @@
-

Carpet Area: {{ $gireData->funds->nav_per_unit }}

| +

Carpet Area: {{ $gireData->funds->nav_per_unit }}

| -

Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}

+

Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}

diff --git a/resources/views/components/hedge-fund-product.blade.php b/resources/views/components/hedge-fund-product.blade.php index c5a6d6c..cec172d 100644 --- a/resources/views/components/hedge-fund-product.blade.php +++ b/resources/views/components/hedge-fund-product.blade.php @@ -33,8 +33,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| -

Tenure From Final Date: +

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| +

Tenure From Final Date: {{ $data->alternative_investment_fund->tenure_from_final_date }}

diff --git a/resources/views/components/indian-commercial-real-estate-product.blade.php b/resources/views/components/indian-commercial-real-estate-product.blade.php index 8c9b3aa..606aeb0 100644 --- a/resources/views/components/indian-commercial-real-estate-product.blade.php +++ b/resources/views/components/indian-commercial-real-estate-product.blade.php @@ -29,7 +29,7 @@

Close Date: Approx. Sep 2030

-

Type: {{$data->realEstate->project_type}}

| +

Type: {{$data->realEstate->project_type}}

diff --git a/resources/views/components/indian-industrial-real-estate-product.blade.php b/resources/views/components/indian-industrial-real-estate-product.blade.php index a28d388..768638b 100644 --- a/resources/views/components/indian-industrial-real-estate-product.blade.php +++ b/resources/views/components/indian-industrial-real-estate-product.blade.php @@ -30,7 +30,7 @@

Close Date: Approx. Sep 2030

-

Type : {{$ffdaData->realEstate->project_type}}

| +

Type : {{$ffdaData->realEstate->project_type}}

diff --git a/resources/views/components/infrastructure-fund-product.blade.php b/resources/views/components/infrastructure-fund-product.blade.php index 5f0bd4c..562db42 100644 --- a/resources/views/components/infrastructure-fund-product.blade.php +++ b/resources/views/components/infrastructure-fund-product.blade.php @@ -30,8 +30,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{$data->alternative_investment_fund->target_irr}}

| -

Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}

+

Target IRR: {{$data->alternative_investment_fund->target_irr}}

| +

Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}

Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}

diff --git a/resources/views/components/long-only-equity-funds.blade.php b/resources/views/components/long-only-equity-funds.blade.php index ce3a4d3..40ce7cf 100644 --- a/resources/views/components/long-only-equity-funds.blade.php +++ b/resources/views/components/long-only-equity-funds.blade.php @@ -35,8 +35,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| -

Tenure From Final Date: +

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| +

Tenure From Final Date: {{ $data->alternative_investment_fund->tenure_from_final_date }}

diff --git a/resources/views/components/p-i-p-e-fund-product.blade.php b/resources/views/components/p-i-p-e-fund-product.blade.php index a9f97fd..d88246e 100644 --- a/resources/views/components/p-i-p-e-fund-product.blade.php +++ b/resources/views/components/p-i-p-e-fund-product.blade.php @@ -29,8 +29,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{$data->alternative_investment_fund->target_irr}}

| -

Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}

+

Target IRR: {{$data->alternative_investment_fund->target_irr}}

| +

Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}

Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}

diff --git a/resources/views/components/private-credit-fund-product.blade.php b/resources/views/components/private-credit-fund-product.blade.php index 7306a73..60032ab 100644 --- a/resources/views/components/private-credit-fund-product.blade.php +++ b/resources/views/components/private-credit-fund-product.blade.php @@ -36,9 +36,9 @@
{{--
--}} -

Target IRR:{{ $data->alternative_investment_fund->target_irr ?? 'N/A'}} -

| -

Tenure From Final Date:{{ $data->alternative_investment_fund->tenure_from_final_date ?? 'N/A' }}

+

Target IRR:{{ $data->alternative_investment_fund->target_irr ?? 'N/A'}} +

| +

Tenure From Final Date:{{ $data->alternative_investment_fund->tenure_from_final_date ?? 'N/A' }}

{{--
--}}
diff --git a/resources/views/components/private-equity-fund-product.blade.php b/resources/views/components/private-equity-fund-product.blade.php index 68d3293..c73b602 100644 --- a/resources/views/components/private-equity-fund-product.blade.php +++ b/resources/views/components/private-equity-fund-product.blade.php @@ -33,8 +33,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| -

Tenure From Final Date: +

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| +

Tenure From Final Date: {{ $data->alternative_investment_fund->tenure_from_final_date }}

diff --git a/resources/views/components/private-real-estate-fund-product.blade.php b/resources/views/components/private-real-estate-fund-product.blade.php index 7cb6b9c..b10c187 100644 --- a/resources/views/components/private-real-estate-fund-product.blade.php +++ b/resources/views/components/private-real-estate-fund-product.blade.php @@ -33,8 +33,8 @@

Close Date: Approx. Sep 2030

-

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| -

Tenure From Final Date: +

Target IRR: {{ $data->alternative_investment_fund->target_irr }}

| +

Tenure From Final Date: {{ $data->alternative_investment_fund->tenure_from_final_date }}

diff --git a/resources/views/components/venture-capital-fund-product.blade.php b/resources/views/components/venture-capital-fund-product.blade.php index 6e53846..557fec3 100644 --- a/resources/views/components/venture-capital-fund-product.blade.php +++ b/resources/views/components/venture-capital-fund-product.blade.php @@ -21,7 +21,7 @@

{{$data->alternative_investment_fund->fund_name}}

Category: {{$data->categorys->category_name}}

-
+
+

Target IRR: {{$data->alternative_investment_fund->target_irr}}

| +

Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}

Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}