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

This commit is contained in:
Ritikesh yadav
2024-07-01 19:27:54 +05:30
5 changed files with 12 additions and 10 deletions

View File

@@ -175,6 +175,7 @@ class ManageUserProductController extends Controller
$noData = false;
$monthlyUpdate = MonthlyUpdateAlternativeInvestmentFund::where('custom_id', $user->custom_id)->get();
}
// dd($monthlyUpdate);
if ($noData) {
abort(404);

View File

@@ -436,15 +436,14 @@ h4.inner-title {
.parimay-card .card-logo img {
width: 100%;
height: 100%;
object-fit: fill;
object-fit: contain;
}
.assets-card .card-logo {
object-fit: cover;
text-align: center;
padding: 8px;
width: 100%;
height: 250px;
text-align: center;
padding: 8px;
width: 100%;
height: 200px;
}
.parimay-card .blur-md {

View File

@@ -66,7 +66,7 @@
<div
class="col-md-6 end-of-trail-input ml-auto">
<label class="fs-6 fw-semibold form-label mt-3">
<span class="required">Return Type</span>
<span>Return Type</span>
</label>
<select name="return_type" id=""
class="form-control form-control-solid" disabled>

View File

@@ -24,7 +24,9 @@
<td class="min-w-75px w-100px align-top">{{ $data->commitment_amount }}</td>
<td class="min-w-75px w-100px align-top">{{ $data->contribution_amount }}</td>
<td class="min-w-75px w-100px align-top">{{ $data->gross_income }}</td>
<td class="min-w-75px w-150px align-top">{{ $data->total_fees_paid }}</td>
{{-- @dd($data,$data->total_fees_paid); --}}
<td class="min-w-75px w-150px align-top">{{ '₹ '.$data->getRawOriginal()['total_fees_paid'] }}</td>
<td class="min-w-75px w-150px align-top">{{ $data->created_at->format('d/m/y H:i:s') }}</td>
<!--begin::Action=-->
<td class="text-end d-flex align-items-center justify-content-around">
@@ -37,7 +39,7 @@
data-face_value_nav_per_unit="{{ $data->face_value_nav_per_unit }}"
data-principal_capital_repaid="{{ $data->principal_capital_repaid }}"
data-gross_income="{{ $data->gross_income }}"
data-total_fees_paid="{{ $data->total_fees_paid }}" data-net_income="{{ $data->net_income }}"
data-total_fees_paid="{{ '₹ '.$data->getRawOriginal()['total_fees_paid'] }}" data-net_income="{{ $data->net_income }}"
data-no_of_units_alloted="{{ $data->no_of_units_alloted }}"
data-no_of_units_redeemed="{{ $data->no_of_units_redeemed }}"
data-current_valuation="{{ $data->current_valuation }}"

View File

@@ -466,7 +466,7 @@ Route::get('new-mail-template',function(){
Route::get("get-statement-report/{file_name}", [FrontendDashboardController::class, 'getStatementReportAPI'])->name('get-statement-report-api');
Route::get('download-statement-report/{filename}', function($filename){
$filenameWithPath = 'files/monthly-update/0121719470229.png';
$filenameWithPath = 'files/monthly-update/'.$filename;
if(\Storage::exists($filenameWithPath))
{
return \Storage::download($filenameWithPath);