A free open source IT asset/license management system
Added enrichInitialOrderFromRequest to controllers
snipe12e5e6c0fc44
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.phpindex de644ee4ed..8f98d90841 100755--- a/app/Http/Controllers/Accessories/AccessoriesController.php+++ b/app/Http/Controllers/Accessories/AccessoriesController.php@@ -70,10 +70,10 @@ class AccessoriesController extends Controller$accessory->location_id = request('location_id');$accessory->min_amt = request('min_amt');$accessory->company_id = Company::getIdForCurrentUser(request('company_id'));- // order_number moved off the parent Accessory column to the Orders /- // OrderItems data model. A create-time order_number in the request- // body silently drops here; acquisition tracking happens through- // the adjust-quantity flow or the importer's Order helper.+ // order_number + currency don't live on the Accessory parent+ // column any more — the AccessoryObserver::created hook writes+ // the initial Order + OrderItem, and we enrich that Order below+ // (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');@@ -105,6 +105,8 @@ class AccessoriesController extends Controller// Was the accessory created?if ($accessory->save()) {+ $this->enrichInitialOrderFromRequest($request, $accessory);+// Redirect to the new accessory pagereturn Helper::getRedirectOption($request, $accessory->id, 'Accessories')->with('success', trans('admin/accessories/message.create.success'));@@ -186,7 +188,10 @@ class AccessoriesController extends Controller$accessory->supplier_id = request('supplier_id');$accessory->model_number = request('model_number');$accessory->purchase_date = request('purchase_date');- $accessory->purchase_cost = request('purchase_cost');+ // purchase_cost is create-only on the parent — post-create+ // acquisitions record their own price on the OrderItem, so+ // the edit form no longer exposes purchase_cost and this+ // controller stops overwriting it on update.$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 5afd50c381..4ba8a7db32 100644--- a/app/Http/Controllers/Api/AccessoriesController.php+++ b/app/Http/Controllers/Api/AccessoriesController.php@@ -186,6 +186,8 @@ class AccessoriesController extends Controller$accessory = $request->handleImages($accessory);if ($accessory->save()) {+ $this->enrichInitialOrderFromRequest($request, $accessory);+return response()->json(Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.create.success')));}@@ -292,7 +294,12 @@ class AccessoriesController extends Controller$qtyRequested = $request->has('qty') ? (int) $request->input('qty') : $qtyBefore;$qtyDelta = $qtyRequested - $qtyBefore;- $accessory->fill($request->except(['qty', 'order_number']));+ // purchase_cost is create-only on the parent — post-create+ // acquisitions record their own price on the OrderItem, so an+ // update-mode fill drops it. API consumers relying on the old+ // "set purchase_cost via PATCH" behavior need to use the+ // adjust-quantity endpoint instead.+ $accessory->fill($request->except(['qty', 'order_number', 'purchase_cost']));$accessory->company_id = Company::getIdForCurrentUser($request->input('company_id'));$accessory = $request->handleImages($accessory);@@ -530,4 +537,30 @@ class AccessoriesController extends Controllerreturn response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}++ /**+ * Orders tab datatable: every OrderItem line ever recorded against+ * this accessory, with its parent Order's supplier / currency /+ * purchase date joined in via eager load.+ */+ public function orders(Request $request, Accessory $accessory): JsonResponse|array+ {+ $this->authorize('view', $accessory);++ $ordersQuery = $accessory->orderItems()+ ->with(['order:id,order_number,supplier_id,currency,purchase_date', 'order.supplier:id,name'])+ ->orderByDesc('id');++ $total = (clone $ordersQuery)->count();+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');+ $limit = app('api_limit_value');+ $lines = (clone $ordersQuery)->skip($offset)->take($limit)->get();++ return response()->json(+ (new \App\Http\Transformers\OrderItemsTransformer)->transformOrderItems($lines, $total),+ 200,+ ['Content-Type' => 'application/json;charset=utf8'],+ JSON_UNESCAPED_UNICODE,+ );+ }}diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.phpindex 821340fc86..cb331bd636 100644--- a/app/Http/Controllers/Api/AssetModelsController.php+++ b/app/Http/Controllers/Api/AssetModelsController.php@@ -355,4 +355,34 @@ class AssetModelsController extends Controllerreturn response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}++ /**+ * Orders tab datatable for an AssetModel: aggregate every OrderItem+ * ever recorded against any Asset of this model. Since each Asset+ * gets its own OrderItem via AssetObserver::created, one AssetModel+ * accumulates one line per asset instance. Useful for "how many of+ * this model have we bought over time, from whom, at what price".+ */+ public function orders(Request $request, AssetModel $model): JsonResponse|array+ {+ $this->authorize('view', $model);++ $ordersQuery = \App\Models\OrderItem::query()+ ->where('item_type', \App\Models\Asset::class)+ ->whereIn('item_id', $model->assets()->select('id'))+ ->with(['order:id,order_number,supplier_id,currency,purchase_date', 'order.supplier:id,name'])+ ->orderByDesc('id');++ $total = (clone $ordersQuery)->count();+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');+ $limit = app('api_limit_value');+ $lines = (clone $ordersQuery)->skip($offset)->take($limit)->get();++ return response()->json(+ (new \App\Http\Transformers\OrderItemsTransformer)->transformOrderItems($lines, $total),+ 200,+ ['Content-Type' => 'application/json;charset=utf8'],+ JSON_UNESCAPED_UNICODE,+ );+ }}diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.phpindex 99bf43624b..dd2f2341d5 100644--- a/app/Http/Controllers/Api/ComponentsController.php+++ b/app/Http/Controllers/Api/ComponentsController.php@@ -191,6 +191,8 @@ class ComponentsController extends Controller$component = $request->handleImages($component);if ($component->save()) {+ $this->enrichInitialOrderFromRequest($request, $component);+return response()->json(Helper::formatStandardApiResponse('success', $component, trans('admin/components/message.create.success')));}@@ -234,7 +236,9 @@ class ComponentsController extends Controller$qtyRequested = $request->has('qty') ? (int) $request->input('qty') : $qtyBefore;$qtyDelta = $qtyRequested - $qtyBefore;- $component->fill($request->except(['qty', 'order_number']));+ // purchase_cost is create-only on the parent — post-create+ // acquisitions record their own price on the OrderItem.+ $component->fill($request->except(['qty', 'order_number', 'purchase_cost']));$component->company_id = Company::getIdForCurrentUser($request->input('company_id'));$component = $request->handleImages($component);@@ -520,4 +524,30 @@ class ComponentsController extends Controllerreturn response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}++ /**+ * Orders tab datatable: every OrderItem line ever recorded against+ * this component, with its parent Order's supplier / currency /+ * purchase date joined in via eager load.+ */+ public function orders(Request $request, Component $component): JsonResponse|array+ {+ $this->authorize('view', $component);++ $ordersQuery = $component->orderItems()+ ->with(['order:id,order_number,supplier_id,currency,purchase_date', 'order.supplier:id,name'])+ ->orderByDesc('id');++ $total = (clone $ordersQuery)->count();+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');+ $limit = app('api_limit_value');+ $lines = (clone $ordersQuery)->skip($offset)->take($limit)->get();++ return response()->json(+ (new \App\Http\Transformers\OrderItemsTransformer)->transformOrderItems($lines, $total),+ 200,+ ['Content-Type' => 'application/json;charset=utf8'],+ JSON_UNESCAPED_UNICODE,+ );+ }}diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.phpindex 0ced12437d..be7dff3d3c 100644--- a/app/Http/Controllers/Api/ConsumablesController.php+++ b/app/Http/Controllers/Api/ConsumablesController.php@@ -179,6 +179,8 @@ class ConsumablesController extends Controller$consumable = $request->handleImages($consumable);if ($consumable->save()) {+ $this->enrichInitialOrderFromRequest($request, $consumable);+return response()->json(Helper::formatStandardApiResponse('success', $consumable, trans('admin/consumables/message.create.success')));}@@ -221,7 +223,9 @@ class ConsumablesController extends Controller$qtyRequested = $request->has('qty') ? (int) $request->input('qty') : $qtyBefore;$qtyDelta = $qtyRequested - $qtyBefore;- $consumable->fill($request->except(['qty', 'order_number']));+ // purchase_cost is create-only on the parent — post-create+ // acquisitions record their own price on the OrderItem.+ $consumable->fill($request->except(['qty', 'order_number', 'purchase_cost']));$consumable->company_id = Company::getIdForCurrentUser($request->input('company_id'));$consumable = $request->handleImages($consumable);@@ -480,4 +484,30 @@ class ConsumablesController extends Controllerreturn response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}++ /**+ * Orders tab datatable: every OrderItem line ever recorded against+ * this consumable, with its parent Order's supplier / currency /+ * purchase date joined in via eager load.+ */+ public function orders(Request $request, Consumable $consumable): JsonResponse|array+ {+ $this->authorize('view', $consumable);++ $ordersQuery = $consumable->orderItems()+ ->with(['order:id,order_number,supplier_id,currency,purchase_date', 'order.supplier:id,name'])+ ->orderByDesc('id');++ $total = (clone $ordersQuery)->count();+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');+ $limit = app('api_limit_value');+ $lines = (clone $ordersQuery)->skip($offset)->take($limit)->get();++ return response()->json(+ (new \App\Http\Transformers\OrderItemsTransformer)->transformOrderItems($lines, $total),+ 200,+ ['Content-Type' => 'application/json;charset=utf8'],+ JSON_UNESCAPED_UNICODE,+ );+ }}diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.phpindex c77dc5c300..7c5f6b15cf 100644--- a/app/Http/Controllers/Components/ComponentsController.php+++ b/app/Http/Controllers/Components/ComponentsController.php@@ -105,6 +105,8 @@ class ComponentsController extends Controller}if ($component->save()) {+ $this->enrichInitialOrderFromRequest($request, $component);+return Helper::getRedirectOption($request, $component->id, 'Components')->with('success', trans('admin/components/message.create.success'));}@@ -170,7 +172,7 @@ class ComponentsController extends Controller$component->supplier_id = $request->input('supplier_id');$component->serial = $request->input('serial');$component->purchase_date = $request->input('purchase_date');- $component->purchase_cost = request('purchase_cost');+ // purchase_cost is create-only. Edits go through Orders.$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 11901dd736..c9d00bfa54 100644--- a/app/Http/Controllers/Consumables/ConsumablesController.php+++ b/app/Http/Controllers/Consumables/ConsumablesController.php@@ -117,6 +117,8 @@ class ConsumablesController extends Controller}if ($consumable->save()) {+ $this->enrichInitialOrderFromRequest($request, $consumable);+return Helper::getRedirectOption($request, $consumable->id, 'Consumables')->with('success', trans('admin/consumables/message.create.success'));}@@ -179,7 +181,7 @@ class ConsumablesController extends Controller$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');+ // purchase_cost is create-only. Edits go through Orders.$consumable->notes = $request->input('notes');$consumable = $request->handleImages($consumable);