RitikeshFreeu #1

Merged
Ritikesh.Yadav merged 6 commits from RitikeshFreeu into main 2024-07-04 07:58:11 +00:00
4 changed files with 25 additions and 21 deletions

View File

@@ -33,7 +33,7 @@ class HomeController extends Controller
// dd($this->getAllTopPickProducts()['data']->toArray());
return view('Frontend.Pages.index', [
'topPicks' => $this->getAllTopPickProducts(),
'testimonial' => Testimonial::where('is_active',true)->get(),
'testimonial' => Testimonial::where('is_active', true)->get(),
]);
}
@@ -43,15 +43,14 @@ class HomeController extends Controller
session()->forget('risk_disclosure');
$checkRiskDisclosure = $request->checked_risk_disclosure == 'true' ? Session::put('risk_disclosure', 'true') : Session::put('risk_disclosure', 'false');
// dd(Session::get('risk_disclosure'));
if(Session::get('risk_disclosure') == 'true')
{
return response()->json(['status'=>200]);
if (Session::get('risk_disclosure') == 'true') {
return response()->json(['status' => 200]);
}
}
public function getAllTopPickProducts()
{
$data['data'] = Product::getAllDetails()->where('top_pick',true)->where('products.status',1)->where('categories.status',true)->get();
$data['data'] = Product::getAllDetails()->where('top_pick', true)->where('products.status', 1)->where('categories.status', true)->get();
// dd($data['data']);
// foreach($data['data'] as $row)
// {
@@ -234,7 +233,7 @@ class HomeController extends Controller
{
$user = User::find($request->user()->id);
$count = $user->unreadNotifications->count();
return response()->json(['status'=>200,'count'=>$count]);
return response()->json(['status' => 200, 'count' => $count]);
}
public function getAllNotificationsApi(Request $request)

View File

@@ -6664,6 +6664,8 @@ ul#user_notification {
min-height: 480px;
margin-bottom: 30px;
}
.marketplace-table a.green-btn, .marketplace-table a.golden-btn, .marketplace-table a.sliver-btn {
.marketplace-table a.green-btn,
.marketplace-table a.golden-btn,
.marketplace-table a.sliver-btn {
pointer-events: none;
}
}

View File

@@ -55,7 +55,7 @@
data-contribution_amount="{{ $data->getRawOriginal('contribution_amount') }}"
data-contribution_called_amount="{{ $data->getRawOriginal('contribution_called_amount') }}"
data-contribution_uncalled_amount="{{ $data->getRawOriginal('contribution_uncalled_amount') }}"
data-date_of_initial_contribution="{{ $data->date_of_initial_contribution }}"
data-date_of_initial_contribution="{{ date('d-m-Y',strtotime($data->date_of_initial_contribution)) }}"
data-face_value_nav_per_unit="{{ $data->getRawOriginal('face_value_nav_per_unit') }}"
data-principal_capital_repaid="{{ $data->getRawOriginal('principal_capital_repaid') }}"
data-gross_income="{{ $data->getRawOriginal('gross_income') }}"
@@ -145,8 +145,8 @@
<div class="col-md-6 fv-row">
<label class="required fs-6 fw-semibold mb-2 m-2">Date Of Initial
Contribution</label>
<input type="date" class="form-control form-control-solid"
name="date_of_initial_contribution" value=""
<input type="text" class="form-control form-control-solid"
name="date_of_initial_contribution"
id="date_of_initial_contribution_update">
</div>
<div class="col-md-6 fv-row">
@@ -285,7 +285,7 @@
<div class="col-md-6 fv-row">
<label class=" fs-6 fw-semibold mb-2 m-2">Date Of Initial
Contribution</label>
<input disabled type="date" class="form-control form-control-solid"
<input disabled type="text" class="form-control form-control-solid"
name="date_of_initial_contribution" value=""
id="date_of_initial_contribution_view">
</div>
@@ -527,7 +527,6 @@
$(document).ready(function() {
$(".edit_icon").click(function() {
var id = $(this).data("id");
// Set values for input fields
$('#update_alternative_id').val(id);
$('#commitment_amount_update').val($(this).data('commitment_amount'));
@@ -560,6 +559,8 @@
// AIF View data transfer
$(document).ready(function() {
$(".view_icon").click(function() {
// var initialDate = $(this).data('date_of_initial_contribution');
// alert(initialDate);
$('#commitment_amount_view').val($(this).data('commitment_amount'));
$('#contribution_amount_view').val($(this).data('contribution_amount'));
$('#contribution_called_amount_view').val($(this).data('contribution_called_amount'));

View File

@@ -1,5 +1,7 @@
<?php
// hello testing
use App\Http\Controllers\Admin\ManageFreeUInvestments\ManageCategoriesController;
use App\Http\Controllers\Admin\ManageFreeUInvestmentController;
use App\Http\Controllers\Admin\ManageFreeUInvestments\FractionalRealEstateController as FractionalRealEstateFontendController;
@@ -174,11 +176,11 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::post('check-pin', [HomeController::class, 'checkPin']);
Route::get('get-user', [AuthController::class, 'getUser']);
Route::post("update-profile", [ProfileController::class, 'updateAPI']);
Route::post("send-email-otp", [ProfileController::class, 'sendEmailOTPApi']);
Route::post("verify-user-email-or-contact-otp", [ProfileController::class, 'verifyOtpAPI']);
Route::post("resend-otp-for-email-or-contact", [ProfileController::class, 'resendOtpForProfileUpdate']);
Route::post("verify-user-email-or-contact-otp", [ProfileController::class, 'verifyOtpAPI']);
Route::post("resend-otp-for-email-or-contact", [ProfileController::class, 'resendOtpForProfileUpdate']);
Route::post('logout', [AuthController::class, 'userLogout']);
// Route::post("update-profile", [ProfileController::class, 'updateAPI']);
Route::post("personal-information-kyc", [AccountsController::class, 'personalInformationKYC']);
@@ -225,11 +227,11 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::post("marketplace/other-products/seller-form", [DashboardController::class, 'marketplaceOPFormAPI']);
// get Companies
Route::get('get-companies',[ManageCompaniesController::class,'getCompaniesData']);
Route::get('get-companies', [ManageCompaniesController::class, 'getCompaniesData']);
// get chat
Route::get('get-unread-message-count',[ManageChatController::class,'getMessageCount']);
Route::get('read-user-message',[ManageChatController::class,'getAllMessage']);
Route::get('get-unread-message-count', [ManageChatController::class, 'getMessageCount']);
Route::get('read-user-message', [ManageChatController::class, 'getAllMessage']);
//Marketplace Buyer Form
Route::get('/buyer-form/{slug}', [MarketPlaceController::class, 'buyerFormAPI']);