jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restart

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-11-11 13:05:40 +01:00
parent f89acd9399
commit 7df2421373
104 changed files with 1212 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Shop/Auth/ConfirmPasswordController.php → app/Http/Controllers/Admin/Auth/ConfirmPasswordController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Shop\Auth;
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
@@ -26,7 +26,7 @@ class ConfirmPasswordController extends Controller
*
* @var string
*/
protected $redirectTo = '';
protected $redirectTo = '/admin';
/**
* Create a new controller instance.

38
app/Http/Controllers/Admin/Auth/ForgotPasswordController.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset emails and
| includes a trait which assists in sending these notifications from
| your application to your users. Feel free to explore this trait.
|
*/
use SendsPasswordResetEmails;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function showLinkRequestForm()
{
$data = \App\Repositories\Config::init();
return view('auth.passwords.email', $data);
}
}

35
app/Http/Controllers/Admin/Auth/LoginController.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
class LoginController extends Controller
{
use AuthenticatesUsers;
protected $redirectTo = '/admin';
public function __construct()
{
$this->middleware('guest')->except('logout');
$this->middleware('guest:web')->except('logout');
}
public function showLoginForm()
{
return view('auth.login');
}
public function authenticated(Request $request, $user)
{
return redirect()->intended($this->redirectPath());
}
public function username()
{
return 'username';
}
}

2
app/Http/Controllers/Auth/PasswordSecurityController.php → app/Http/Controllers/Admin/Auth/PasswordSecurityController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Auth;
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use App\User;

76
app/Http/Controllers/Admin/Auth/RegisterController.php Normal file
View File

@@ -0,0 +1,76 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/
use RegistersUsers;
/**
* Where to redirect users after registration.
*
* @var string
*/
protected $redirectTo = '/admin';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make(
$data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]
);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\User
*/
protected function create(array $data)
{
return User::create(
[
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password']),
]
);
}
}

47
app/Http/Controllers/Admin/Auth/ResetPasswordController.php Normal file
View File

@@ -0,0 +1,47 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset requests
| and uses a simple trait to include this behavior. You're free to
| explore this trait and override any methods you wish to tweak.
|
*/
use ResetsPasswords;
/**
* Where to redirect users after resetting their password.
*
* @var string
*/
protected $redirectTo = '/home';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function showResetForm(Request $request, $token = null)
{
$data['token'] = $token;
$data['email'] = $request->email;
return view('auth.passwords.reset', $data);
}
}

4
app/Http/Controllers/Shop/Auth/VerificationController.php → app/Http/Controllers/Admin/Auth/VerificationController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Shop\Auth;
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\VerifiesEmails;
@@ -25,7 +25,7 @@ class VerificationController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
protected $redirectTo = '/home';
/**
* Create a new controller instance.

20
app/Http/Controllers/Admin/Shop/OrderController.php
View File

@@ -20,12 +20,6 @@ class OrderController extends Controller
return view('Admin.Shop.Orders.create');
}
public function store(Request $request)
{
$ret = Orders::store($request->all());
return redirect()->route('Admin.Shop.Orders.index');
}
public function show($id)
{
$data = Orders::get($id);
@@ -34,14 +28,20 @@ class OrderController extends Controller
public function edit($id)
{
$data['order'] = Orders::get($id, ['customer', 'detail'])->toArray();
dump($data['order']);
exit;
$data['order'] = Orders::edit($id)->toArray();
// dump($data);
// exit;
return view('Admin.Shop.Orders.edit', $data);
}
public function store(Request $request)
{
$ret = Orders::store($request->all());
return redirect()->route('Admin.Shop.Orders.index');
}
public function delete($id)
{
return Orders::destroy($id);
return Orders::delete($id);
}
}

31
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -3,36 +3,27 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
class ForgotPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset emails and
| includes a trait which assists in sending these notifications from
| your application to your users. Feel free to explore this trait.
|
*/
use SendsPasswordResetEmails;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
protected function guard()
{
$this->middleware('guest');
return Auth::guard('customer');
}
public function broker()
{
return Password::broker('customers');
}
public function showLinkRequestForm()
{
$data = \App\Repositories\Config::init();
return view('auth.passwords.email', $data);
return view('Shop.auth.passwords.email');
}
}

34
app/Http/Controllers/Auth/LoginController.php
View File

@@ -10,26 +10,48 @@ use Illuminate\Http\Request;
class LoginController extends Controller
{
use AuthenticatesUsers;
protected $redirectTo = '/';
public function __construct()
{
$this->middleware('guest')->except('logout');
$this->middleware('guest:web')->except('logout');
// $this->middleware('guest')->except('logout');
}
protected function guard()
{
return Auth::guard('customer');
}
public function showLoginForm()
{
return view('auth.login', $data ?? []);
return view('Shop.auth.login');
}
public function authenticated(Request $request, $user)
public function login(Request $request)
{
return redirect()->intended($this->redirectPath());
$credentials = $request->validate([
'email' => 'required|email',
'password' => 'required|min:8',
]);
if ($this->guard()->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate();
return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back();
}
return back()->withInput($request->only('email', 'remember'));
}
public function logout(Request $request)
{
$sessionKey = $this->guard()->getName();
$this->guard()->logout();
$request->session()->forget($sessionKey);
return redirect()->route('home');
}
public function username()
{
return 'username';
return 'email';
}
}

115
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -2,75 +2,84 @@
namespace App\Http\Controllers\Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Carbon\Carbon;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
use Sebastienheyd\Boilerplate\Rules\Password;
use App\Models\Shop\Customer;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/
use RegistersUsers;
/**
* Where to redirect users after registration.
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
protected function guard()
{
$this->middleware('auth');
return Auth::guard('customer');
}
protected function redirectTo()
{
return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard'));
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make(
$data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]
);
return Validator::make($data, [
'last_name' => 'required|max:255',
'first_name' => 'required|max:255',
'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
'password' => ['required', 'confirmed', new Password()],
]);
}
public function showRegistrationForm()
{
return view('Shop.auth.register', $data ?? []);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\User
*/
protected function create(array $data)
{
return User::create(
[
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password']),
]
);
$user = Customer::withTrashed()->updateOrCreate(['email' => $data['email']], [
'active' => true,
'first_name' => $data['first_name'],
'last_name' => $data['last_name'],
'email' => $data['email'],
'password' => bcrypt($data['password']),
]);
return $user;
}
public function emailVerify()
{
if (Auth::user()->hasVerifiedEmail()) {
return redirect(route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard')));
}
return view('boilerplate::auth.verify-email');
}
public function emailVerifyRequest(EmailVerificationRequest $request)
{
$request->fulfill();
return redirect(route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard')));
}
public function emailSendVerification(Request $request)
{
$request->user()->sendEmailVerificationNotification();
return back()->with('message', 'Verification link sent!');
}
}

55
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -2,37 +2,19 @@
namespace App\Http\Controllers\Auth;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Illuminate\Foundation\Auth\ResetsPasswords;
use App\Rules\Password as PasswordRules;
class ResetPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset requests
| and uses a simple trait to include this behavior. You're free to
| explore this trait and override any methods you wish to tweak.
|
*/
use ResetsPasswords;
/**
* Where to redirect users after resetting their password.
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
@@ -40,8 +22,29 @@ class ResetPasswordController extends Controller
public function showResetForm(Request $request, $token = null)
{
$data['token'] = $token;
$data['email'] = $request->email;
return view('auth.passwords.reset', $data);
$token = $request->route()->parameter('token');
return view('Shop.auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email]
);
}
protected function rules()
{
return [
'token' => 'required',
'email' => 'required|email',
'password' => ['required', 'confirmed', new PasswordRules()],
];
}
public function broker()
{
return Password::broker('customers');
}
protected function guard()
{
return Auth::guard('customer');
}
}

2
app/Http/Controllers/Auth/VerificationController.php
View File

@@ -25,7 +25,7 @@ class VerificationController extends Controller
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/';
/**
* Create a new controller instance.

1
app/Http/Controllers/Shop/ArticleController.php
View File

@@ -9,7 +9,6 @@ use App\Repositories\Shop\Articles;
class ArticleController extends Controller
{
public function show($id)
{
$data['article'] = Articles::getArticleToSell($id);

29
app/Http/Controllers/Shop/Auth/ForgotPasswordController.php
View File

@@ -1,29 +0,0 @@
<?php
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
class ForgotPasswordController extends Controller
{
use SendsPasswordResetEmails;
protected function guard()
{
return Auth::guard('customer');
}
public function broker()
{
return Password::broker('customers');
}
public function showLinkRequestForm()
{
return view('Shop.auth.passwords.email');
}
}

57
app/Http/Controllers/Shop/Auth/LoginController.php
View File

@@ -1,57 +0,0 @@
<?php
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
class LoginController extends Controller
{
use AuthenticatesUsers;
protected $redirectTo = '/';
public function __construct()
{
// $this->middleware('guest')->except('logout');
}
protected function guard()
{
return Auth::guard('customer');
}
public function showLoginForm()
{
return view('Shop.auth.login');
}
public function login(Request $request)
{
$credentials = $request->validate([
'email' => 'required|email',
'password' => 'required|min:8',
]);
if ($this->guard()->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate();
return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back();
}
return back()->withInput($request->only('email', 'remember'));
}
public function logout(Request $request)
{
$sessionKey = $this->guard()->getName();
$this->guard()->logout();
$request->session()->forget($sessionKey);
return redirect()->route('home');
}
public function username()
{
return 'email';
}
}

85
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -1,85 +0,0 @@
<?php
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Carbon\Carbon;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
use Sebastienheyd\Boilerplate\Rules\Password;
use App\Models\Shop\Customer;
class RegisterController extends Controller
{
use RegistersUsers;
protected $redirectTo;
protected function guard()
{
return Auth::guard('customer');
}
protected function redirectTo()
{
return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard'));
}
protected function validator(array $data)
{
return Validator::make($data, [
'last_name' => 'required|max:255',
'first_name' => 'required|max:255',
'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
'password' => ['required', 'confirmed', new Password()],
]);
}
public function showRegistrationForm()
{
return view('Shop.auth.register', $data ?? []);
}
protected function create(array $data)
{
$user = Customer::withTrashed()->updateOrCreate(['email' => $data['email']], [
'active' => true,
'first_name' => $data['first_name'],
'last_name' => $data['last_name'],
'email' => $data['email'],
'password' => bcrypt($data['password']),
]);
return $user;
}
public function emailVerify()
{
if (Auth::user()->hasVerifiedEmail()) {
return redirect(route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard')));
}
return view('boilerplate::auth.verify-email');
}
public function emailVerifyRequest(EmailVerificationRequest $request)
{
$request->fulfill();
return redirect(route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard')));
}
public function emailSendVerification(Request $request)
{
$request->user()->sendEmailVerificationNotification();
return back()->with('message', 'Verification link sent!');
}
}

50
app/Http/Controllers/Shop/Auth/ResetPasswordController.php
View File

@@ -1,50 +0,0 @@
<?php
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Illuminate\Foundation\Auth\ResetsPasswords;
use App\Rules\Password as PasswordRules;
class ResetPasswordController extends Controller
{
use ResetsPasswords;
protected $redirectTo = '/';
public function __construct()
{
$this->middleware('guest');
}
public function showResetForm(Request $request, $token = null)
{
$token = $request->route()->parameter('token');
return view('Shop.auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email]
);
}
protected function rules()
{
return [
'token' => 'required',
'email' => 'required|email',
'password' => ['required', 'confirmed', new PasswordRules()],
];
}
public function broker()
{
return Password::broker('customers');
}
protected function guard()
{
return Auth::guard('customer');
}
}

3
app/Http/Controllers/Shop/CustomerController.php
View File

@@ -11,6 +11,7 @@ class CustomerController extends Controller
{
public function profile($id = false)
{
return view('Shop.Customers.profile');
$data = Customers::editProfile($id);
return view('Shop.Customers.profile', $data);
}
}

12
app/Http/Controllers/Shop/OrderController.php
View File

@@ -9,6 +9,7 @@ use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\Paybox;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\SaleChannels;
@@ -30,13 +31,13 @@ class OrderController extends Controller
{
$data = $request->all();
$data['customer_id'] = Customers::getId();
$data['basket'] = Baskets::getBasketSummary();
dump($data);
exit;
$data['sale_channel_id'] = $data['sale_channel_id'] ?? SaleChannels::getDefaultID();
$data['basket'] = Baskets::getBasketSummary($data['sale_channel_id']);
$order = Orders::saveOrder($data);
if ($order) {
if ($data['payment'] == '1') {
return redirect()->route('Shop.Payments.online');
if ($data['payment_type'] == '1') {
return Paybox::makeAuthorizationRequest($data['basket']['total_shipped']);
// return redirect()->route('Shop.Payments.online');
} else {
return redirect()->route('Shop.Orders.confirmed');
}
@@ -47,6 +48,7 @@ class OrderController extends Controller
public function confirmed()
{
ShopCart::clear();
return view('Shop.Orders.confirmed');
}
}

18
app/Http/Controllers/Shop/OrderPaymentController.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\Paybox;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\SaleChannels;
class OrderPaymentController extends Controller
{
}

36
app/Http/Controllers/Shop/PayboxController.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class PayboxController extends Controller
{
public function accepted()
{
return view('paybox.accepted');
}
public function refused()
{
return view('paybox.refused');
}
public function aborted()
{
return view('paybox.aborted');
}
public function waiting()
{
return view('paybox.waiting');
}
public function process(Request $request)
{
dump($request);
return view('paybox.send');
}
}