gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

13-05-2026 Waren Wirtschaft

Browse source
This commit is contained in:
Kevin Adametz 2026-05-13 18:09:20 +02:00
parent 9ce711d6b2
commit ca3eb663fe
40 changed files with 1000 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/Http/Requests/Inventory/ReceiveStockEntryRequest.php
View file

@ -3,6 +3,7 @@
namespace App\Http\Requests\Inventory;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class ReceiveStockEntryRequest extends FormRequest
{
@ -31,4 +32,19 @@ class ReceiveStockEntryRequest extends FormRequest
'received_quantity' => reFormatNumber($this->input('received_quantity')),
]);
}
public function withValidator(Validator $validator): void
{
$validator->after(function (Validator $validator): void {
$stockEntry = $this->route('stockEntry') ?? $this->route('stock_entry');
if ($stockEntry && $stockEntry->entry_type === 'ingredient') {
if (empty($this->input('batch_number'))) {
$validator->errors()->add('batch_number', __('Bitte eine Chargennummer angeben.'));
}
if (empty($this->input('best_before'))) {
$validator->errors()->add('best_before', __('Bitte die Mindesthaltbarkeit angeben.'));
}
}
});
}
}

4
app/Http/Requests/Inventory/StorePackagingItemRequest.php
View file

@ -21,7 +21,7 @@ class StorePackagingItemRequest extends FormRequest
'packaging_material_id' => ['required', 'integer', 'exists:packaging_materials,id'],
'supplier_id' => ['nullable', 'integer', 'exists:suppliers,id'],
'name' => ['required', 'string', 'max:255'],
'category' => ['required', Rule::in(['packaging', 'shipping', 'label', 'shipping_office'])],
'category' => ['required', Rule::in(['packaging', 'shipping'])],
'weight_grams' => ['nullable', 'numeric', 'min:0'],
'min_stock_alert' => ['nullable', 'integer', 'min:0'],
'url' => ['nullable', 'url', 'max:500'],
@ -34,6 +34,8 @@ class StorePackagingItemRequest extends FormRequest
{
$this->merge([
'active' => $this->boolean('active'),
'category' => trim((string) $this->input('category')),
'weight_grams' => $this->filled('weight_grams') ? reFormatNumber($this->input('weight_grams')) : null,
]);
foreach (['supplier_id', 'product_id', 'min_stock_alert'] as $key) {

25
app/Http/Requests/Inventory/StoreStockEntryRequest.php
View file

@ -19,18 +19,31 @@ class StoreStockEntryRequest extends FormRequest
public function rules(): array
{
return [
'entry_type' => ['required', Rule::in(['ingredient', 'packaging', 'label', 'shipping_office'])],
'entry_type' => ['required', Rule::in(['ingredient', 'packaging', 'shipping'])],
'ingredient_id' => ['nullable', 'integer', 'exists:ingredients,id'],
'packaging_item_id' => ['nullable', 'integer', 'exists:packaging_items,id'],
'supplier_id' => ['required', 'integer', 'exists:suppliers,id'],
'location_id' => ['required', 'integer', 'exists:locations,id'],
'ordered_at' => ['required', 'date'],
'ordered_quantity' => ['required', 'numeric', 'min:0.000001'],
'quality_id' => ['nullable', 'integer', 'exists:material_qualities,id'],
'price_per_kg' => ['nullable', 'numeric', 'min:0'],
'price_total' => ['nullable', 'numeric', 'min:0'],
];
}
/**
* @return array<string, string>
*/
public function messages(): array
{
return [
'quality_id.required' => __('Bitte eine Rohstoffqualität wählen.'),
'price_per_kg.required' => __('Bitte den Netto-Preis pro kg angeben.'),
'price_total.required' => __('Bitte den Gesamtpreis netto angeben.'),
];
}
protected function prepareForValidation(): void
{
$this->merge([
@ -48,10 +61,19 @@ class StoreStockEntryRequest extends FormRequest
if (empty($this->input('ingredient_id'))) {
$validator->errors()->add('ingredient_id', __('Bitte einen Inhaltsstoff wählen.'));
}
if (empty($this->input('quality_id'))) {
$validator->errors()->add('quality_id', __('Bitte eine Rohstoffqualität wählen.'));
}
if (! is_numeric($this->input('price_per_kg')) || (float) $this->input('price_per_kg') <= 0) {
$validator->errors()->add('price_per_kg', __('Bitte den Netto-Preis pro kg angeben.'));
}
} elseif (! empty($type)) {
if (empty($this->input('packaging_item_id'))) {
$validator->errors()->add('packaging_item_id', __('Bitte einen Verpackungsartikel wählen.'));
}
if (! is_numeric($this->input('price_total')) || (float) $this->input('price_total') <= 0) {
$validator->errors()->add('price_total', __('Bitte den Gesamtpreis netto angeben.'));
}
}
});
}
@ -66,6 +88,7 @@ class StoreStockEntryRequest extends FormRequest
$data['packaging_item_id'] = null;
} else {
$data['ingredient_id'] = null;
$data['quality_id'] = null;
}
return $data;

4
app/Http/Requests/Inventory/UpdatePackagingItemRequest.php
View file

@ -21,7 +21,7 @@ class UpdatePackagingItemRequest extends FormRequest
'packaging_material_id' => ['required', 'integer', 'exists:packaging_materials,id'],
'supplier_id' => ['nullable', 'integer', 'exists:suppliers,id'],
'name' => ['required', 'string', 'max:255'],
'category' => ['required', Rule::in(['packaging', 'shipping', 'label', 'shipping_office'])],
'category' => ['required', Rule::in(['packaging', 'shipping'])],
'weight_grams' => ['nullable', 'numeric', 'min:0'],
'min_stock_alert' => ['nullable', 'integer', 'min:0'],
'url' => ['nullable', 'url', 'max:500'],
@ -34,6 +34,8 @@ class UpdatePackagingItemRequest extends FormRequest
{
$this->merge([
'active' => $this->boolean('active'),
'category' => trim((string) $this->input('category')),
'weight_grams' => $this->filled('weight_grams') ? reFormatNumber($this->input('weight_grams')) : null,
]);
foreach (['supplier_id', 'product_id', 'min_stock_alert'] as $key) {

25
app/Http/Requests/Inventory/UpdateStockEntryRequest.php
View file

@ -19,18 +19,31 @@ class UpdateStockEntryRequest extends FormRequest
public function rules(): array
{
return [
'entry_type' => ['required', Rule::in(['ingredient', 'packaging', 'label', 'shipping_office'])],
'entry_type' => ['required', Rule::in(['ingredient', 'packaging', 'shipping'])],
'ingredient_id' => ['nullable', 'integer', 'exists:ingredients,id'],
'packaging_item_id' => ['nullable', 'integer', 'exists:packaging_items,id'],
'supplier_id' => ['required', 'integer', 'exists:suppliers,id'],
'location_id' => ['required', 'integer', 'exists:locations,id'],
'ordered_at' => ['required', 'date'],
'ordered_quantity' => ['required', 'numeric', 'min:0.000001'],
'quality_id' => ['nullable', 'integer', 'exists:material_qualities,id'],
'price_per_kg' => ['nullable', 'numeric', 'min:0'],
'price_total' => ['nullable', 'numeric', 'min:0'],
];
}
/**
* @return array<string, string>
*/
public function messages(): array
{
return [
'quality_id.required' => __('Bitte eine Rohstoffqualität wählen.'),
'price_per_kg.required' => __('Bitte den Netto-Preis pro kg angeben.'),
'price_total.required' => __('Bitte den Gesamtpreis netto angeben.'),
];
}
protected function prepareForValidation(): void
{
$this->merge([
@ -48,10 +61,19 @@ class UpdateStockEntryRequest extends FormRequest
if (empty($this->input('ingredient_id'))) {
$validator->errors()->add('ingredient_id', __('Bitte einen Inhaltsstoff wählen.'));
}
if (empty($this->input('quality_id'))) {
$validator->errors()->add('quality_id', __('Bitte eine Rohstoffqualität wählen.'));
}
if (! is_numeric($this->input('price_per_kg')) || (float) $this->input('price_per_kg') <= 0) {
$validator->errors()->add('price_per_kg', __('Bitte den Netto-Preis pro kg angeben.'));
}
} elseif (! empty($type)) {
if (empty($this->input('packaging_item_id'))) {
$validator->errors()->add('packaging_item_id', __('Bitte einen Verpackungsartikel wählen.'));
}
if (! is_numeric($this->input('price_total')) || (float) $this->input('price_total') <= 0) {
$validator->errors()->add('price_total', __('Bitte den Gesamtpreis netto angeben.'));
}
}
});
}
@ -66,6 +88,7 @@ class UpdateStockEntryRequest extends FormRequest
$data['packaging_item_id'] = null;
} else {
$data['ingredient_id'] = null;
$data['quality_id'] = null;
}
return $data;