Skip to content

Commit

Permalink
updated
Browse files Browse the repository at this point in the history
  • Loading branch information
rjbabul committed Oct 30, 2021
1 parent bb659c4 commit 94d087d
Show file tree
Hide file tree
Showing 36 changed files with 9,050 additions and 176 deletions.
44 changes: 41 additions & 3 deletions app/Http/Controllers/CustomerApprovalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
namespace App\Http\Controllers;

use App\Models\customer;

use App\Models\feedback;
use App\Models\customer_request;
use Illuminate\Http\Request;
use App\Models\admin;
use Illuminate\Support\Facades\Hash;


Expand All @@ -19,6 +21,11 @@ function customer_request(){
return view('usermanual.customer_request',$data);
}

function customer_request_manual(){
$data= ['loggedUser' =>customer_request::where('id', '=',session('loggedUser'))->first()];
return view('usermanual.customer_request_manual',$data);
}



public function process_register(Request $request){
Expand Down Expand Up @@ -50,7 +57,7 @@ public function process_register(Request $request){

function update_request_profile(Request $request){

$data= customer_request::where('id', '=',session('loggedUser'))->first();
$data= customer_request::where('id', '=',session('loggedUser'))->first();

$data->cont_no= $request->cont;
$data->post= $request->post;
Expand Down Expand Up @@ -84,10 +91,13 @@ function customer_request_process(Request $request){
$customer->Dist = $data->Dist;
$customer->post = $data->post;

$customer->lat = $data->lat;
$customer->long= $data->long;


$save=$customer->save();
$data->delete();

if($save){
return back()->with('success','Customer Added Successfully');
}
Expand All @@ -97,7 +107,7 @@ function customer_request_process(Request $request){

}

function customer_request_delete(Request $request){
function customer_delete(Request $request){

$data= customer::where('email', '=',$request->email)->first();

Expand All @@ -110,4 +120,32 @@ function customer_request_delete(Request $request){
return back()->with('fail','somthing is wrong');
}
}

function customer_request_delete(Request $request){

$data= customer_request::where('email', '=',$request->email)->first();

$delete= $data->delete();

if($delete){
return back()->with('success','Customer Removed!!!!!');
}
else{
return back()->with('fail','somthing is wrong');
}
}

function customer_request_show(Request $request){

$user = customer_request::where('email','=' , $request->email)->first();
$data= ['loggedUser' =>admin::where('id', '=',session('loggedUser'))->first()];

return view('admin.customer_request_show',$data)->with('user', $user);
}

function customer_select( ){
$data= ['loggedUser' =>admin::where('id', '=',session('loggedUser'))->first()];

return view('admin.customer_select',$data);
}
}
34 changes: 32 additions & 2 deletions app/Http/Controllers/CustomerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Http\Controllers;
use App\Models\customer;
use App\Models\map;
use App\Models\feedback;
use App\Models\customer_request;
use Illuminate\Http\Request;
Expand Down Expand Up @@ -107,9 +108,33 @@ function cardrequest(){

function complain() {
$data= ['loggedUser' =>customer::where('id', '=',session('loggedUser'))->first()];




return view('customer.complain',$data);
}

function location(){

$data= ['loggedUser' =>customer::where('id', '=',session('loggedUser'))->first()];

$d = customer::where ('id', '=', session('loggedUser'))->first();




$location= map::where('username', '=' , $d->email)->first();

$marker = map::orderBy('id')->get();

// return view('category.index', compact(['categories', 'products']));
return view('customer.buslocation', $data)->with(compact(['data','location','marker']));
//return view('customer.buslocation',$data)->with('location', $datamap);;
}




public function update_profile(Request $request){

Expand Down Expand Up @@ -219,9 +244,14 @@ public function added_customer(Request $request){



}



// MAP






}

10 changes: 10 additions & 0 deletions app/Http/Controllers/DrivermapController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;

class DrivermapController extends Controller
{
//
}
47 changes: 47 additions & 0 deletions app/Http/Controllers/mapController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;
use App\Models\customer;
use App\Models\customer_request;
use App\Models\map;
use Illuminate\Support\Facades\Hash;

class mapController extends Controller
{
public function update_customer_location(Request $request){
$data= customer_request::where('id', '=',session('loggedUser'))->first();



$mp = map::where('username','=', $data->email)->first();

if($mp) $marker = map::where('username','=', $data->email)->first();
else
$marker = new map;

$data->lat= $request->let;
$data->long= $request->long;


$marker->username= $data->email;
$marker->latitude= $request->let;
$marker->longitude=$request->long;


$save = $marker->save();
$save = $data->save();

if($save){
return back()->with('success','successfully Upadate');
}
else{
return back()->with('fail','somthing is wrong');
}


}


}
4 changes: 4 additions & 0 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,17 @@ class Kernel extends HttpKernel
'auth' => \App\Http\Middleware\Authenticate::class,
'AuthCustomer' => \App\Http\Middleware\AuthCustomer::class,
'AuthAdmin' => \App\Http\Middleware\authAdmin::class,
'AuthDriver' => \App\Http\Middleware\AuthDriver::class,
'geust' => \App\Http\Middleware\geust::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'visitors' => \App\Http\Middleware\visitors::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

];
}
11 changes: 7 additions & 4 deletions app/Http/Middleware/AuthCustomer.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@ class AuthCustomer
*/
public function handle(Request $request, Closure $next)
{
if(!session()->has('loggedUser') && ($request->path()=='home' || $request->path()=='update' || $request->path()=='complain' || $request->path()=='payment' || $request->path()=='location' || $request->path()=='recharge' || $request->path()=='feedback' || $request->path()=='balance' || $request->path()=='chechbalance' || $request->path()=='customer_request' )){
if(!session()->has('loggedUser') && ($request->path()=='home' || $request->path()=='update' || $request->path()=='complain' || $request->path()=='payment' || $request->path()=='location' || $request->path()=='recharge' || $request->path()=='feedback' || $request->path()=='balance' || $request->path()=='chechbalance' || $request->path()=='customer_request' || $request->path()=='customer_request' || $request->path()=='customer_request_manual' || $request->path()=='cardrequest' || $request->path()=='change_pin')){

return redirect('LoginCustomer')->with('fail','You must log in');
}
if(session()->has('loggedUser') && ($request->path()!='home' && $request->path()!='update' && $request->path()!='complain' && $request->path()!='payment' && $request->path()!='location' && $request->path()!='recharge' && $request->path()!='feedback' && $request->path()!='balance' && $request->path()!='checkbalance' && $request!='customer_request' )){

else if(session()->has('loggedUser') && ($request->path()!='home' && $request->path()!='update' &&
$request->path()!='complain' && $request->path()!='payment' && $request->path()!='location' &&
$request->path()!='recharge' && $request->path()!='feedback' && $request->path()!='balance' && $request->path()!='checkbalance' && $request!='customer_request' && $request->path()!='customer_request' && $request->path()!='customer_request_manual' && $request->path()!='cardrequest' && $request->path()!='change_pin')){

return back();
}
return $next($request);

else return $next($request);
}
}
21 changes: 21 additions & 0 deletions app/Http/Middleware/AuthDriver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

namespace App\Http\Middleware;

use Closure;
use Illuminate\Http\Request;

class AuthDriver
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
{
return $next($request);
}
}
4 changes: 2 additions & 2 deletions app/Http/Middleware/authAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ class authAdmin
*/
public function handle(Request $request, Closure $next)
{
if(!session()->has('loggedUser') && ($request->path()=='admin_profile' || $request->path()=='desboard' || $request->path()=='customer_complain' || $request->path()=='admin_feedback' || $request->path()=='admin_notification' || $request->path()=='admin_massage' || $request->path()=='request_pendin' || $request->path()=='card_rechage' || $request->path()=='customers_list' || $request->path()=='driver_list' || $request->path()=='user_profile' || $request->path()=='admin_logout' || $request->path()=='add_customer'|| $request->path()=='remove_customer' || $request->path()=='add_driver'|| $request->path()=='remove_driver' || $request->path()=='card_request' || $request->path()=='update_profile' || $request->path()=='password_reset' || $request->path()=='user_profile_driver')){
if(!session()->has('loggedUser') && ($request->path()=='admin_profile' || $request->path()=='desboard' || $request->path()=='customer_complain' || $request->path()=='admin_feedback' || $request->path()=='admin_notification' || $request->path()=='admin_massage' || $request->path()=='request_pendin' || $request->path()=='card_rechage' || $request->path()=='customers_list' || $request->path()=='driver_list' || $request->path()=='user_profile' || $request->path()=='admin_logout' || $request->path()=='add_customer'|| $request->path()=='remove_customer' || $request->path()=='add_driver'|| $request->path()=='remove_driver' || $request->path()=='card_request' || $request->path()=='update_profile' || $request->path()=='password_reset' || $request->path()=='user_profile_driver' || $request->path()=='customer_select')){

return redirect('LoginAdmin')->with('fail','You must log in');
}
if(session()->has('loggedUser') && ($request->path()!='admin_profile' && $request->path()!='desboard' && $request->path()!='customer_complain' && $request->path()!='admin_feedback' && $request->path()!='admin_notification' && $request->path()!='admin_massage' && $request->path()!='request_pendin' && $request->path()!='card_rechage' && $request->path()!='customers_list' && $request->path()!='driver_list' && $request->path()!='user_profile' && $request->path()!='admin_logout' && $request->path()!='add_customer'&& $request->path()!='remove_customer' && $request->path()!='add_driver'&& $request->path()!='remove_driver' && $request->path()!='card_request' && $request->path()!='update_profile' && $request->path()!='password_reset' && $request->path()!='user_profile_driver')){
if(session()->has('loggedUser') && ($request->path()!='admin_profile' && $request->path()!='desboard' && $request->path()!='customer_complain' && $request->path()!='admin_feedback' && $request->path()!='admin_notification' && $request->path()!='admin_massage' && $request->path()!='request_pendin' && $request->path()!='card_rechage' && $request->path()!='customers_list' && $request->path()!='driver_list' && $request->path()!='user_profile' && $request->path()!='admin_logout' && $request->path()!='add_customer'&& $request->path()!='remove_customer' && $request->path()!='add_driver'&& $request->path()!='remove_driver' && $request->path()!='card_request' && $request->path()!='update_profile' && $request->path()!='password_reset' && $request->path()!='user_profile_driver' && $request->path()!='customer_select')){
return back();
}
return $next($request);
Expand Down
24 changes: 24 additions & 0 deletions app/Http/Middleware/geust.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace App\Http\Middleware;

use Closure;
use Illuminate\Http\Request;

class geust
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
{



return $next($request);
}
}
27 changes: 27 additions & 0 deletions app/Http/Middleware/visitors.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace App\Http\Middleware;

use Closure;
use Illuminate\Http\Request;

class visitors
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
{
if(session()->has('loggedUser') && ($request->path()=='/' || $request->path()=='LoginCustomer' || $request->path()=='LoginAdmin' || $request->path()=='LoginDriver' || $request->path()=='LoginSuperadmin' || $request->path()=='contact' || $request->path()=='customer_feedback' || $request->path()=='registration' )){

return back();
}


else return $next($request);
}
}
33 changes: 33 additions & 0 deletions app/Mail/OrderShipped.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace App\Mail;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;

class OrderShipped extends Mailable
{
use Queueable, SerializesModels;

/**
* Create a new message instance.
*
* @return void
*/
public function __construct()
{
//
}

/**
* Build the message.
*
* @return $this
*/
public function build()
{
return $this->view('view.name');
}
}
11 changes: 11 additions & 0 deletions app/Models/drivermap.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

class drivermap extends Model
{
use HasFactory;
}
11 changes: 11 additions & 0 deletions app/Models/map.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

class map extends Model
{
use HasFactory;
}
Loading

0 comments on commit 94d087d

Please sign in to comment.