Restaurant mode Phase 2: menu depth — categories, stations, modifiers, courses
Deploy Ladill POS / deploy (push) Successful in 35s

Builds on Phase 1 with the menu structure restaurants need:
- Menu setup page (restaurant mode): categories, kitchen stations, and modifier
  groups with options (price deltas).
- Products gain category, kitchen station, default course, and attached modifier
  groups (managed on the product form).
- Ordering: the ticket groups the catalog by category and, when a product has
  modifier groups, opens a picker (respects min/max select) for options + notes +
  course before adding. Effective price = base + modifier deltas (resolved
  server-side; client prices are never trusted).
- Fire-by-course: send the whole tab or just one course to the kitchen.
- KDS: filter by station; each item shows its station, course, modifiers and notes.

Schema additive (pos_categories, pos_stations, pos_modifier_groups, pos_modifiers,
product↔group pivot, pos_sale_line_modifiers; category/station/course columns on
products and lines). PosRestaurantTest covers modifiers, course and station routing;
suite green (11 passed).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
isaacclad
2026-06-24 19:58:57 +00:00
co-authored by Claude Opus 4.8
parent d9e4b6e06e
commit 50b170b0af
21 changed files with 940 additions and 38 deletions
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Http\Controllers\Pos\Concerns\ScopesToAccount;
use App\Models\PosSale;
use App\Models\PosSaleLine;
use App\Models\PosStation;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
@@ -16,7 +17,9 @@ class KitchenController extends Controller
public function index(Request $request): View
{
return view('pos.kitchen.index');
return view('pos.kitchen.index', [
'stations' => PosStation::owned($this->ownerRef($request))->orderBy('name')->get(['id', 'name']),
]);
}
/**
@@ -29,7 +32,7 @@ class KitchenController extends Controller
$sales = PosSale::owned($owner)
->openTickets()
->where('kitchen_status', PosSale::KITCHEN_ACTIVE)
->with(['table', 'lines' => fn ($q) => $q->orderBy('position')])
->with(['table', 'lines' => fn ($q) => $q->orderBy('position')->with('modifiers', 'station')])
->orderBy('kitchen_sent_at')
->get();
@@ -57,6 +60,10 @@ class KitchenController extends Controller
'name' => $l->name,
'quantity' => $l->quantity,
'notes' => $l->notes,
'course' => $l->course,
'station' => $l->station?->name,
'station_id' => $l->station_id,
'modifiers' => $l->modifiers->map(fn ($m) => $m->name)->all(),
'state' => $l->kitchen_state,
])->all(),
];
+113
View File
@@ -0,0 +1,113 @@
<?php
namespace App\Http\Controllers\Pos;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Pos\Concerns\ScopesToAccount;
use App\Models\PosCategory;
use App\Models\PosModifier;
use App\Models\PosModifierGroup;
use App\Models\PosStation;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
class MenuController extends Controller
{
use ScopesToAccount;
public function index(Request $request): View
{
$owner = $this->ownerRef($request);
return view('pos.menu.index', [
'categories' => PosCategory::owned($owner)->orderBy('position')->orderBy('name')->get(),
'stations' => PosStation::owned($owner)->orderBy('position')->orderBy('name')->get(),
'groups' => PosModifierGroup::owned($owner)->with('modifiers')->orderBy('position')->orderBy('name')->get(),
]);
}
public function storeCategory(Request $request): RedirectResponse
{
$data = $request->validate(['name' => ['required', 'string', 'max:80']]);
PosCategory::create(['owner_ref' => $this->ownerRef($request), 'name' => $data['name']]);
return back()->with('success', 'Category added.');
}
public function destroyCategory(Request $request, PosCategory $category): RedirectResponse
{
$this->authorizeOwner($request, $category);
$category->delete();
return back()->with('success', 'Category removed.');
}
public function storeStation(Request $request): RedirectResponse
{
$data = $request->validate(['name' => ['required', 'string', 'max:80']]);
PosStation::create(['owner_ref' => $this->ownerRef($request), 'name' => $data['name']]);
return back()->with('success', 'Station added.');
}
public function destroyStation(Request $request, PosStation $station): RedirectResponse
{
$this->authorizeOwner($request, $station);
$station->delete();
return back()->with('success', 'Station removed.');
}
public function storeGroup(Request $request): RedirectResponse
{
$data = $request->validate([
'name' => ['required', 'string', 'max:80'],
'min_select' => ['nullable', 'integer', 'min:0', 'max:20'],
'max_select' => ['nullable', 'integer', 'min:0', 'max:20'],
]);
PosModifierGroup::create([
'owner_ref' => $this->ownerRef($request),
'name' => $data['name'],
'min_select' => $data['min_select'] ?? 0,
'max_select' => $data['max_select'] ?: null,
]);
return back()->with('success', 'Modifier group added.');
}
public function destroyGroup(Request $request, PosModifierGroup $group): RedirectResponse
{
$this->authorizeOwner($request, $group);
$group->delete();
return back()->with('success', 'Modifier group removed.');
}
public function storeModifier(Request $request, PosModifierGroup $group): RedirectResponse
{
$this->authorizeOwner($request, $group);
$data = $request->validate([
'name' => ['required', 'string', 'max:80'],
'price_delta' => ['nullable', 'numeric', 'min:-9999', 'max:9999'],
]);
$group->modifiers()->create([
'owner_ref' => $group->owner_ref,
'name' => $data['name'],
'price_delta_minor' => (int) round(((float) ($data['price_delta'] ?? 0)) * 100),
]);
return back()->with('success', 'Option added.');
}
public function destroyModifier(Request $request, PosModifier $modifier): RedirectResponse
{
$this->authorizeOwner($request, $modifier);
$modifier->delete();
return back()->with('success', 'Option removed.');
}
}
+58 -7
View File
@@ -4,7 +4,12 @@ namespace App\Http\Controllers\Pos;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Pos\Concerns\ScopesToAccount;
use App\Models\PosCategory;
use App\Models\PosLocation;
use App\Models\PosModifierGroup;
use App\Models\PosProduct;
use App\Models\PosSaleLine;
use App\Models\PosStation;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
@@ -16,6 +21,7 @@ class ProductController extends Controller
public function index(Request $request): View
{
$products = PosProduct::owned($this->ownerRef($request))
->with('category')
->orderBy('name')
->paginate(30)
->withQueryString();
@@ -23,20 +29,25 @@ class ProductController extends Controller
return view('pos.products.index', compact('products'));
}
public function create(): View
public function create(Request $request): View
{
return view('pos.products.create', ['product' => new PosProduct([
'currency' => config('pos.default_currency', 'GHS'),
'is_active' => true,
])]);
return view('pos.products.create', [
'product' => new PosProduct([
'currency' => config('pos.default_currency', 'GHS'),
'is_active' => true,
]),
'selectedGroups' => [],
...$this->formOptions($request),
]);
}
public function store(Request $request): RedirectResponse
{
PosProduct::create([
$product = PosProduct::create([
...$this->validated($request),
'owner_ref' => $this->ownerRef($request),
]);
$product->modifierGroups()->sync($this->groupIds($request));
return redirect()->route('pos.products.index')->with('success', 'Product added.');
}
@@ -45,13 +56,18 @@ class ProductController extends Controller
{
$this->authorizeOwner($request, $product);
return view('pos.products.edit', compact('product'));
return view('pos.products.edit', [
'product' => $product,
'selectedGroups' => $product->modifierGroups()->pluck('pos_modifier_groups.id')->all(),
...$this->formOptions($request),
]);
}
public function update(Request $request, PosProduct $product): RedirectResponse
{
$this->authorizeOwner($request, $product);
$product->update($this->validated($request));
$product->modifierGroups()->sync($this->groupIds($request));
return redirect()->route('pos.products.index')->with('success', 'Product updated.');
}
@@ -64,23 +80,58 @@ class ProductController extends Controller
return redirect()->route('pos.products.index')->with('success', 'Product removed.');
}
/** @return array<string, mixed> */
private function formOptions(Request $request): array
{
$owner = $this->ownerRef($request);
return [
'restaurant' => PosLocation::owned($owner)->where('service_style', PosLocation::STYLE_RESTAURANT)->exists(),
'categories' => PosCategory::owned($owner)->orderBy('name')->get(),
'stations' => PosStation::owned($owner)->orderBy('name')->get(),
'modifierGroups' => PosModifierGroup::owned($owner)->orderBy('name')->get(),
];
}
/** @return list<int> */
private function groupIds(Request $request): array
{
$owner = $this->ownerRef($request);
$ids = array_map('intval', (array) $request->input('modifier_group_ids', []));
return PosModifierGroup::owned($owner)->whereIn('id', $ids)->pluck('id')->all();
}
/** @return array<string, mixed> */
private function validated(Request $request): array
{
$owner = $this->ownerRef($request);
$data = $request->validate([
'name' => ['required', 'string', 'max:200'],
'sku' => ['nullable', 'string', 'max:80'],
'price' => ['required', 'numeric', 'min:0.01'],
'currency' => ['nullable', 'string', 'size:3'],
'is_active' => ['sometimes', 'boolean'],
'category_id' => ['nullable', 'integer'],
'station_id' => ['nullable', 'integer'],
'course' => ['nullable', 'in:'.implode(',', array_keys(PosSaleLine::COURSES))],
]);
$categoryId = ($data['category_id'] ?? null) && PosCategory::owned($owner)->whereKey($data['category_id'])->exists()
? (int) $data['category_id'] : null;
$stationId = ($data['station_id'] ?? null) && PosStation::owned($owner)->whereKey($data['station_id'])->exists()
? (int) $data['station_id'] : null;
return [
'name' => $data['name'],
'sku' => $data['sku'] ?? null,
'price_minor' => (int) round(((float) $data['price']) * 100),
'currency' => strtoupper($data['currency'] ?? config('pos.default_currency', 'GHS')),
'is_active' => $request->boolean('is_active', true),
'category_id' => $categoryId,
'station_id' => $stationId,
'course' => $data['course'] ?? null,
];
}
}
+70 -7
View File
@@ -58,11 +58,29 @@ class TicketController extends Controller
$owner = $this->ownerRef($request);
$sale->load('lines', 'table');
$products = PosProduct::owned($owner)->active()->orderBy('name')->get();
$products = PosProduct::owned($owner)->active()
->with(['category', 'modifierGroups.modifiers'])
->orderBy('name')->get();
return view('pos.tickets.show', [
'sale' => $sale,
'products' => $products,
'products' => $products->map(fn (PosProduct $p) => [
'id' => $p->id,
'name' => $p->name,
'price_minor' => $p->price_minor,
'category' => $p->category?->name,
'modifier_groups' => $p->modifierGroups->map(fn ($g) => [
'id' => $g->id,
'name' => $g->name,
'min' => $g->min_select,
'max' => $g->max_select,
'modifiers' => $g->modifiers->map(fn ($m) => [
'id' => $m->id, 'name' => $m->name, 'price_delta_minor' => $m->price_delta_minor,
])->values()->all(),
])->values()->all(),
])->values()->all(),
'categories' => $products->pluck('category.name')->filter()->unique()->values()->all(),
'courses' => PosSaleLine::COURSES,
'lines' => $this->lineData($sale),
]);
}
@@ -73,14 +91,53 @@ class TicketController extends Controller
$data = $request->validate([
'product_id' => ['nullable', 'integer'],
'name' => ['required', 'string', 'max:200'],
'unit_price_minor' => ['required', 'integer', 'min:1'],
'name' => ['nullable', 'string', 'max:200'],
'unit_price_minor' => ['nullable', 'integer', 'min:1'],
'quantity' => ['nullable', 'integer', 'min:1', 'max:999'],
'notes' => ['nullable', 'string', 'max:200'],
'course' => ['nullable', 'in:'.implode(',', array_keys(PosSaleLine::COURSES))],
'modifier_ids' => ['nullable', 'array'],
'modifier_ids.*' => ['integer'],
]);
$payload = [
'quantity' => $data['quantity'] ?? 1,
'notes' => $data['notes'] ?? null,
'course' => $data['course'] ?? null,
];
if (! empty($data['product_id'])) {
$product = PosProduct::owned($this->ownerRef($request))
->with('modifierGroups.modifiers')
->find($data['product_id']);
if (! $product) {
return response()->json(['message' => 'Unknown product.'], 422);
}
// Only modifiers that belong to this product's groups count.
$allowed = $product->modifierGroups->flatMap->modifiers->keyBy('id');
$chosen = collect($data['modifier_ids'] ?? [])
->map(fn ($id) => $allowed->get((int) $id))
->filter()
->values();
$payload['product_id'] = $product->id;
$payload['name'] = $product->name;
$payload['station_id'] = $product->station_id;
$payload['course'] = $payload['course'] ?? $product->course;
$payload['unit_price_minor'] = max(1, $product->price_minor + (int) $chosen->sum('price_delta_minor'));
$payload['modifiers'] = $chosen->map(fn ($m) => [
'modifier_id' => $m->id, 'name' => $m->name, 'price_delta_minor' => $m->price_delta_minor,
])->all();
} else {
// Custom (open-price) line.
$payload['name'] = (string) ($data['name'] ?? '');
$payload['unit_price_minor'] = (int) ($data['unit_price_minor'] ?? 0);
}
try {
$this->sales->addLine($sale, $data);
$this->sales->addLine($sale, $payload);
} catch (RuntimeException $e) {
return response()->json(['message' => $e->getMessage()], 422);
}
@@ -117,7 +174,11 @@ class TicketController extends Controller
{
$this->authorizeOpen($request, $sale);
$fired = $this->sales->sendToKitchen($sale);
$data = $request->validate([
'course' => ['nullable', 'in:'.implode(',', array_keys(PosSaleLine::COURSES))],
]);
$fired = $this->sales->sendToKitchen($sale, $data['course'] ?? null);
$sale->refresh();
return response()->json([
@@ -189,7 +250,7 @@ class TicketController extends Controller
/** @return list<array<string,mixed>> */
private function lineData(PosSale $sale): array
{
return $sale->lines()->orderBy('position')->get()->map(fn (PosSaleLine $l) => [
return $sale->lines()->with('modifiers')->orderBy('position')->get()->map(fn (PosSaleLine $l) => [
'id' => $l->id,
'product_id' => $l->product_id,
'name' => $l->name,
@@ -198,6 +259,8 @@ class TicketController extends Controller
'line_total_minor' => $l->line_total_minor,
'kitchen_state' => $l->kitchen_state,
'notes' => $l->notes,
'course' => $l->course,
'modifiers' => $l->modifiers->map(fn ($m) => $m->name)->all(),
'fired' => $l->kitchen_state !== PosSaleLine::KITCHEN_NEW,
])->all();
}