diff --git a/app/Http/Controllers/Admin/ManageLeadController.php b/app/Http/Controllers/Admin/ManageLeadController.php index 4c10dd3..b5c606f 100644 --- a/app/Http/Controllers/Admin/ManageLeadController.php +++ b/app/Http/Controllers/Admin/ManageLeadController.php @@ -117,6 +117,7 @@ class ManageLeadController extends Controller public function viewLead($id) { + // dd($this->lead->show($id)); return view('Admin.Pages.manage_leads.view-lead', [ 'lead' => $this->lead->show($id) ]); diff --git a/app/Models/Lead.php b/app/Models/Lead.php index d50274c..62f5f6f 100644 --- a/app/Models/Lead.php +++ b/app/Models/Lead.php @@ -57,4 +57,9 @@ class Lead extends Model public function owner(){ return $this->belongsTo(User::class, 'lead_owner'); } + + // public function leadsource(){ + // return $this->belongsTo(User::class, 'lead_source'); + // } + } diff --git a/app/Services/Admin/LeadService.php b/app/Services/Admin/LeadService.php index f9e720f..6914016 100644 --- a/app/Services/Admin/LeadService.php +++ b/app/Services/Admin/LeadService.php @@ -89,8 +89,7 @@ class LeadService{ } public function show($id){ - return Lead::with('user', 'owner', 'notes.admin', 'attachment.admin', 'tasks_meetings.admin', 'calls.admin', 'product.category')->FindOrFail($id); - // dd(Lead::with('user', 'owner', 'notes.admin', 'attachment.admin', 'tasks_meetings.admin', 'calls.admin', 'product.category')->FindOrFail($id)); + return Lead::with('user', 'owner', 'notes.admin', 'attachment.admin', 'tasks_meetings.admin', 'calls.admin', 'product.category','leadSource')->FindOrFail($id); } public function edit($id){ diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index 600b4b1..a0aedca 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -485,7 +485,7 @@ h4.inner-title { .assets-card .middle-sec { display: flex; background-color: #e8c69f; - padding: 12px 7px; + padding:8px 7px; align-items: center; justify-content: space-between; } @@ -495,6 +495,7 @@ h4.inner-title { font-size: 15px; display: flex; align-items: center; + line-height: 20px; } .assets-card .org span { diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css index b14565c..0896d79 100644 --- a/public/assets/css/style.bundle.css +++ b/public/assets/css/style.bundle.css @@ -11950,6 +11950,10 @@ fieldset:disabled .btn { min-width: 150px !important } +.min-w-135px { + min-width: 135px !important +} + .min-w-175px { min-width: 175px !important } diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php index 4a731c2..29e7db2 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php @@ -14,7 +14,7 @@
-
+
+
@@ -288,6 +289,7 @@ @endforeach --}} +
@@ -1492,7 +1494,7 @@ digits: 'Please enter digits', }, pan: { - required: 'Please enter pan', + required: 'Please enter PAN number', digits: 'Please enter digits', }, interest_accrued: { @@ -1611,7 +1613,7 @@ digits: 'Please enter digits', }, pan: { - required: 'Please enter pan', + required: 'Please enter PAN number', digits: 'Please enter digits', }, total_active_investment: { @@ -1748,7 +1750,7 @@ digits: 'Please enter digits', }, pan: { - required: 'Please enter pan', + required: 'Please enter PAN number', }, investment_platform: 'Please select investment platform', total_value_of_the_property: { @@ -1914,7 +1916,7 @@ digits: 'Please enter digits', }, pan: { - required: 'Please enter pan', + required: 'Please enter PAN number', }, investment_platform: 'Please select investment platform', fund_category: 'Please enter fund category', diff --git a/resources/views/Admin/Pages/manage_leads/add_lead.blade.php b/resources/views/Admin/Pages/manage_leads/add_lead.blade.php index 7a47ca1..229a581 100644 --- a/resources/views/Admin/Pages/manage_leads/add_lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/add_lead.blade.php @@ -25,7 +25,7 @@
@csrf
-
+
-
+
- {{--
+ {{--
--}} -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- {{--
+ {{--
--}} -
+
-
+
@@ -149,11 +149,11 @@
-

Address Information

+

Address Information

-
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}}