A free open source IT asset/license management system
Handle last order defaults in the controllers
snipedbe942e68c16
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.phpindex 53ecdd748f..45636b17da 100755--- a/app/Http/Controllers/Accessories/AccessoriesController.php+++ b/app/Http/Controllers/Accessories/AccessoriesController.php@@ -76,13 +76,14 @@ class AccessoriesController extends Controller// (after save) with the form-supplied order_number / currency.$accessory->manufacturer_id = request('manufacturer_id');$accessory->model_number = request('model_number');- $accessory->purchase_date = request('purchase_date');- $accessory->purchase_cost = request('purchase_cost');$accessory->qty = request('qty');$accessory->created_by = auth()->id();- $accessory->supplier_id = request('supplier_id');$accessory->notes = request('notes');$accessory->requestable = request('requestable', 0);+ // Seed the template supplier from the initial-acquisition+ // supplier on the create form so newly-created items already+ // have a "typical" supplier pre-populated. Editable afterwards.+ $accessory->default_supplier_id = request('default_supplier_id', request('supplier_id'));if ($request->has('use_cloned_image')) {$cloned_model_img = Accessory::select('image')->find($request->input('clone_image_from_id'));@@ -188,9 +189,11 @@ class AccessoriesController extends Controller$accessory->model_number = request('model_number');// supplier_id, purchase_date, purchase_cost are create-only// on the parent. Post-create acquisitions live as Orders +- // OrderItems (each with its own supplier / date / price), so- // the edit form no longer exposes any of them and the- // controller stops overwriting the parent values.+ // OrderItems (each with its own supplier / date / price).+ // default_supplier_id remains editable — it's the parent's+ // "typical supplier" template that seeds new Orders when+ // the item has no order history yet.+ $accessory->default_supplier_id = request('default_supplier_id');$accessory->notes = request('notes');$accessory->requestable = request('requestable', 0);diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.phpindex 447df09f40..0e9886796a 100644--- a/app/Http/Controllers/Api/AccessoriesController.php+++ b/app/Http/Controllers/Api/AccessoriesController.php@@ -76,8 +76,9 @@ class AccessoriesController extends Controller'manufacturer',];+ // See ComponentsController for the orderItems.order.supplier eager-load rationale.$accessories = Accessory::select('accessories.*')- ->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'supplier', 'adminuser')+ ->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'defaultSupplier', 'adminuser', 'orderItems.order.supplier')->withCount('checkouts as checkouts_count');// This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter@@ -113,7 +114,7 @@ class AccessoriesController extends Controller}if ($request->filled('supplier_id')) {- $accessories->where('accessories.supplier_id', '=', $request->input('supplier_id'));+ $accessories->where('accessories.default_supplier_id', '=', $request->input('supplier_id'));}if ($request->filled('location_id')) {@@ -183,6 +184,12 @@ class AccessoriesController extends Controller$accessory = new Accessory;$accessory->fill($request->all());$accessory->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ // Seed the parent's "typical supplier" template from the initial+ // acquisition supplier on create; editable afterwards. See the+ // UI store method for the parent-as-template rationale.+ if (! $request->filled('default_supplier_id') && $request->filled('supplier_id')) {+ $accessory->default_supplier_id = $request->input('supplier_id');+ }$accessory = $request->handleImages($accessory);if ($accessory->save()) {diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.phpindex e004abc4f8..3c90baaec6 100644--- a/app/Http/Controllers/Api/ComponentsController.php+++ b/app/Http/Controllers/Api/ComponentsController.php@@ -66,8 +66,11 @@ class ComponentsController extends Controller];+ // Eager-load orderItems.order.supplier so lastAcquisitionSupplier()+ // walks the relation cache in the transformer instead of firing a+ // Supplier::find() per row.$components = Component::select('components.*')- ->with('company', 'location', 'category', 'supplier', 'adminuser', 'manufacturer')+ ->with('company', 'location', 'category', 'defaultSupplier', 'adminuser', 'manufacturer', 'orderItems.order.supplier')->withSum('unconstrainedAssets as sum_unconstrained_assets', 'components_assets.assigned_qty');$filter = [];@@ -114,7 +117,7 @@ class ComponentsController extends Controller}if ($request->filled('supplier_id')) {- $components->where('components.supplier_id', '=', $request->input('supplier_id'));+ $components->where('components.default_supplier_id', '=', $request->input('supplier_id'));}if ($request->filled('manufacturer_id')) {@@ -188,6 +191,10 @@ class ComponentsController extends Controller$component = new Component;$component->fill($request->all());$component->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ // See AccessoriesController::store for the default-supplier seeding rationale.+ if (! $request->filled('default_supplier_id') && $request->filled('supplier_id')) {+ $component->default_supplier_id = $request->input('supplier_id');+ }$component = $request->handleImages($component);if ($component->save()) {diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.phpindex b374adee53..b55794851a 100644--- a/app/Http/Controllers/Api/ConsumablesController.php+++ b/app/Http/Controllers/Api/ConsumablesController.php@@ -37,7 +37,8 @@ class ConsumablesController extends Controller{$this->authorize('index', Consumable::class);- $consumables = Consumable::with('company', 'location', 'category', 'supplier', 'manufacturer')+ // See ComponentsController for the orderItems.order.supplier eager-load rationale.+ $consumables = Consumable::with('company', 'location', 'category', 'defaultSupplier', 'manufacturer', 'orderItems.order.supplier')->withCount('users as consumables_users_count');// This array is what determines which fields should be allowed to be sorted on ON the table itself.@@ -108,7 +109,7 @@ class ConsumablesController extends Controller}if ($request->filled('supplier_id')) {- $consumables->where('consumables.supplier_id', '=', $request->input('supplier_id'));+ $consumables->where('consumables.default_supplier_id', '=', $request->input('supplier_id'));}if ($request->filled('location_id')) {@@ -176,6 +177,10 @@ class ConsumablesController extends Controller$consumable = new Consumable;$consumable->fill($request->all());$consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));+ // See AccessoriesController::store for the default-supplier seeding rationale.+ if (! $request->filled('default_supplier_id') && $request->filled('supplier_id')) {+ $consumable->default_supplier_id = $request->input('supplier_id');+ }$consumable = $request->handleImages($consumable);if ($consumable->save()) {diff --git a/app/Http/Controllers/Api/OrderItemsController.php b/app/Http/Controllers/Api/OrderItemsController.phpindex fed4cb84d0..fb0750a9bc 100644--- a/app/Http/Controllers/Api/OrderItemsController.php+++ b/app/Http/Controllers/Api/OrderItemsController.php@@ -64,6 +64,11 @@ class OrderItemsController extends Controller->where('order_items.item_id', $itemId);}+ // Orders tab shows purchases only. Corrections / consumption+ // events (zero or negative-qty OrderItems) belong in the item's+ // history tab, not on the "Orders" list — they aren't purchases.+ $query->where('order_items.qty', '>', 0);+// leftJoin onto orders + suppliers so cross-table sort / search// can hit those columns. Select order_items.* so the model// hydrates cleanly and the joined columns don't leak into the@@ -76,7 +81,8 @@ class OrderItemsController extends Controller$needle = '%'.$request->input('search').'%';$query->where(function ($q) use ($needle) {$q->where('orders.order_number', 'like', $needle)- ->orWhere('suppliers.name', 'like', $needle);+ ->orWhere('suppliers.name', 'like', $needle)+ ->orWhere('orders.notes', 'like', $needle);});}diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.phpindex 64c45ae1be..8352c167e6 100644--- a/app/Http/Controllers/Components/ComponentsController.php+++ b/app/Http/Controllers/Components/ComponentsController.php@@ -82,19 +82,20 @@ class ComponentsController extends Controller$component = new Component;$component->name = $request->input('name');$component->category_id = $request->input('category_id');- $component->supplier_id = $request->input('supplier_id');$component->manufacturer_id = $request->input('manufacturer_id');$component->model_number = $request->input('model_number');$component->location_id = $request->input('location_id');$component->company_id = Company::getIdForCurrentUser($request->input('company_id'));- // order_number moved off the parent Component column to Orders / OrderItems.+ // order_number / supplier_id / purchase_date / purchase_cost all+ // moved off the parent column to Orders / OrderItems.$component->min_amt = $request->input('min_amt', null);$component->serial = $request->input('serial', null);- $component->purchase_date = $request->input('purchase_date', null);- $component->purchase_cost = $request->input('purchase_cost', null);$component->qty = $request->input('qty');$component->created_by = auth()->id();$component->notes = $request->input('notes');+ // Seed the template supplier from the initial-acquisition+ // supplier on the create form; editable afterwards.+ $component->default_supplier_id = $request->input('default_supplier_id', $request->input('supplier_id'));$component = $request->handleImages($component);@@ -172,8 +173,9 @@ class ComponentsController extends Controller$component->serial = $request->input('serial');// 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.+ // OrderItems. default_supplier_id remains editable as the+ // parent's "typical supplier" template.+ $component->default_supplier_id = $request->input('default_supplier_id');$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 32e14bbef8..05dc66ae47 100644--- a/app/Http/Controllers/Consumables/ConsumablesController.php+++ b/app/Http/Controllers/Consumables/ConsumablesController.php@@ -83,19 +83,20 @@ class ConsumablesController extends Controller$consumable = new Consumable;$consumable->name = $request->input('name');$consumable->category_id = $request->input('category_id');- $consumable->supplier_id = $request->input('supplier_id');$consumable->location_id = $request->input('location_id');$consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));- // order_number moved off the parent Consumable column to Orders / OrderItems.+ // order_number / supplier_id / purchase_date / purchase_cost all+ // moved off the parent column to Orders / OrderItems.$consumable->min_amt = $request->input('min_amt');$consumable->manufacturer_id = $request->input('manufacturer_id');$consumable->model_number = $request->input('model_number');$consumable->item_no = $request->input('item_no');- $consumable->purchase_date = $request->input('purchase_date');- $consumable->purchase_cost = $request->input('purchase_cost');$consumable->qty = $request->input('qty');$consumable->created_by = auth()->id();$consumable->notes = $request->input('notes');+ // Seed the template supplier from the initial-acquisition+ // supplier on the create form; editable afterwards.+ $consumable->default_supplier_id = $request->input('default_supplier_id', $request->input('supplier_id'));if ($request->has('use_cloned_image')) {$cloned_model_img = Consumable::select('image')->find($request->input('clone_image_from_id'));@@ -181,8 +182,10 @@ class ConsumablesController extends Controller$consumable->item_no = $request->input('item_no');// 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.+ // OrderItems (each with its own supplier / date / price).+ // default_supplier_id remains editable — see accessory update+ // controller for the parent-as-template rationale.+ $consumable->default_supplier_id = $request->input('default_supplier_id');$consumable->notes = $request->input('notes');$consumable = $request->handleImages($consumable);diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.phpindex 44165ceece..a93a79ca74 100644--- a/app/Http/Controllers/Reports/CustomComponentReportController.php+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php@@ -171,7 +171,9 @@ class CustomComponentReportController extends Controller],'purchase_date' => ['headers' => [trans('general.purchase_date')],- 'values' => fn ($component, $i) => [$component->purchase_date ? Carbon::make($component->purchase_date)->format('Y-m-d') : ''],+ 'values' => fn ($component, $i) => [+ ($d = $component->lastOrderDefaults()['purchase_date'] ?? null) ? Carbon::make($d)->format('Y-m-d') : '',+ ],],'quantity' => ['headers' => [trans('general.quantity')],@@ -183,7 +185,7 @@ class CustomComponentReportController extends Controller],'unit_cost' => ['headers' => [trans('general.unit_cost')],- 'values' => fn ($component, $i) => [$component->purchase_cost],+ 'values' => fn ($component, $i) => [$component->lastOrderDefaults()['unit_cost'] ?? ''],],'order' => ['headers' => [trans('admin/hardware/form.order')],@@ -204,7 +206,7 @@ class CustomComponentReportController extends Controller],'supplier' => ['headers' => [trans('general.supplier')],- 'values' => fn ($component, $i) => [$component->supplier?->name],+ 'values' => fn ($component, $i) => [$component->lastAcquisitionSupplier()?->name],],'location' => ['headers' => [trans('general.location')],@@ -268,11 +270,14 @@ class CustomComponentReportController extends Controller'company','location','manufacturer',- 'supplier',+ 'defaultSupplier',// Eager-loaded so the 'order' report column can pluck// Order.order_number per row without firing N+1 queries// through the HasManyThrough relation on every render.+ // orderItems.order.supplier feeds the "supplier" column's+ // lastAcquisitionSupplier() lookup.'orders',+ 'orderItems.order.supplier',]);$request->whenFilled('include_assignments', fn () => $query->with('assets.company'));@@ -299,7 +304,7 @@ class CustomComponentReportController extends Controller'by_company_id' => 'components.company_id','by_location_id' => 'components.location_id','by_manufacturer_id' => 'components.manufacturer_id',- 'by_supplier_id' => 'components.supplier_id',+ 'by_supplier_id' => 'components.default_supplier_id',]);$query = $this->appendNumericalBoundaries($query, $request, [