changes
This commit is contained in:
@@ -13,13 +13,15 @@ use Illuminate\Support\Facades\Log;
|
||||
use Exception;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use App\Mail\Add_Subadmin;
|
||||
|
||||
class ManageSubAdminController extends Controller
|
||||
{
|
||||
public function index(){
|
||||
public function index()
|
||||
{
|
||||
$sub_admins_module = ManageModule::latest()->get();
|
||||
$sub_admins_data = IamPrincipal::where('principal_type_xid', 2)->latest()->get();
|
||||
|
||||
return view('Admin.pages.manage_users.manage_sub_admin.manage_subadmin',compact('sub_admins_data','sub_admins_module'));
|
||||
return view('Admin.pages.manage_users.manage_sub_admin.manage_subadmin', compact('sub_admins_data', 'sub_admins_module'));
|
||||
}
|
||||
|
||||
public function create()
|
||||
@@ -40,12 +42,15 @@ class ManageSubAdminController extends Controller
|
||||
*/
|
||||
try {
|
||||
|
||||
// $existingEmail = IamPrincipal::where('email_address', $request->input('sub_admin_email'))->first();
|
||||
|
||||
// if ($existingEmail) {
|
||||
// return jsonResponseWithErrorMessage(__('auth.email_already_used'), 500);
|
||||
// }
|
||||
// DB::beginTransaction();
|
||||
|
||||
|
||||
$sub_admin = new IamPrincipal();
|
||||
$sub_admin->first_name = $request->input('sub_admin_name');
|
||||
$sub_admin->last_name=$request->input('sub_admin_lname');
|
||||
$sub_admin->last_name = $request->input('sub_admin_lname');
|
||||
$sub_admin->user_name = 'sub_admin';
|
||||
$sub_admin->principal_type_xid = 2;
|
||||
$sub_admin->principal_source_xid = Auth::guard('admin')->user()->principal_source_xid;
|
||||
@@ -62,12 +67,11 @@ class ManageSubAdminController extends Controller
|
||||
$sub_admin_permission->principal_xid = $sub_admin->id;
|
||||
$sub_admin_permission->manage_modules_xid = $moduleId;
|
||||
$sub_admin_permission->save();
|
||||
|
||||
}
|
||||
|
||||
$mailData =[
|
||||
'username'=>$request->input('sub_admin_name'),
|
||||
'password'=>$request->input('password'),
|
||||
$mailData = [
|
||||
'username' => $request->input('sub_admin_name'),
|
||||
'password' => $request->input('password'),
|
||||
];
|
||||
|
||||
|
||||
@@ -188,6 +192,4 @@ class ManageSubAdminController extends Controller
|
||||
$test = ManageModuleLink::where('principal_xid', $testing_admin_id)->get('manage_modules_xid')->toArray();
|
||||
return response()->json(['success' => true, 'data' => $test]);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -35,16 +35,9 @@ class RestaurantJwtMiddleware
|
||||
$user = JWTAuth::setToken($token)->authenticate();
|
||||
|
||||
// Check if the user is of restaurant type
|
||||
Log::info("Restaurant Jwt");
|
||||
|
||||
Log::info($user);
|
||||
|
||||
if (!$user ||$user->principal_type_xid != 4) {
|
||||
return response()->json(['status' => 'error', 'status_code' => 401, 'message' => 'Unauthorized access'], 401);
|
||||
}
|
||||
Log::info("Restaurant Jwt");
|
||||
|
||||
Log::info($user->principal_type_xid);
|
||||
|
||||
Session::flash('RestToken', $token);
|
||||
} catch (JWTException $e) {
|
||||
|
||||
@@ -68,6 +68,8 @@ class RestaurantApi_Service
|
||||
'user_detail' => $userDetail,
|
||||
'restaurant_details' => $restaurantDetails,
|
||||
'is_active' => $isActive,
|
||||
'message' => "",
|
||||
|
||||
];
|
||||
|
||||
if (!$isActive) {
|
||||
|
||||
@@ -113,6 +113,7 @@ return [
|
||||
'redeem_not_allowed_yet' => 'Please wait before redeeming the next voucher.',
|
||||
'state_limit_reached' => 'You have reached the maximum limit for redeeming vouchers.',
|
||||
'restaurant_limit_reached' => 'You have reached the maximum limit for redeeming vouchers.',
|
||||
'email_already_used' => 'The email address is already in use.',
|
||||
|
||||
|
||||
];
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
height="50px" width="80px"></td>
|
||||
<td>
|
||||
@if (!is_null($redeemDetail->redeem_date))
|
||||
{{ \Carbon\Carbon::parse($redeemDetail->redeem_date)->format('d/m/y H:i:s') }}
|
||||
{{ \Carbon\Carbon::parse($redeemDetail->redeem_date)->format('m/d/y H:i:s') }}
|
||||
@else
|
||||
<span>No date</span>
|
||||
@endif
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
</div>
|
||||
<div class="info" style="display: flex;">
|
||||
<span>Date of Birth:</span>
|
||||
<span>{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('d-m-Y') }}</span>
|
||||
<span>{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('m-d-Y') }}</span>
|
||||
</div>
|
||||
<div class="info">
|
||||
<span>Phone Number:</span>
|
||||
|
||||
Reference in New Issue
Block a user