A free open source IT asset/license management system
Updated models
snipe5e5c7aefb05f
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.phpindex e6bf089c76..5b2447ae0a 100755--- a/app/Models/Accessory.php+++ b/app/Models/Accessory.php@@ -5,6 +5,7 @@ namespace App\Models;use App\Models\Traits\Acceptable;use App\Models\Traits\AdjustsQuantity;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasOrders;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Requestable;@@ -29,6 +30,7 @@ class Accessory extends SnipeModeluse AdjustsQuantity;use CompanyableTrait;use HasFactory;+ use HasOrders;use HasUploads;use Loggable;use Presentable;@@ -70,12 +72,12 @@ class Accessory extends SnipeModel'location' => ['name'],'manufacturer' => ['name'],'supplier' => ['name'],- // Historical order numbers moved to per-QuantityAdjust action_log- // rows when the parent column was renamed to legacy_order_number.- // Free-text search hits them through the AdjustsQuantity trait's- // quantityAdjustLogs relation so "PO-123" still surfaces any- // accessory replenished under that PO at any point in its life.- 'quantityAdjustLogs' => ['order_number'],+ // Order numbers moved to a dedicated Orders / OrderItems data+ // model when the parent order_number column was removed. Free-text+ // search on "PO-123" walks the HasOrders trait's orders() through+ // relation into orders.order_number so any accessory that was+ // ever purchased under that PO still surfaces.+ 'orders' => ['order_number'],];protected $searchableCounts = [@@ -115,7 +117,6 @@ class Accessory extends SnipeModel'company_id','location_id','name',- 'legacy_order_number','purchase_cost','purchase_date','model_number',diff --git a/app/Models/Asset.php b/app/Models/Asset.phpindex 5840a8e013..bd2d0b3072 100644--- a/app/Models/Asset.php+++ b/app/Models/Asset.php@@ -8,6 +8,7 @@ use App\Helpers\Helper;use App\Http\Traits\UniqueUndeletedTrait;use App\Models\Traits\Acceptable;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasOrders;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Requestable;@@ -38,6 +39,7 @@ class Asset extends Depreciableuse CompanyableTrait;use HasFactory;+ use HasOrders;use HasUploads;use Loggable;use Presentable;@@ -154,7 +156,6 @@ class Asset extends Depreciable'asset_eol_date' => ['nullable', 'date'],'eol_explicit' => ['nullable', 'boolean'],'byod' => ['nullable', 'boolean'],- 'order_number' => ['nullable', 'string', 'max:191'],'notes' => ['nullable', 'string', 'max:65535'],'assigned_to' => ['nullable', 'integer', 'required_with:assigned_type'],'assigned_type' => ['nullable', 'required_with:assigned_to', 'in:'.User::class.','.Location::class.','.Asset::class],@@ -177,7 +178,6 @@ class Asset extends Depreciable'model_id','name','notes',- 'order_number','purchase_cost','purchase_date','rtd_location_id',@@ -208,7 +208,6 @@ class Asset extends Depreciable'name','asset_tag','serial',- 'order_number','purchase_cost','notes','created_at',@@ -237,6 +236,11 @@ class Asset extends Depreciable'category' => ['name'],'manufacturer' => ['name'],'assigned_to' => ['name'],+ // Historical order_number lives on the Orders table via+ // order_items now (see HasOrders trait). Search hits it through+ // the orders() HasManyThrough so "PO-123" still surfaces every+ // asset ordered under that PO.+ 'orders' => ['order_number'],];/**@@ -1949,7 +1953,12 @@ class Asset extends Depreciable)->orWhere('assets.name', 'LIKE', '%'.$search.'%')->orWhere('assets.asset_tag', 'LIKE', '%'.$search.'%')->orWhere('assets.serial', 'LIKE', '%'.$search.'%')- ->orWhere('assets.order_number', 'LIKE', '%'.$search.'%')+ // Historical order_number lives on the Orders+ // table via order_items now; free-text search on+ // it goes through $searchableRelations['orders'].+ // Dropped from this raw-SQL fallback to avoid a+ // reference to the removed assets.order_number+ // column.->orWhere('assets.notes', 'LIKE', '%'.$search.'%');}diff --git a/app/Models/Component.php b/app/Models/Component.phpindex da432d3f2b..c46cfc095f 100644--- a/app/Models/Component.php+++ b/app/Models/Component.php@@ -4,6 +4,7 @@ namespace App\Models;use App\Models\Traits\AdjustsQuantity;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasOrders;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Searchable;@@ -31,6 +32,7 @@ class Component extends SnipeModeluse AdjustsQuantity;use CompanyableTrait;+ use HasOrders;use HasUploads;use Loggable, Presentable;use SoftDeletes;@@ -84,7 +86,6 @@ class Component extends SnipeModel'purchase_cost','purchase_date','min_amt',- 'legacy_order_number','qty','serial','notes',@@ -118,10 +119,10 @@ class Component extends SnipeModel'supplier' => ['name'],'manufacturer' => ['name'],'adminuser' => ['first_name', 'last_name', 'display_name'],- // See Accessory::$searchableRelations for why order_number rides- // through the QuantityAdjust action_log rather than the parent's- // (now legacy_order_number) column.- 'quantityAdjustLogs' => ['order_number'],+ // See Accessory::$searchableRelations. Search hits order_number+ // through the HasOrders trait's orders() HasManyThrough into+ // the Orders table so historical PO references still match.+ 'orders' => ['order_number'],];public static function booted()diff --git a/app/Models/Consumable.php b/app/Models/Consumable.phpindex df2e874321..6344fb7a63 100644--- a/app/Models/Consumable.php+++ b/app/Models/Consumable.php@@ -5,6 +5,7 @@ namespace App\Models;use App\Models\Traits\Acceptable;use App\Models\Traits\AdjustsQuantity;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasOrders;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Searchable;@@ -27,6 +28,7 @@ class Consumable extends SnipeModeluse Acceptable;use AdjustsQuantity;use CompanyableTrait;+ use HasOrders;use HasUploads;use Loggable, Presentable;use SoftDeletes;@@ -81,7 +83,6 @@ class Consumable extends SnipeModel'manufacturer_id','supplier_id','name',- 'legacy_order_number','model_number','purchase_cost','purchase_date',@@ -119,10 +120,10 @@ class Consumable extends SnipeModel'manufacturer' => ['name'],'supplier' => ['name'],'adminuser' => ['first_name', 'last_name', 'display_name'],- // See Accessory::$searchableRelations for why order_number rides- // through the QuantityAdjust action_log rather than the parent's- // (now legacy_order_number) column.- 'quantityAdjustLogs' => ['order_number'],+ // See Accessory::$searchableRelations. Search hits order_number+ // through the HasOrders trait's orders() HasManyThrough into+ // the Orders table so historical PO references still match.+ 'orders' => ['order_number'],];/**diff --git a/app/Models/License.php b/app/Models/License.phpindex 43f199e212..9ddaf3dcf3 100755--- a/app/Models/License.php+++ b/app/Models/License.php@@ -5,6 +5,7 @@ namespace App\Models;use App\Console\Commands\SendExpiringLicenseNotifications;use App\Helpers\Helper;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasOrders;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Searchable;@@ -28,6 +29,7 @@ class License extends Depreciableprotected $presenter = LicensePresenter::class;use CompanyableTrait;+ use HasOrders;use HasUploads;use Loggable, Presentable;use SoftDeletes;@@ -90,7 +92,6 @@ class License extends Depreciable'category_id','name','notes',- 'order_number','purchase_cost','purchase_date','purchase_order',@@ -113,7 +114,6 @@ class License extends Depreciable'name','serial','notes',- 'order_number','purchase_order','purchase_cost','purchase_date',@@ -134,6 +134,11 @@ class License extends Depreciable'depreciation' => ['name'],'supplier' => ['name'],'adminuser' => ['first_name', 'last_name', 'display_name'],+ // Historical order_number lives on the Orders table via+ // order_items now (see HasOrders trait). Search hits it through+ // the orders() HasManyThrough so "PO-123" still surfaces every+ // license ordered under that PO.+ 'orders' => ['order_number'],];protected $appends = ['free_seat_count'];