Merge branch 'main' of https://github.com/Ritikeshyadav/my-freeu into RitikeshFreeu

This commit is contained in:
Ritikesh yadav
2024-07-01 22:48:12 +05:30
3 changed files with 13 additions and 12 deletions

View File

@@ -158,7 +158,7 @@
</label>
<!--end::Label-->
<!--begin::Input-->
<div class="form-control form-control-solid">{{$monthlyUpdateMaster->companies->company_name}}</div>
<div class="form-control form-control-solid">{{ $monthlyUpdateMaster->companies->company_name ?? 'N/A' }}</div>
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">

View File

@@ -167,11 +167,11 @@
<tbody class='text-gray-600 fw-semibold'>
@foreach ($currentInvestment['productsDetails'] as $product)
<tr>
<td>{{ $product['product_name'] }}</td>
<td>{{ $product['total_investment_amount_in_rs'] }}
</tdx>
<td>{{ $product['categories'] }}</tdx>
<td>{{ $product['platform'] }}</td>
<td>{{ $product['product_name'] ?? 'N/A' }}</td>
<td>{{ $product['total_investment_amount_in_rs'] ?? 'N/A' }}
</td>
<td>{{ $product['categories'] ?? 'N/A' }}</tdx>
<td>{{ $product['platform'] ?? 'N/A' }}</td>
<td
class="text-end d-flex align-items-center justify-content-around">
<a href="{{ route('invested-product-details', $product['id']) }}"
@@ -220,11 +220,11 @@
<tbody class='text-gray-600 fw-semibold'>
@foreach ($reedemedInvestment['productsDetails'] as $product)
<tr>
<td>{{ $product['product_name'] }}</td>
<td>{{ $product['total_investment_amount_in_rs'] }}
</tdx>
<td>{{ $product['categories'] }}</tdx>
<td>{{ $product['platform'] }}</td>
<td>{{ $product['product_name'] ?? 'N/A' }}</td>
<td>{{ $product['total_investment_amount_in_rs'] ?? 'N/A' }}
</td>
<td>{{ $product['categories'] ?? 'N/A' }}</tdx>
<td>{{ $product['platform'] ?? 'N/A' }}</td>
<td
class="text-end d-flex align-items-center justify-content-around">
<a href="{{ route('invested-product-details', $product['id']) }}"

View File

@@ -418,7 +418,8 @@
<td>{{ $data->property_grade }}</td>
<td>{{ $data->asset_type }}</td>
<td>{{ $data->company_name }}</td>
<td>{{ number_format((float) IND_money_format($data->og_expected_selling_price), 0, '.', '') }}</td>
<td>{{ IND_money_format($data->og_expected_selling_price) }}</td>
{{-- <td>{{ number_format((float) IND_money_format($data->og_expected_selling_price), 0, '.', '') }}</td> --}}
</td>
<td>
<a href="{{route('market_place_offering',$data->slug)}}" class="blue-btn"><i class="fa fa-eye" aria-hidden="true"></i></a>