@if(session('success'))
✓ {{ session('success') }}
@endif
@if($errors->any())
Please check the following:@foreach($errors->all() as $error)- {{ $error }}
@endforeach
@endif
diff --git a/resources/views/returns/index.blade.php b/resources/views/returns/index.blade.php
new file mode 100644
index 0000000..559b2a2
--- /dev/null
+++ b/resources/views/returns/index.blade.php
@@ -0,0 +1,87 @@
+@extends('layouts.app')
+@section('title', 'Return uniforms - UniformFlow')
+@section('page-heading', 'Return uniforms')
+@section('content')
+
Normal returnsReturn an issued uniform.
Record full or partial returns without completing an employee exit handover.
+
+
+
+
Return register
Return history
| Date | Employee | Uniform | Size | Qty | Condition | Stock effect |
|---|
+@forelse($returns as $return)| {{ $return->returned_at->format('d M Y') }} | {{ $return->employee->name }}{{ $return->employee->employee_no }} | {{ $return->issue->variant->item->name }} | {{ $return->issue->variant->size }} | {{ $return->quantity }} | {{ ucfirst($return->condition) }} | {{ $return->condition === 'reusable' ? '+'.$return->quantity.' available' : 'No change' }} |
@empty| Normal uniform returns will appear here. |
@endforelse
+
+
+
+@endsection
diff --git a/resources/views/stock-details/index.blade.php b/resources/views/stock-details/index.blade.php
new file mode 100644
index 0000000..539e331
--- /dev/null
+++ b/resources/views/stock-details/index.blade.php
@@ -0,0 +1,44 @@
+@extends('layouts.app')
+@section('title', 'Stock details - UniformFlow')
+@section('page-heading', 'Stock details')
+@section('content')
+
Uniform catalogueStock specifications & views.
Maintain materials, colors, care details, and front/back reference images for every uniform type.
View stock balances
+
+
+
+ @if(request('search')){{ $items->total() }} result(s) for “{{ request('search') }}”@endif
+
+
+
+@forelse($items as $item)
+
+ {{ strtoupper(substr($item->name, 0, 2)) }}
{{ $item->code }}
{{ $item->name }}
{{ $item->variants->count() }} sizes / {{ $item->variants->sum('quantity') }} available units{{ $item->material ? 'Documented' : 'Needs details' }}
+@empty
{{ request('search') ? 'No stock details match your search.' : 'Add a uniform type in Inventory before entering stock details.' }}
@endforelse
+
+@if($items->hasPages())@endif
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 8871da2..ab34a10 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,8 @@ use App\Http\Controllers\EmployeeController;
use App\Http\Controllers\HandoverController;
use App\Http\Controllers\InventoryController;
use App\Http\Controllers\IssueController;
+use App\Http\Controllers\ReturnController;
+use App\Http\Controllers\StockDetailController;
use Illuminate\Support\Facades\Route;
Route::middleware('guest')->group(function () {
@@ -22,8 +24,15 @@ Route::middleware(['auth', 'admin'])->group(function () {
Route::get('/inventory', [InventoryController::class, 'index'])->name('inventory.index');
Route::post('/inventory/items', [InventoryController::class, 'storeItem'])->name('inventory.items.store');
Route::post('/inventory/restock', [InventoryController::class, 'restock'])->name('inventory.restock');
+ Route::get('/stock-details', [StockDetailController::class, 'index'])->name('stock-details.index');
+ Route::put('/stock-details/{uniformItem}', [StockDetailController::class, 'update'])->name('stock-details.update');
Route::get('/issues', [IssueController::class, 'index'])->name('issues.index');
+ Route::get('/issues/lookups/employees', [IssueController::class, 'employeeLookup'])->middleware('throttle:120,1')->name('issues.lookups.employees');
+ Route::get('/issues/lookups/variants', [IssueController::class, 'variantLookup'])->middleware('throttle:120,1')->name('issues.lookups.variants');
Route::post('/issues', [IssueController::class, 'store'])->name('issues.store');
+ Route::get('/returns', [ReturnController::class, 'index'])->name('returns.index');
+ Route::get('/returns/lookups/issues', [ReturnController::class, 'issueLookup'])->middleware('throttle:120,1')->name('returns.lookups.issues');
+ Route::post('/returns', [ReturnController::class, 'store'])->name('returns.store');
Route::get('/handovers', [HandoverController::class, 'index'])->name('handovers.index');
Route::get('/handovers/{employee}/create', [HandoverController::class, 'create'])->name('handovers.create');
Route::post('/handovers/{employee}', [HandoverController::class, 'store'])->name('handovers.store');
diff --git a/tests/Feature/AdminAuthenticationTest.php b/tests/Feature/AdminAuthenticationTest.php
index cf887b4..eaae4e1 100644
--- a/tests/Feature/AdminAuthenticationTest.php
+++ b/tests/Feature/AdminAuthenticationTest.php
@@ -15,7 +15,8 @@ class AdminAuthenticationTest extends TestCase
$this->get('/')
->assertOk()
->assertSee('Welcome back.')
- ->assertSee('Secure administrator access');
+ ->assertSee('Secure administrator access')
+ ->assertSee('data-theme-toggle', false);
}
public function test_guests_are_redirected_to_login_from_admin_pages(): void
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index 3ab9132..06c9991 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -21,6 +21,7 @@ class ExampleTest extends TestCase
->assertSee('Admin dashboard')
->assertSee('Stock health')
->assertSee('Issued by department')
- ->assertSee('Recent activity');
+ ->assertSee('Recent activity')
+ ->assertSee('data-theme-toggle', false);
}
}
diff --git a/tests/Feature/UniformWorkflowTest.php b/tests/Feature/UniformWorkflowTest.php
index 2c5070a..139f08d 100644
--- a/tests/Feature/UniformWorkflowTest.php
+++ b/tests/Feature/UniformWorkflowTest.php
@@ -28,25 +28,28 @@ class UniformWorkflowTest extends TestCase
{
$item = UniformItem::create(['code' => 'TS-01', 'name' => 'Test Shirt']);
- return $item->variants()->create(['size' => 'M', 'quantity' => $quantity, 'reorder_level' => 2]);
+ return $item->variants()->create(['size' => 'M', 'quantity' => $quantity, 'new_quantity' => $quantity, 'unit_value' => 25, 'reorder_level' => 2]);
}
public function test_restock_increases_the_correct_size_balance(): void
{
$variant = $this->variant(3);
- $this->post(route('inventory.restock'), ['uniform_item_id' => $variant->uniform_item_id, 'stocks' => [$variant->id => 4]])->assertSessionHasNoErrors();
+ $this->post(route('inventory.restock'), ['uniform_item_id' => $variant->uniform_item_id, 'stocks' => [$variant->id => 4], 'values' => [$variant->id => 30], 'stock_category' => 'new'])->assertSessionHasNoErrors();
$this->assertSame(7, $variant->fresh()->quantity);
- $this->assertDatabaseHas('stock_movements', ['stock_variant_id' => $variant->id, 'type' => 'restock', 'quantity_change' => 4]);
+ $this->assertSame(7, $variant->fresh()->new_quantity);
+ $this->assertDatabaseHas('stock_movements', ['stock_variant_id' => $variant->id, 'type' => 'restock', 'quantity_change' => 4, 'stock_category' => 'new', 'unit_value' => 30]);
}
public function test_bulk_receiving_updates_multiple_sizes_in_one_submission(): void
{
$medium = $this->variant(3);
- $large = $medium->item->variants()->create(['size' => 'L', 'quantity' => 2, 'reorder_level' => 2]);
+ $large = $medium->item->variants()->create(['size' => 'L', 'quantity' => 2, 'new_quantity' => 2, 'reorder_level' => 2]);
$this->post(route('inventory.restock'), [
'uniform_item_id' => $medium->uniform_item_id,
'stocks' => [$medium->id => 5, $large->id => 8],
+ 'values' => [$medium->id => 32.50, $large->id => 35],
+ 'stock_category' => 'new',
'notes' => 'Delivery GRN-100',
])->assertSessionHasNoErrors();
@@ -78,6 +81,23 @@ class UniformWorkflowTest extends TestCase
$this->assertDatabaseHas('uniform_issues', ['employee_id' => $employee->id, 'stock_variant_id' => $variant->id, 'quantity' => 2, 'status' => 'issued']);
}
+ public function test_issue_lookups_search_active_employees_and_available_uniforms(): void
+ {
+ $employee = Employee::create(['employee_no' => 'WH-204', 'name' => 'Nimal Fernando', 'department' => 'Warehouse']);
+ Employee::create(['employee_no' => 'OLD-1', 'name' => 'Nimal Former', 'department' => 'Warehouse', 'status' => 'left']);
+ $variant = $this->variant(5);
+
+ $this->getJson(route('issues.lookups.employees', ['q' => 'WH-204']))
+ ->assertOk()
+ ->assertJsonCount(1)
+ ->assertJsonFragment(['id' => $employee->id, 'title' => 'Nimal Fernando']);
+
+ $this->getJson(route('issues.lookups.variants', ['q' => 'Test Shirt']))
+ ->assertOk()
+ ->assertJsonCount(1)
+ ->assertJsonFragment(['id' => $variant->id, 'title' => 'Test Shirt / Size M']);
+ }
+
public function test_issue_is_rejected_when_stock_is_insufficient(): void
{
$employee = $this->employee();
@@ -112,4 +132,68 @@ class UniformWorkflowTest extends TestCase
$this->assertSame(4, $variant->fresh()->quantity);
$this->assertSame('left', $employee->fresh()->status);
}
+
+ public function test_normal_returns_support_partial_reusable_and_damaged_items(): void
+ {
+ $employee = $this->employee();
+ $variant = $this->variant(5);
+ $this->post(route('issues.store'), ['employee_id' => $employee->id, 'stock_variant_id' => $variant->id, 'quantity' => 2, 'issued_at' => '2026-07-13']);
+ $issue = $employee->issues()->first();
+
+ $this->post(route('returns.store'), [
+ 'employee_id' => $employee->id,
+ 'uniform_issue_id' => $issue->id,
+ 'quantity' => 1,
+ 'condition' => 'reusable',
+ 'returned_at' => '2026-07-14',
+ ])->assertSessionHasNoErrors();
+
+ $this->assertSame(4, $variant->fresh()->quantity);
+ $this->assertSame(1, $variant->fresh()->returned_quantity);
+ $this->assertSame('issued', $issue->fresh()->status);
+ $this->assertSame(1, $issue->fresh()->returned_quantity);
+
+ $this->post(route('returns.store'), [
+ 'employee_id' => $employee->id,
+ 'uniform_issue_id' => $issue->id,
+ 'quantity' => 1,
+ 'condition' => 'damaged',
+ 'returned_at' => '2026-07-14',
+ ])->assertSessionHasNoErrors();
+
+ $this->assertSame(4, $variant->fresh()->quantity);
+ $this->assertSame('returned', $issue->fresh()->status);
+ $this->assertDatabaseHas('uniform_returns', ['uniform_issue_id' => $issue->id, 'condition' => 'reusable', 'quantity' => 1]);
+ $this->assertDatabaseHas('uniform_returns', ['uniform_issue_id' => $issue->id, 'condition' => 'damaged', 'quantity' => 1]);
+ }
+
+ public function test_stock_specification_details_can_be_saved(): void
+ {
+ $variant = $this->variant();
+
+ $this->put(route('stock-details.update', $variant->item), [
+ 'material' => '65% polyester, 35% cotton',
+ 'color' => 'Navy blue',
+ 'description' => 'Regular fit work shirt',
+ 'care_instructions' => 'Machine wash at 30 C',
+ ])->assertSessionHasNoErrors();
+
+ $this->assertDatabaseHas('uniform_items', [
+ 'id' => $variant->uniform_item_id,
+ 'material' => '65% polyester, 35% cotton',
+ 'color' => 'Navy blue',
+ ]);
+ }
+
+ public function test_stock_details_can_be_searched_by_name_code_material_or_color(): void
+ {
+ UniformItem::create(['code' => 'BLZ-001', 'name' => 'Executive Blazer', 'material' => 'Wool blend', 'color' => 'Charcoal']);
+ UniformItem::create(['code' => 'APN-002', 'name' => 'Kitchen Apron', 'material' => 'Cotton', 'color' => 'White']);
+
+ $this->get(route('stock-details.index', ['search' => 'Charcoal']))
+ ->assertOk()
+ ->assertSee('Executive Blazer')
+ ->assertDontSee('Kitchen Apron')
+ ->assertSee('1 result(s)');
+ }
}