Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #312 from Ritikeshyadav/RitikeshFreeu

Browse Source 
Ritikesh freeu
This commit is contained in:
Ritikeshyadav
2024-06-17 17:19:25 +05:30
committed by GitHub
parent 50d4f35345 5eaa9186f2
commit b809cd06cb
7 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -102,7 +102,7 @@ class ProfileController extends Controller
$validationMessage = $this->validationError($validator);
if ($validationMessage) {
return response()->json(['status' => 400, 'message' => $validationMessage], 400);
return response()->json(['status' => 400, 'message' => $validationMessage], 402);
}
$user = User::find($request->user()->id);
@@ -140,7 +140,7 @@ class ProfileController extends Controller
]);
$validationMessage = $this->validationError($validator);
if ($validationMessage) {
return response()->json(['status' => 400, 'message' => $validationMessage],400);
return response()->json(['status' => 400, 'message' => $validationMessage],402);
}
// dd('both');
$emailotp = rand(1000, 9999);
@@ -189,7 +189,7 @@ class ProfileController extends Controller
]);
$validationMessage = $this->validationError($validator);
if ($validationMessage) {
return response()->json(['status' => 400, 'message' => $validationMessage],400);
return response()->json(['status' => 400, 'message' => $validationMessage],402);
}
// dd('email');
$emailotp = rand(1000, 9999);
@@ -220,7 +220,7 @@ class ProfileController extends Controller
]);
$validationMessage = $this->validationError($validator);
if ($validationMessage) {
return response()->json(['status' => 400, 'message' => $validationMessage],400);
return response()->json(['status' => 400, 'message' => $validationMessage],402);
}
// dd('mobile');

5
app/Imports/FundImport.php
View File

@@ -70,7 +70,7 @@ class FundImport implements ToCollection, WithHeadingRow
} else if ($this->category_id == Category::GlobalPrivateEquityFundId) {
$init = 18;
} else if ($this->category_id == Category::GlobalVentureCapitalFundId) {
$init = 18;
$init = 17;
} else if($this->category_id == Category::GlobalHedgeFundId){
$init = 18;
} else if($this->category_id == Category::GlobalVentureDebtId){
@@ -112,7 +112,8 @@ class FundImport implements ToCollection, WithHeadingRow
'ytd' => $row['ytd'],
'year1_return' => $row['1_year_return'],
'year3_return' => $row['3_year_return'],
'date_as_on' => array_key_exists('data_as_on',$row->toArray()) ? getConvertedDate($row['data_as_on']) ?? null : null,
// 'date_as_on' => array_key_exists('data_as_on',$row->toArray()) ? getConvertedDate($row['data_as_on']) ?? null : null,
'date_as_on' => getConvertedDate($row['data_as_on']) ?? null ,
]);
if ($returns) {
foreach ($returns as $key => $value) {

2
app/Models/Fund.php
View File

@@ -10,7 +10,7 @@ class Fund extends Model
{
use HasFactory, SoftDeletes;
protected $fillable = ['products_id','slug','issuer','fund_name','fund_type','about_issuer','fund_description','sharpe_ratio','annualized_volatility','max_dropdown','isin','inception_date','fund_aum','expense_ratio','nav_per_unit','minimum_investment','ytd','year1_return','year3_return', 'data_as_on','geographic_focus'];
protected $fillable = ['products_id','slug','issuer','fund_name','fund_type','about_issuer','fund_description','sharpe_ratio','annualized_volatility','max_dropdown','isin','inception_date','fund_aum','expense_ratio','nav_per_unit','minimum_investment','ytd','year1_return','year3_return', 'date_as_on','geographic_focus'];
protected $with = ['returns'];

3
public/assets/css/style.bundle.css
View File

@@ -57987,4 +57987,7 @@ label.error {
}
.ck-blurred.ck.ck-content.ck-editor__editable.ck-rounded-corners.ck-editor__editable_inline {
height: 300px;
}
.ck.ck-content.ck-focused {
height: 300px;
}

3
public/assets/css/style.css
View File

@@ -1421,4 +1421,7 @@ label.error {
}
.ck-blurred.ck.ck-content.ck-editor__editable.ck-rounded-corners.ck-editor__editable_inline {
height: 300px;
}
.ck.ck-content.ck-focused {
height: 300px;
}

4
resources/views/Admin/Pages/contact_form_leads/mail_reply.blade.php
View File

@@ -199,8 +199,8 @@
<div class="modal-footer justify-content-center">
<button type="button" class="btn btn-primary btn-hover-rise me-5" data-bs-dismiss="modal"
aria-label="Close">Close</button>
<button type="button" class="btn btn-primary btn-hover-rise" id="send_mail_replybtn"
data-bs-target="#send_mail_reply">Reply an Email</button>
{{-- <button type="button" class="btn btn-primary btn-hover-rise" id="send_mail_replybtn"
data-bs-target="#send_mail_reply">Reply an Email</button> --}}
</div>
</div>
</div>

2
resources/views/Admin/Pages/manage_freeu_investment/view-product/funds.blade.php
View File

@@ -153,7 +153,7 @@
</div>
<div class="col-md-6 my-3 {{dNone($fund->funds->date_as_on)}}">
<div class="veiw_detials_area">
<label> <b class='fw-bold' class='fw-bold'>date As On</b>: {{$fund->funds->date_as_on ?? 'N/A'}}</label>
<label> <b class='fw-bold' class='fw-bold'>Date As On</b>: {{$fund->funds->date_as_on ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($fund->funds->year3_return)}}">