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

sub-admin fixing issue

Browse Source
This commit is contained in:
Ritikesh yadav
2024-05-28 15:55:59 +05:30
parent 00438f7745
commit ecbe30e7dc
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/AdminLoginController.php
View File

@@ -26,7 +26,7 @@ class AdminLoginController extends Controller
{
$email = $request->email;
$password = $request->password;
$userPassword = User::where('email', $email)->whereIn('role', [1,2])->value('password');
$userPassword = User::where('email', $email)->where('status',true)->whereIn('role', [1,2])->value('password');
if (!$userPassword) {
return response()->json(['status' => 400, 'message' => 'Please enter registered email!']);

18
app/Http/Controllers/Admin/ManageUserProductController.php
View File

@@ -164,18 +164,15 @@ class ManageUserProductController extends Controller
// making unique custom id
$count = MonthlyUpdateMaster::get()->count();
$customID = 'JA';
$customIDLength = 6;
// for($i=0; $i<=strlen((string)$count); $i++)
// {
$customIDLength = strlen((string)$count) > 6 ? strlen((string)$count) : 6;
for($j=$customIDLength; $j>strlen((string)$count); $j--)
{
$customID .= '0';
}
$customID .= $count;
// dd($customID);
$companies = Company::active()->get();
$data = MonthlyUpdateMaster::get();
// dd($data);
// return view('Admin.Pages.manage_investors..manage_user_product.manage_user_add', compact('users','aifProductNames','freProductNames','p2pProductNames','ifaProductNames','lbfProductNames','cagaProductNames','vdProductNames','hyfProductNames','sdiProductNames','idProductNames','companies'));
return view('Admin.Pages.manage_investors.manage_user_product.manage_user_add', compact('users', 'aifProductNames', 'freProductNames', 'companies','customID','data'));
}
@@ -811,7 +808,7 @@ class ManageUserProductController extends Controller
if ($validationMessage) {
return response()->json(['status' => 400, 'message' => $validationMessage]);
}
$monthlyUpdate = MonthlyUpdateMaster::create([
$monthlyUpdate = MonthlyUpdateMaster::insertGetId([
'users_id' => $request->user_id,
'products_id' => (int)$request->product_id,
'categories' => $request->categories,
@@ -825,6 +822,15 @@ class ManageUserProductController extends Controller
'spv_details' => $request->spv_details,
]);
$checkProductCommission = Product::where('id',(int)$request->product_id)->where('commission_type','One-Time Commission')->where('commission_type','Hybrid Commission')->exists();
if($checkProductCommission)
{
// $store = MonthlyUpdateMasterCommission::insert([
// 'monthly_id' => $monthlyUpdate,
// 'monthly_id' => $monthlyUpdate,
// ]);
}
$statementReportsArray = array();
$count = 0;
if ($request->statement_reports) {

1
app/Imports/AlternativeInvestmentFundImport.php
View File

@@ -53,6 +53,7 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow
public function collection(Collection $rows)
{
Validator::make($rows->toArray(), $this->rules(), $this->customValidationMessages($rows))->validate();
// dd($rows);
foreach ($rows as $row) {
$product = Product::create([
'tables_id' => Table::AlternativeInvestmentFundTable,

2
app/Models/User.php
View File

@@ -86,7 +86,7 @@ class User extends Authenticatable implements MustVerifyEmail
public function checkRoleWithPermission($resource, $permission = null)
{
// dd(\Auth::user()->id);
$user = User::with('getAppResourcesActionLink')->where('id', \Auth::user()->id)->first();
$user = User::with('getAppResourcesActionLink')->where('id', \Auth::user()->id)->where('status',true)->first();
$sidebarSlugs = array();
foreach ($user->getAppResourcesActionLink as $userResource) {
$resourceSlug = Iam_App_Resources::find($userResource->app_resource_xid);

4
resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
View File

@@ -663,7 +663,9 @@
<span>Investor</span>
</label>
<input type="text" class="form-control form-control-solid"
name="users_id" readonly value='{{ $lead->user->name }}' />
name="user_name" readonly value='{{ $lead->user->name }}' />
<input type="text" class="form-control form-control-solid d-none"
name="users_id" readonly value='{{ $lead->user->id }}' />
{{-- <select name="users_id" id="" class="form-select">
<option value="">Select an Investor</option> --}}
{{-- @foreach ($investor as $data)

2
resources/views/Admin/sub_admin_list.blade.php
View File

@@ -175,7 +175,7 @@
<a class="action_icon">
<div class="on-off-toggle">
<input class="on-off-toggle__input is_active" type="checkbox" id="bopis{{$user->id}}" data-id="{{$user->id}}" onclick="status({{$user->id}},{{$user->status}},{{$loop->iteration}})" {{$user->status == 1 ? 'checked':''}}/>
<input class="on-off-toggle__input is_active status{{$loop->iteration}}" type="checkbox" id="bopis{{$user->id}}" data-id="{{$user->id}}" onclick="status({{$user->id}},{{$user->status}},{{$loop->iteration}})" {{$user->status == 1 ? 'checked':''}}/>
<label for="bopis{{$user->id}}" class="on-off-toggle__slider status{{$loop->iteration}}"></label>
</div>
</a>