feat: shop customer accounts (register/login + order history)
Schema: - shop_customers (company_id, name, phone unique-per-tenant, email, password, client_id auto-linked, last_login_at) - online_orders.shop_customer_id nullable FK Auth: - New 'shop' guard (session driver, shop_customers provider) in config/auth.php - ShopCustomer Authenticatable with hashed password cast and BelongsToTenant global scope — login attempts naturally scoped to current tenant subdomain Flow: - ShopAuthController: register / login / logout / account - Register auto-links to existing Client by phone match - /shop/account: order history (only the logged customer's orders) + profile - Checkout prefills name/phone/email from logged customer + sets shop_customer_id (and client_id from auto-link) on the placed order - Layout nav switches between Login/Register and "👤 Name + Ieșire" Tests (8 new): - register creates customer + auto-login - register auto-links existing Client by phone - duplicate phone rejected - login validates credentials - /account requires auth (redirects to /shop/login) - /account lists only the logged customer's orders - checkout attaches shop_customer_id - customers tenant-isolated Full suite: 117 passed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,126 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Tenant\Client;
|
||||
use App\Models\Tenant\ShopCustomer;
|
||||
use App\Tenancy\TenantManager;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
class ShopAuthController extends Controller
|
||||
{
|
||||
private function tenantOrFail()
|
||||
{
|
||||
$tenant = app(TenantManager::class)->current();
|
||||
if (! $tenant || ! data_get($tenant->settings, 'shop.enabled')) {
|
||||
throw new NotFoundHttpException('Magazinul online nu este activ.');
|
||||
}
|
||||
return $tenant;
|
||||
}
|
||||
|
||||
public function showRegister()
|
||||
{
|
||||
$tenant = $this->tenantOrFail();
|
||||
if (Auth::guard('shop')->check()) return redirect('/shop/account');
|
||||
return view('shop.auth.register', ['tenant' => $tenant, 'cartCount' => $this->cartCount()]);
|
||||
}
|
||||
|
||||
public function register(Request $request)
|
||||
{
|
||||
$tenant = $this->tenantOrFail();
|
||||
$data = $request->validate([
|
||||
'name' => 'required|string|max:160',
|
||||
'phone' => 'required|string|max:40',
|
||||
'email' => 'nullable|email|max:160',
|
||||
'password' => 'required|string|min:6|confirmed',
|
||||
]);
|
||||
|
||||
// Unique per tenant (handled by composite index, but check for nicer error).
|
||||
if (ShopCustomer::where('phone', $data['phone'])->exists()) {
|
||||
return back()->withErrors(['phone' => 'Există deja un cont cu acest telefon.'])->withInput();
|
||||
}
|
||||
|
||||
// Auto-link to existing Client by phone if present.
|
||||
$client = Client::where('phone', $data['phone'])->first();
|
||||
|
||||
$customer = ShopCustomer::create([
|
||||
'client_id' => $client?->id,
|
||||
'name' => $data['name'],
|
||||
'phone' => $data['phone'],
|
||||
'email' => $data['email'] ?? null,
|
||||
'password' => $data['password'], // hashed by cast
|
||||
]);
|
||||
|
||||
event(new Registered($customer));
|
||||
Auth::guard('shop')->login($customer, remember: true);
|
||||
$customer->forceFill(['last_login_at' => now()])->save();
|
||||
|
||||
return redirect('/shop/account');
|
||||
}
|
||||
|
||||
public function showLogin()
|
||||
{
|
||||
$tenant = $this->tenantOrFail();
|
||||
if (Auth::guard('shop')->check()) return redirect('/shop/account');
|
||||
return view('shop.auth.login', ['tenant' => $tenant, 'cartCount' => $this->cartCount()]);
|
||||
}
|
||||
|
||||
public function login(Request $request)
|
||||
{
|
||||
$tenant = $this->tenantOrFail();
|
||||
$data = $request->validate([
|
||||
'phone' => 'required|string|max:40',
|
||||
'password' => 'required|string',
|
||||
]);
|
||||
|
||||
$ok = Auth::guard('shop')->attempt(
|
||||
['phone' => $data['phone'], 'password' => $data['password']],
|
||||
remember: true
|
||||
);
|
||||
if (! $ok) {
|
||||
return back()->withErrors(['phone' => 'Telefon sau parolă incorecte.'])->withInput();
|
||||
}
|
||||
|
||||
$request->session()->regenerate();
|
||||
Auth::guard('shop')->user()?->forceFill(['last_login_at' => now()])->save();
|
||||
return redirect()->intended('/shop/account');
|
||||
}
|
||||
|
||||
public function logout(Request $request)
|
||||
{
|
||||
Auth::guard('shop')->logout();
|
||||
$request->session()->invalidate();
|
||||
$request->session()->regenerateToken();
|
||||
return redirect('/shop');
|
||||
}
|
||||
|
||||
public function account()
|
||||
{
|
||||
$tenant = $this->tenantOrFail();
|
||||
$customer = Auth::guard('shop')->user();
|
||||
if (! $customer) return redirect('/shop/login');
|
||||
|
||||
$orders = $customer->orders()
|
||||
->latest('created_at')
|
||||
->limit(50)
|
||||
->get();
|
||||
|
||||
return view('shop.account', [
|
||||
'tenant' => $tenant,
|
||||
'customer' => $customer,
|
||||
'orders' => $orders,
|
||||
'cartCount' => $this->cartCount(),
|
||||
]);
|
||||
}
|
||||
|
||||
private function cartCount(): int
|
||||
{
|
||||
$tenant = app(TenantManager::class)->current();
|
||||
$cart = (array) session('shop_cart_' . ($tenant?->id ?? '0'), []);
|
||||
return (int) collect($cart)->sum('qty');
|
||||
}
|
||||
}
|
||||
@@ -155,11 +155,13 @@ class ShopController extends Controller
|
||||
if (empty($cart)) return redirect('/shop');
|
||||
|
||||
$subtotal = collect($cart)->sum(fn ($i) => $i['price'] * $i['qty']);
|
||||
$customer = \Illuminate\Support\Facades\Auth::guard('shop')->user();
|
||||
|
||||
return view('shop.checkout', [
|
||||
'tenant' => $tenant,
|
||||
'cart' => $cart,
|
||||
'subtotal' => $subtotal,
|
||||
'customer' => $customer,
|
||||
'deliveryOptions' => (array) data_get($tenant->settings, 'shop.delivery_methods', ['pickup']),
|
||||
'cartCount' => $this->cartCount(),
|
||||
]);
|
||||
@@ -188,9 +190,13 @@ class ShopController extends Controller
|
||||
$deliveryFee = ($freeOver > 0 && $subtotal >= $freeOver) ? 0.0 : $fee;
|
||||
}
|
||||
|
||||
$order = DB::transaction(function () use ($tenant, $cart, $data, $deliveryFee) {
|
||||
$shopCustomer = \Illuminate\Support\Facades\Auth::guard('shop')->user();
|
||||
|
||||
$order = DB::transaction(function () use ($tenant, $cart, $data, $deliveryFee, $shopCustomer) {
|
||||
$order = OnlineOrder::create([
|
||||
'number' => OnlineOrder::generateNumber($tenant->id),
|
||||
'shop_customer_id' => $shopCustomer?->id,
|
||||
'client_id' => $shopCustomer?->client_id,
|
||||
'customer_name' => $data['customer_name'],
|
||||
'customer_phone' => $data['customer_phone'],
|
||||
'customer_email' => $data['customer_email'] ?? null,
|
||||
|
||||
Reference in New Issue
Block a user