A free open source IT asset/license management system
Updated observers with created_at
snipede2cdcb15b51
diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.phpindex 7c5f6b15cf..64c45ae1be 100644--- a/app/Http/Controllers/Components/ComponentsController.php+++ b/app/Http/Controllers/Components/ComponentsController.php@@ -169,10 +169,11 @@ class ComponentsController extends Controller$component->location_id = $request->input('location_id');$component->company_id = Company::getIdForCurrentUser($request->input('company_id'));$component->min_amt = $request->input('min_amt');- $component->supplier_id = $request->input('supplier_id');$component->serial = $request->input('serial');- $component->purchase_date = $request->input('purchase_date');- // purchase_cost is create-only. Edits go through Orders.+ // supplier_id, purchase_date, purchase_cost are create-only on+ // the parent. Post-create acquisitions live as Orders ++ // OrderItems, so the edit form drops them and the controller+ // stops overwriting the parent values.$component->notes = $request->input('notes');$component = $request->handleImages($component);diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.phpindex c9d00bfa54..32e14bbef8 100644--- a/app/Http/Controllers/Consumables/ConsumablesController.php+++ b/app/Http/Controllers/Consumables/ConsumablesController.php@@ -177,11 +177,12 @@ class ConsumablesController extends Controller$consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));$consumable->min_amt = $request->input('min_amt');$consumable->manufacturer_id = $request->input('manufacturer_id');- $consumable->supplier_id = $request->input('supplier_id');$consumable->model_number = $request->input('model_number');$consumable->item_no = $request->input('item_no');- $consumable->purchase_date = $request->input('purchase_date');- // purchase_cost is create-only. Edits go through Orders.+ // supplier_id, purchase_date, purchase_cost are create-only on+ // the parent. Post-create acquisitions live as Orders ++ // OrderItems, so the edit form drops them and the controller+ // stops overwriting the parent values.$consumable->notes = $request->input('notes');$consumable = $request->handleImages($consumable);diff --git a/app/Observers/AccessoryObserver.php b/app/Observers/AccessoryObserver.phpindex 46e829c9cf..9a719e065b 100644--- a/app/Observers/AccessoryObserver.php+++ b/app/Observers/AccessoryObserver.php@@ -65,22 +65,25 @@ class AccessoryObserver? $accessory->location->currency: Setting::getSettings()?->default_currency;- $order = Order::create([+ $order = new Order(['order_number' => null,'supplier_id' => $accessory->supplier_id,'company_id' => $accessory->company_id,'purchase_date' => $accessory->purchase_date,'currency' => $currency,- 'created_by' => $accessory->created_by ?? auth()->id(),]);+ $order->created_by = $accessory->created_by ?? auth()->id();+ $order->save();- $orderItem = OrderItem::create([+ $orderItem = new OrderItem(['order_id' => $order->id,'item_type' => Accessory::class,'item_id' => $accessory->id,'qty' => $qty,'price' => $accessory->purchase_cost,]);+ $orderItem->created_by = $accessory->created_by ?? auth()->id();+ $orderItem->save();$logAction = new Actionlog;$logAction->item_type = Accessory::class;diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.phpindex 8792abaef4..67b99a416a 100644--- a/app/Observers/AssetObserver.php+++ b/app/Observers/AssetObserver.php@@ -127,8 +127,8 @@ class AssetObserverif (! $existingLine) {$orderNumber = trim((string) ($asset->order_number ?? '')) ?: null;- $order = $orderNumber !== null- ? Order::firstOrCreate(+ if ($orderNumber !== null) {+ $order = Order::firstOrNew(['order_number' => $orderNumber,'supplier_id' => $asset->supplier_id,@@ -136,24 +136,32 @@ class AssetObserver],['purchase_date' => $asset->purchase_date,- 'created_by' => auth()->id(),],- )- : Order::create([+ );+ if (! $order->exists) {+ $order->created_by = auth()->id();+ $order->save();+ }+ } else {+ $order = new Order(['order_number' => null,'supplier_id' => $asset->supplier_id,'company_id' => $asset->company_id,'purchase_date' => $asset->purchase_date,- 'created_by' => auth()->id(),]);+ $order->created_by = auth()->id();+ $order->save();+ }- OrderItem::create([+ $orderItem = new OrderItem(['order_id' => $order->id,'item_type' => Asset::class,'item_id' => $asset->id,'qty' => 1,'price' => $asset->purchase_cost,]);+ $orderItem->created_by = $asset->created_by ?? auth()->id();+ $orderItem->save();}}diff --git a/app/Observers/ComponentObserver.php b/app/Observers/ComponentObserver.phpindex 4d370e91ef..251a511230 100644--- a/app/Observers/ComponentObserver.php+++ b/app/Observers/ComponentObserver.php@@ -65,22 +65,25 @@ class ComponentObserver? $component->location->currency: Setting::getSettings()?->default_currency;- $order = Order::create([+ $order = new Order(['order_number' => null,'supplier_id' => $component->supplier_id,'company_id' => $component->company_id,'purchase_date' => $component->purchase_date,'currency' => $currency,- 'created_by' => $component->created_by ?? auth()->id(),]);+ $order->created_by = $component->created_by ?? auth()->id();+ $order->save();- $orderItem = OrderItem::create([+ $orderItem = new OrderItem(['order_id' => $order->id,'item_type' => Component::class,'item_id' => $component->id,'qty' => $qty,'price' => $component->purchase_cost,]);+ $orderItem->created_by = $component->created_by ?? auth()->id();+ $orderItem->save();$logAction = new Actionlog;$logAction->item_type = Component::class;diff --git a/app/Observers/ConsumableObserver.php b/app/Observers/ConsumableObserver.phpindex 993f99cd4b..b9916093b6 100644--- a/app/Observers/ConsumableObserver.php+++ b/app/Observers/ConsumableObserver.php@@ -63,22 +63,25 @@ class ConsumableObserver? $consumable->location->currency: Setting::getSettings()?->default_currency;- $order = Order::create([+ $order = new Order(['order_number' => null,'supplier_id' => $consumable->supplier_id,'company_id' => $consumable->company_id,'purchase_date' => $consumable->purchase_date,'currency' => $currency,- 'created_by' => $consumable->created_by ?? auth()->id(),]);+ $order->created_by = $consumable->created_by ?? auth()->id();+ $order->save();- $orderItem = OrderItem::create([+ $orderItem = new OrderItem(['order_id' => $order->id,'item_type' => Consumable::class,'item_id' => $consumable->id,'qty' => $qty,'price' => $consumable->purchase_cost,]);+ $orderItem->created_by = $consumable->created_by ?? auth()->id();+ $orderItem->save();$logAction = new Actionlog;$logAction->item_type = Consumable::class;