This commit is contained in:
Ludovic CANDELLIER
2022-04-24 22:07:31 +02:00
parent 1fc860715f
commit f3e9ccaa46
11 changed files with 147 additions and 45 deletions

View File

@@ -31,12 +31,13 @@ class LoginController extends Controller
public function login(Request $request)
{
$this->validate($request, [
$credentials = $request->validate([
'email' => 'required|email',
'password' => 'required|min:8',
]);
if (Auth::guard('customer')->attempt(['email' => $request->email, 'password' => $request->password], $request->get('remember'))) {
if (Auth::guard('customer')->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate();
return redirect()->intended(route('home'));
}
return back()->withInput($request->only('email', 'remember'));

View File

@@ -46,7 +46,8 @@ class RegisterController extends Controller
public function showRegistrationForm()
{
return view('Shop.auth.register');
$data = self::init();
return view('Shop.auth.register', $data ?? []);
}
protected function create(array $data)

View File

@@ -19,7 +19,6 @@ class ResetPasswordController extends Controller
public function showResetForm(Request $request, $token = null)
{
$data = $this->initHeader();
$data['token'] = $token;
$data['email'] = $request->email;
return view('Auth.passwords.reset', $data);

View File

@@ -18,6 +18,7 @@ use App\Repositories\Partners;
use App\Repositories\Core\Upload;
use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
class Users
{
use LaratrustUserTrait;

View File

@@ -2,10 +2,40 @@
namespace App\Repositories\Shop;
use Illuminate\Support\Facades\Auth;
use App\Models\Shop\Customer;
class Customers
{
public static function getAvatar()
{
}
public static function getName()
{
$user = self::getAuth();
return $user ? $user->first_name : '';
}
public static function getAuth()
{
return Auth::guard('customer')->user();
}
public static function getId()
{
return Auth::guard('customer')->id();
}
public static function isConnected()
{
return Auth::guard('customer')->check();
}
public static function getOptions()
{
return Customer::orderBy('value', 'asc')->get()->pluck('value', 'id')->toArray();

View File

@@ -40,7 +40,7 @@ class Offers
{
$sale_channel_id = $sale_channel_id ? $sale_channel_id : SaleChannels::getDefaultID();
$offer = Offer::withPriceBySaleChannelByQuantity($sale_channel_id, $quantity)->find($id);
return number_format($offer->price_lists->first()->price_list_values->first(),2);
return $offer->price_lists->first()->price_list_values->first();
}
public static function getBasket()