malek/SpiceManagementSystem
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructure batch origins: nested entries per ingredient with Supplier/Farmer selects
Deploy / deploy (push) Successful in 14s
Details

Browse Source 
Each BatchOrigin (spice) now has multiple BatchOriginEntry rows, replacing the flat
single-supplier/farmer fields. Lieferant and Landwirt are Select fields backed by
dedicated tables with inline create support. Migration preserves existing data.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Malek TellissiandClaude Sonnet 4.6 committed 2026-09-12 20:03:05 +02:00
1 parent 400237aa5b
commit 4a98beeb45
6 files changed
+173 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Filament/User/Resources/BatchResource.php
+31 -18
View File
@@ -4,6 +4,7 @@ namespace App\Filament\User\Resources;
use App\Filament\User\Resources\BatchResource\Pages;
use App\Models\Batch;
use App\Models\Farmer;
use App\Models\Product;
use App\Models\ProductSize;
use App\Models\Recipe;
@@ -57,10 +58,7 @@ class BatchResource extends Resource
if ($recipe) {
$set('origins', $recipe->spices->map(fn ($s) => [
'spice_id' => $s->id,
'supplier_id' => null,
'origin_country' => null,
'farmer' => null,
'notes' => null,
'entries' => [['supplier_id' => null, 'origin_country' => null, 'farmer_id' => null, 'notes' => null]],
])->toArray());
}
}
@@ -94,10 +92,7 @@ class BatchResource extends Resource
if ($recipe) {
$set('origins', $recipe->spices->map(fn ($s) => [
'spice_id' => $s->id,
'supplier_id' => null,
'origin_country' => null,
'farmer' => null,
'notes' => null,
'entries' => [['supplier_id' => null, 'origin_country' => null, 'farmer_id' => null, 'notes' => null]],
])->toArray());
}
}),
@@ -133,34 +128,52 @@ class BatchResource extends Resource
->label('')
->relationship()
->schema([
Forms\Components\Select::make('spice_id')
Forms\Components\Hidden::make('spice_id'),
Forms\Components\Placeholder::make('spice_name')
->label('Rohstoff')
->options(Spice::orderBy('name')->pluck('name', 'id'))
->searchable()
->required(),
->content(fn (Get $get): string =>
Spice::find($get('spice_id'))?->name ?? '—'
)
->columnSpanFull(),
Forms\Components\Repeater::make('entries')
->label('Herkunftsangaben')
->relationship()
->schema([
Forms\Components\Select::make('supplier_id')
->label('Lieferant')
->relationship('supplier', 'name')
->options(fn () => \App\Models\Supplier::orderBy('name')->pluck('name', 'id'))
->searchable()
->preload()
->createOptionForm([
Forms\Components\TextInput::make('name')->label('Name')->required(),
])
->createOptionUsing(fn ($data) => \App\Models\Supplier::create($data)->id)
->nullable(),
Forms\Components\TextInput::make('origin_country')
->label('Herkunftsland')
->maxLength(100),
Forms\Components\TextInput::make('farmer')
->label('Landwirt / Betrieb')
->maxLength(255),
Forms\Components\Select::make('farmer_id')
->label('Landwirt')
->options(fn () => Farmer::orderBy('name')->pluck('name', 'id'))
->searchable()
->createOptionForm([
Forms\Components\TextInput::make('name')->label('Name')->required(),
])
->createOptionUsing(fn ($data) => Farmer::create($data)->id)
->nullable(),
Forms\Components\Textarea::make('notes')
->label('Notizen')
->rows(2)
->columnSpanFull(),
])
->columns(2)
->columns(3)
->addActionLabel('Eintrag hinzufügen')
->reorderable(false)
->columnSpanFull(),
])
->reorderable(false),
]),
]);
app/Filament/User/Resources/ProductResource/RelationManagers/BatchesRelationManager.php
+34 -20
View File
@@ -2,6 +2,7 @@
namespace App\Filament\User\Resources\ProductResource\RelationManagers;
use App\Models\Farmer;
use App\Models\ProductSize;
use App\Models\Recipe;
use App\Models\Spice;
@@ -60,10 +61,7 @@ class BatchesRelationManager extends RelationManager
}
$set('origins', $recipe->spices->map(fn ($s) => [
'spice_id' => $s->id,
'supplier_id' => null,
'origin_country' => null,
'farmer' => null,
'notes' => null,
'entries' => [['supplier_id' => null, 'origin_country' => null, 'farmer_id' => null, 'notes' => null]],
])->toArray());
}),
@@ -92,11 +90,11 @@ class BatchesRelationManager extends RelationManager
Forms\Components\DatePicker::make('expires_at')
->label('Mindesthaltbarkeitsdatum'),
Forms\Components\Section::make('Herkunft der Rohstoffe')->schema([
Forms\Components\Repeater::make('origins')
->label('Herkunft der Rohstoffe')
->label('')
->relationship()
->afterStateHydrated(function ($component, $record, $livewire) {
// Pre-fill from product's current recipe only when creating a new batch
if ($record?->id) {
return;
}
@@ -110,42 +108,58 @@ class BatchesRelationManager extends RelationManager
}
$component->state($recipe->spices->map(fn ($s) => [
'spice_id' => $s->id,
'supplier_id' => null,
'origin_country' => null,
'farmer' => null,
'notes' => null,
'entries' => [['supplier_id' => null, 'origin_country' => null, 'farmer_id' => null, 'notes' => null]],
])->toArray());
})
->schema([
Forms\Components\Select::make('spice_id')
Forms\Components\Hidden::make('spice_id'),
Forms\Components\Placeholder::make('spice_name')
->label('Rohstoff')
->options(Spice::orderBy('name')->pluck('name', 'id'))
->searchable()
->required(),
->content(fn (Get $get): string =>
Spice::find($get('spice_id'))?->name ?? '—'
)
->columnSpanFull(),
Forms\Components\Repeater::make('entries')
->label('Herkunftsangaben')
->relationship()
->schema([
Forms\Components\Select::make('supplier_id')
->label('Lieferant')
->relationship('supplier', 'name')
->options(fn () => \App\Models\Supplier::orderBy('name')->pluck('name', 'id'))
->searchable()
->preload()
->createOptionForm([
Forms\Components\TextInput::make('name')->label('Name')->required(),
])
->createOptionUsing(fn ($data) => \App\Models\Supplier::create($data)->id)
->nullable(),
Forms\Components\TextInput::make('origin_country')
->label('Herkunftsland')
->maxLength(100),
Forms\Components\TextInput::make('farmer')
->label('Landwirt / Betrieb')
->maxLength(255),
Forms\Components\Select::make('farmer_id')
->label('Landwirt')
->options(fn () => Farmer::orderBy('name')->pluck('name', 'id'))
->searchable()
->createOptionForm([
Forms\Components\TextInput::make('name')->label('Name')->required(),
])
->createOptionUsing(fn ($data) => Farmer::create($data)->id)
->nullable(),
Forms\Components\Textarea::make('notes')
->label('Notizen')
->rows(2)
->columnSpanFull(),
])
->columns(2)
->columns(3)
->addActionLabel('Eintrag hinzufügen')
->reorderable(false)
->columnSpanFull(),
])
->reorderable(false),
]),
]);
}
app/Models/BatchOrigin.php
+3 -3
View File
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
class BatchOrigin extends Model
{
protected $fillable = ['batch_id', 'spice_id', 'supplier_id', 'origin_country', 'farmer', 'notes'];
protected $fillable = ['batch_id', 'spice_id'];
public function batch()
{
@@ -18,8 +18,8 @@ class BatchOrigin extends Model
return $this->belongsTo(Spice::class);
}
public function supplier()
public function entries()
{
return $this->belongsTo(Supplier::class);
return $this->hasMany(BatchOriginEntry::class);
}
}
app/Models/BatchOriginEntry.php
+25
View File
@@ -0,0 +1,25 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class BatchOriginEntry extends Model
{
protected $fillable = ['batch_origin_id', 'supplier_id', 'origin_country', 'farmer_id', 'notes'];
public function batchOrigin()
{
return $this->belongsTo(BatchOrigin::class);
}
public function supplier()
{
return $this->belongsTo(Supplier::class);
}
public function farmer()
{
return $this->belongsTo(Farmer::class);
}
}
app/Models/Farmer.php
+10
View File
@@ -0,0 +1,10 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Farmer extends Model
{
protected $fillable = ['name'];
}
database/migrations/2026_09_12_220000_restructure_batch_origins.php
+70
View File
@@ -0,0 +1,70 @@
<?php
use App\Models\Farmer;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::create('farmers', function (Blueprint $table) {
$table->id();
$table->string('name');
$table->timestamps();
});
Schema::create('batch_origin_entries', function (Blueprint $table) {
$table->id();
$table->foreignId('batch_origin_id')->constrained('batch_origins')->cascadeOnDelete();
$table->foreignId('supplier_id')->nullable()->constrained('suppliers')->nullOnDelete();
$table->string('origin_country')->nullable();
$table->foreignId('farmer_id')->nullable()->constrained('farmers')->nullOnDelete();
$table->text('notes')->nullable();
$table->timestamps();
});
// Migrate existing batch_origin rows → batch_origin_entries
$existing = DB::table('batch_origins')->get();
foreach ($existing as $row) {
$farmerId = null;
if (! empty($row->farmer)) {
$farmerId = DB::table('farmers')->insertGetId([
'name' => $row->farmer,
'created_at' => now(),
'updated_at' => now(),
]);
}
DB::table('batch_origin_entries')->insert([
'batch_origin_id' => $row->id,
'supplier_id' => $row->supplier_id,
'origin_country' => $row->origin_country,
'farmer_id' => $farmerId,
'notes' => $row->notes,
'created_at' => now(),
'updated_at' => now(),
]);
}
Schema::table('batch_origins', function (Blueprint $table) {
$table->dropForeign(['supplier_id']);
$table->dropColumn(['supplier_id', 'origin_country', 'farmer', 'notes']);
});
}
public function down(): void
{
Schema::table('batch_origins', function (Blueprint $table) {
$table->foreignId('supplier_id')->nullable()->constrained('suppliers')->nullOnDelete();
$table->string('origin_country')->nullable();
$table->string('farmer')->nullable();
$table->text('notes')->nullable();
});
Schema::dropIfExists('batch_origin_entries');
Schema::dropIfExists('farmers');
}
};