diff --git a/app/Http/Controllers/AssetController.php b/app/Http/Controllers/AssetController.php index 2bd225b..3f53f3e 100644 --- a/app/Http/Controllers/AssetController.php +++ b/app/Http/Controllers/AssetController.php @@ -11,6 +11,7 @@ use App\Models\AssetUser; use App\Models\Department; use App\Models\PersonInCharge; use App\Models\Unit; +use App\Models\VendorContract; use App\Models\Warranty; use App\Services\Asset\AssetService; use Illuminate\Http\RedirectResponse; @@ -69,6 +70,7 @@ class AssetController extends Controller 'users' => AssetUser::orderBy('name')->get(), 'locations' => AssetLocation::orderBy('name')->get(), 'warranties' => Warranty::orderBy('duration_months')->get(), + 'vendorContracts' => VendorContract::orderBy('vendor_name')->get(), 'filters' => $filters, ]); } @@ -129,6 +131,11 @@ class AssetController extends Controller 'purchase_date' => ['nullable', 'date'], 'warranty_end' => ['nullable', 'date'], 'cost' => ['nullable', 'numeric', 'min:0'], + 'depreciation_method' => ['nullable', 'in:straight_line,diminishing'], + 'useful_life_months' => ['nullable', 'integer', 'min:1'], + 'residual_value' => ['nullable', 'numeric', 'min:0'], + 'capex_opex' => ['nullable', 'in:capex,opex'], + 'vendor_contract_id' => ['nullable', 'uuid', 'exists:vendor_contracts,id'], 'metadata' => ['nullable', 'array'], ]); } diff --git a/resources/views/assets/index.blade.php b/resources/views/assets/index.blade.php index af753c6..887c1cc 100644 --- a/resources/views/assets/index.blade.php +++ b/resources/views/assets/index.blade.php @@ -218,7 +218,7 @@ const simpleFields = [ 'name','serial_number','description','asset_status_id','asset_class_id','asset_category_id', 'unit_id','department_id','person_in_charge_id','asset_user_id','asset_location_id', - 'warranty_id','cost' + 'warranty_id','cost','depreciation_method','useful_life_months','residual_value','capex_opex','vendor_contract_id' ]; simpleFields.forEach((field) => { diff --git a/resources/views/assets/partials/form.blade.php b/resources/views/assets/partials/form.blade.php index bf70bd6..f4f5d3a 100644 --- a/resources/views/assets/partials/form.blade.php +++ b/resources/views/assets/partials/form.blade.php @@ -105,6 +105,41 @@ +