2016-03-25 01:18:05 -07:00
< ? php
namespace App\Models ;
2018-07-21 05:01:30 -07:00
use App\Events\AssetCheckedOut ;
2018-09-10 07:40:26 -07:00
use App\Events\CheckoutableCheckedOut ;
2020-04-29 07:59:00 -07:00
use App\Exceptions\CheckoutNotAllowed ;
2018-07-05 19:30:36 -07:00
use App\Http\Traits\UniqueSerialTrait ;
2016-09-06 19:39:42 -07:00
use App\Http\Traits\UniqueUndeletedTrait ;
2018-07-28 04:09:21 -07:00
use App\Models\Traits\Acceptable ;
2018-07-16 14:13:07 -07:00
use App\Models\Traits\Searchable ;
2016-12-23 17:52:00 -08:00
use App\Presenters\Presentable ;
use AssetPresenter ;
2016-09-06 19:39:42 -07:00
use Auth ;
2016-12-23 17:52:00 -08:00
use Carbon\Carbon ;
2019-03-13 20:12:03 -07:00
use DB ;
2018-07-16 14:13:07 -07:00
use Illuminate\Database\Eloquent\Builder ;
2016-03-25 01:18:05 -07:00
use Illuminate\Database\Eloquent\SoftDeletes ;
2018-09-29 21:33:52 -07:00
use Illuminate\Support\Facades\Storage ;
2016-03-25 01:18:05 -07:00
use Watson\Validating\ValidatingTrait ;
2016-04-07 13:21:09 -07:00
/**
* Model for Assets .
*
* @ version v1 . 0
*/
2016-03-25 01:18:05 -07:00
class Asset extends Depreciable
{
2016-12-23 17:52:00 -08:00
protected $presenter = 'App\Presenters\AssetPresenter' ;
2021-06-15 01:32:44 -07:00
use CompanyableTrait ;
2018-07-05 19:30:36 -07:00
use Loggable , Requestable , Presentable , SoftDeletes , ValidatingTrait , UniqueUndeletedTrait , UniqueSerialTrait ;
2016-03-25 01:18:05 -07:00
2016-12-27 16:24:41 -08:00
const LOCATION = 'location' ;
const ASSET = 'asset' ;
const USER = 'user' ;
2018-03-25 13:46:57 -07:00
2018-07-28 04:09:21 -07:00
use Acceptable ;
2018-03-25 13:46:57 -07:00
/**
2018-07-28 04:09:21 -07:00
* Run after the checkout acceptance was declined by the user
2018-07-27 16:16:42 -07:00
*
2018-07-28 04:09:21 -07:00
* @ param User $acceptedBy
* @ param string $signature
*/
public function declinedCheckout ( User $declinedBy , $signature ) {
2018-07-27 16:16:42 -07:00
$this -> assigned_to = null ;
$this -> assigned_type = null ;
$this -> accepted = null ;
2018-07-28 04:09:21 -07:00
$this -> save ();
2018-07-27 16:16:42 -07:00
}
2018-03-25 13:46:57 -07:00
/**
* The database table used by the model .
*
* @ var string
*/
2016-03-25 01:18:05 -07:00
protected $table = 'assets' ;
2018-03-25 13:46:57 -07:00
/**
* Whether the model should inject it ' s identifier to the unique
* validation rules before attempting validation . If this property
* is not set in the model it will default to true .
*
* @ var boolean
*/
2016-03-25 01:18:05 -07:00
protected $injectUniqueIdentifier = true ;
2017-03-03 17:30:19 -08:00
2017-11-08 18:03:27 -08:00
// We set these as protected dates so that they will be easily accessible via Carbon
2017-03-03 17:30:19 -08:00
protected $dates = [
'created_at' ,
'updated_at' ,
'deleted_at' ,
'purchase_date' ,
'last_checkout' ,
2017-12-12 03:03:43 -08:00
'expected_checkin' ,
'last_audit_date' ,
'next_audit_date'
2017-03-03 17:30:19 -08:00
];
2020-04-22 06:37:40 -07:00
protected $casts = [
'model_id' => 'integer' ,
'status_id' => 'integer' ,
'company_id' => 'integer' ,
'location_id' => 'integer' ,
'rtd_company_id' => 'integer' ,
'supplier_id' => 'integer' ,
];
2016-03-25 01:18:05 -07:00
protected $rules = [
2017-03-31 13:48:11 -07:00
'name' => 'max:255|nullable' ,
'model_id' => 'required|integer|exists:models,id' ,
'status_id' => 'required|integer|exists:status_labels,id' ,
'company_id' => 'integer|nullable' ,
2019-07-18 14:32:23 -07:00
'warranty_months' => 'numeric|nullable|digits_between:0,240' ,
2018-07-05 19:30:36 -07:00
'physical' => 'numeric|max:1|nullable' ,
2017-03-31 13:48:11 -07:00
'checkout_date' => 'date|max:10|min:10|nullable' ,
'checkin_date' => 'date|max:10|min:10|nullable' ,
2020-04-22 06:37:40 -07:00
'supplier_id' => 'exists:suppliers,id|numeric|nullable' ,
'location_id' => 'exists:locations,id|nullable' ,
'rtd_location_id' => 'exists:locations,id|nullable' ,
2017-03-31 13:48:11 -07:00
'asset_tag' => 'required|min:1|max:255|unique_undeleted' ,
'status' => 'integer' ,
2018-07-05 19:30:36 -07:00
'serial' => 'unique_serial|nullable' ,
2017-03-31 13:48:11 -07:00
'purchase_cost' => 'numeric|nullable' ,
2020-04-22 06:37:40 -07:00
'next_audit_date' => 'date|nullable' ,
'last_audit_date' => 'date|nullable' ,
2016-03-25 01:18:05 -07:00
];
/**
* The attributes that are mass assignable .
*
* @ var array
*/
2017-01-10 16:19:18 -08:00
protected $fillable = [
'asset_tag' ,
'assigned_to' ,
2017-09-18 16:40:13 -07:00
'assigned_type' ,
2017-01-10 16:19:18 -08:00
'company_id' ,
'image' ,
2018-03-29 05:11:07 -07:00
'location_id' ,
2017-01-10 16:19:18 -08:00
'model_id' ,
'name' ,
'notes' ,
2017-10-26 16:13:35 -07:00
'order_number' ,
2017-01-10 16:19:18 -08:00
'purchase_cost' ,
'purchase_date' ,
'rtd_location_id' ,
'serial' ,
'status_id' ,
'supplier_id' ,
'warranty_months' ,
2020-02-03 19:37:03 -08:00
'requestable' ,
2020-11-11 13:30:11 -08:00
'last_checkout' ,
2020-11-13 03:22:26 -08:00
'expected_checkin' ,
2017-01-10 16:19:18 -08:00
];
2016-03-25 01:18:05 -07:00
2018-07-16 14:13:07 -07:00
use Searchable ;
2017-10-31 05:21:55 -07:00
2018-07-16 14:13:07 -07:00
/**
* The attributes that should be included when searching the model .
*
* @ var array
*/
protected $searchableAttributes = [
'name' ,
'asset_tag' ,
'serial' ,
'order_number' ,
'purchase_cost' ,
'notes' ,
'created_at' ,
'updated_at' ,
'purchase_date' ,
'expected_checkin' ,
'next_audit_date' ,
'last_audit_date'
];
/**
* The relations and their attributes that should be included when searching the model .
*
* @ var array
*/
protected $searchableRelations = [
'assetstatus' => [ 'name' ],
'supplier' => [ 'name' ],
'company' => [ 'name' ],
'defaultLoc' => [ 'name' ],
2020-11-24 19:49:46 -08:00
'location' => [ 'name' ],
2018-07-16 14:13:07 -07:00
'model' => [ 'name' , 'model_number' ],
'model.category' => [ 'name' ],
'model.manufacturer' => [ 'name' ],
2018-09-29 21:33:52 -07:00
];
/**
* This handles the custom field validation for assets
*
* @ var array
*/
2018-10-02 04:40:20 -07:00
public function save ( array $params = [])
2018-09-29 21:33:52 -07:00
{
if ( $this -> model_id != '' ) {
$model = AssetModel :: find ( $this -> model_id );
if (( $model ) && ( $model -> fieldset )) {
$this -> rules += $model -> fieldset -> validation_rules ();
}
}
return parent :: save ( $params );
}
2017-10-31 05:21:55 -07:00
2016-12-23 17:52:00 -08:00
public function getDisplayNameAttribute ()
{
return $this -> present () -> name ();
}
2016-03-25 01:18:05 -07:00
2017-03-14 08:37:39 -07:00
/**
* Returns the warranty expiration date as Carbon object
* @ return \Carbon | null
*/
public function getWarrantyExpiresAttribute ()
{
if ( isset ( $this -> attributes [ 'warranty_months' ]) && isset ( $this -> attributes [ 'purchase_date' ])) {
if ( is_string ( $this -> attributes [ 'purchase_date' ]) || is_string ( $this -> attributes [ 'purchase_date' ])) {
$purchase_date = \Carbon\Carbon :: parse ( $this -> attributes [ 'purchase_date' ]);
} else {
$purchase_date = \Carbon\Carbon :: instance ( $this -> attributes [ 'purchase_date' ]);
}
$purchase_date -> setTime ( 0 , 0 , 0 );
return $purchase_date -> addMonths (( int ) $this -> attributes [ 'warranty_months' ]);
}
return null ;
}
2018-08-01 00:06:41 -07:00
/**
* Establishes the asset -> company relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v3 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function company ()
{
return $this -> belongsTo ( '\App\Models\Company' , 'company_id' );
}
2018-08-01 00:06:41 -07:00
/**
2020-11-10 05:06:47 -08:00
* Determines if an asset is available for checkout .
* This checks to see if the it ' s checked out to an invalid ( deleted ) user
* OR if the assigned_to and deleted_at fields on the asset are empty AND
* that the status is deployable
2018-08-01 00:06:41 -07:00
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v3 . 0 ]
* @ return boolean
*/
2016-08-16 13:02:42 -07:00
public function availableForCheckout ()
{
2021-01-26 22:12:24 -08:00
// This asset is not currently assigned to anyone and is not deleted...
if (( ! $this -> assigned_to ) && ( ! $this -> deleted_at )) {
// The asset status is not archived and is deployable
if (( $this -> assetstatus ) && ( $this -> assetstatus -> archived == '0' )
&& ( $this -> assetstatus -> deployable == '1' ))
{
return true ;
}
2017-10-28 02:31:54 -07:00
}
return false ;
2016-08-16 13:02:42 -07:00
}
2016-07-26 01:39:30 -07:00
2018-08-01 00:06:41 -07:00
2016-12-23 17:52:00 -08:00
/**
2018-08-01 00:06:41 -07:00
* Checks the asset out to the target
*
* @ todo The admin parameter is never used . Can probably be removed .
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
2016-12-23 17:52:00 -08:00
* @ param User $user
* @ param User $admin
* @ param Carbon $checkout_at
2017-11-08 18:03:27 -08:00
* @ param Carbon $expected_checkin
2016-12-23 17:52:00 -08:00
* @ param string $note
* @ param null $name
* @ return bool
2018-08-01 00:06:41 -07:00
* @ since [ v3 . 0 ]
* @ return boolean
2016-12-23 17:52:00 -08:00
*/
2021-02-18 14:21:19 -08:00
public function checkOut ( $target , $admin = null , $checkout_at = null , $expected_checkin = null , $note = null , $name = null , $location = null )
2016-03-25 01:18:05 -07:00
{
2016-12-27 16:24:41 -08:00
if ( ! $target ) {
2016-08-16 13:02:42 -07:00
return false ;
}
2020-04-29 07:59:00 -07:00
if ( $this -> is ( $target )) {
throw new CheckoutNotAllowed ( 'You cannot check an asset out to itself.' );
}
2016-03-25 01:18:05 -07:00
if ( $expected_checkin ) {
2016-08-16 13:02:42 -07:00
$this -> expected_checkin = $expected_checkin ;
2016-03-25 01:18:05 -07:00
}
$this -> last_checkout = $checkout_at ;
2016-12-27 16:24:41 -08:00
$this -> assignedTo () -> associate ( $target );
2016-08-16 18:23:20 -07:00
2016-12-29 14:02:18 -08:00
if ( $name != null ) {
2016-08-16 18:23:20 -07:00
$this -> name = $name ;
}
2016-03-25 01:18:05 -07:00
2017-11-03 19:39:48 -07:00
if ( $location != null ) {
$this -> location_id = $location ;
2017-12-28 20:08:45 -08:00
} else {
2020-04-09 18:32:34 -07:00
if ( isset ( $target -> location )) {
2017-12-28 20:08:45 -08:00
$this -> location_id = $target -> location -> id ;
}
2020-04-09 18:32:34 -07:00
if ( $target instanceof Location ) {
2018-07-23 06:47:21 -07:00
$this -> location_id = $target -> id ;
}
2017-11-03 19:39:48 -07:00
}
2016-03-25 01:18:05 -07:00
if ( $this -> save ()) {
2021-04-05 19:28:31 -07:00
if ( is_integer ( $admin )){
$checkedOutBy = User :: findOrFail ( $admin );
} elseif ( get_class ( $admin ) === 'App\Models\User' ) {
$checkedOutBy = $admin ;
} else {
$checkedOutBy = Auth :: user ();
}
event ( new CheckoutableCheckedOut ( $this , $target , $checkedOutBy , $note ));
2021-02-18 14:21:19 -08:00
2018-05-16 19:20:43 -07:00
$this -> increment ( 'checkout_counter' , 1 );
2016-03-25 01:18:05 -07:00
return true ;
}
return false ;
}
2018-08-01 00:06:41 -07:00
/**
* Sets the detailedNameAttribute
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v3 . 0 ]
* @ return string
*/
2016-06-22 12:27:41 -07:00
public function getDetailedNameAttribute ()
{
2017-09-29 17:14:38 -07:00
if ( $this -> assignedto ) {
$user_name = $this -> assignedto -> present () -> name ();
2016-06-22 12:27:41 -07:00
} else {
$user_name = " Unassigned " ;
}
2017-10-24 16:53:46 -07:00
return $this -> asset_tag . ' - ' . $this -> name . ' (' . $user_name . ') ' . ( $this -> model ) ? $this -> model -> name : '' ;
2016-05-24 18:05:48 -07:00
}
2017-09-29 17:14:38 -07:00
2018-08-01 00:06:41 -07:00
/**
* Pulls in the validation rules
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v3 . 0 ]
* @ return array
*/
public function validationRules ()
2016-03-25 01:18:05 -07:00
{
return $this -> rules ;
}
2016-04-23 02:07:40 -07:00
2016-05-18 19:26:50 -07:00
/**
2018-08-01 00:06:41 -07:00
* Establishes the asset -> depreciation relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v3 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function depreciation ()
{
return $this -> model -> belongsTo ( '\App\Models\Depreciation' , 'depreciation_id' );
}
2018-08-01 00:06:41 -07:00
2016-05-18 19:26:50 -07:00
/**
* Get components assigned to this asset
2018-08-01 00:06:41 -07:00
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
2016-05-18 19:26:50 -07:00
*/
public function components ()
{
2021-09-23 17:23:17 -07:00
return $this -> belongsToMany ( '\App\Models\Component' , 'components_assets' , 'asset_id' , 'component_id' ) -> withPivot ( 'id' , 'assigned_qty' , 'created_at' ) -> withTrashed ();
2016-05-18 19:26:50 -07:00
}
2018-08-01 00:06:41 -07:00
/**
* Get depreciation attribute from associated asset model
*
* @ todo Is this still needed ?
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function get_depreciation ()
{
2018-01-25 11:06:37 -08:00
if (( $this -> model ) && ( $this -> model -> depreciation )) {
2018-01-25 03:34:52 -08:00
return $this -> model -> depreciation ;
}
2016-03-25 01:18:05 -07:00
}
2018-08-01 00:06:41 -07:00
/**
* Get uploads for this asset
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function uploads ()
{
2016-09-06 19:39:42 -07:00
return $this -> hasMany ( '\App\Models\Actionlog' , 'item_id' )
-> where ( 'item_type' , '=' , Asset :: class )
2016-03-25 01:18:05 -07:00
-> where ( 'action_type' , '=' , 'uploaded' )
-> whereNotNull ( 'filename' )
-> orderBy ( 'created_at' , 'desc' );
}
2018-08-01 00:06:41 -07:00
2016-12-29 06:31:16 -08:00
/**
2018-08-01 00:06:41 -07:00
* Determines whether the asset is checked out to a user
*
2016-12-29 06:31:16 -08:00
* Even though we allow allow for checkout to things beyond users
* this method is an easy way of seeing if we are checked out to a user .
2018-08-01 00:06:41 -07:00
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return boolean
2016-12-29 06:31:16 -08:00
*/
2017-09-05 17:54:58 -07:00
public function checkedOutToUser ()
2016-03-25 01:18:05 -07:00
{
2017-09-05 17:54:58 -07:00
return $this -> assignedType () === self :: USER ;
2016-03-25 01:18:05 -07:00
}
2018-08-01 00:06:41 -07:00
/**
* Get the target this asset is checked out to
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-12-27 16:24:41 -08:00
public function assignedTo ()
{
2020-11-10 05:06:47 -08:00
return $this -> morphTo ( 'assigned' , 'assigned_type' , 'assigned_to' ) -> withTrashed ();
2016-12-27 16:24:41 -08:00
}
2018-08-01 00:06:41 -07:00
/**
* Gets assets assigned to this asset
*
* Sigh .
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-12-27 16:24:41 -08:00
public function assignedAssets ()
{
2017-03-14 08:37:39 -07:00
return $this -> morphMany ( 'App\Models\Asset' , 'assigned' , 'assigned_type' , 'assigned_to' ) -> withTrashed ();
2016-12-27 16:24:41 -08:00
}
2018-08-01 00:06:41 -07:00
/**
* Get the asset ' s location based on the assigned user
*
* @ todo Refactor this if possible . It ' s awful .
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \ArrayObject
*/
2017-12-04 23:00:55 -08:00
public function assetLoc ( $iterations = 1 , $first_asset = null )
2016-03-25 01:18:05 -07:00
{
2017-03-14 08:37:39 -07:00
if ( ! empty ( $this -> assignedType ())) {
2016-12-27 16:24:41 -08:00
if ( $this -> assignedType () == self :: ASSET ) {
2017-10-28 01:48:27 -07:00
if ( ! $first_asset ) {
$first_asset = $this ;
}
if ( $iterations > 10 ) {
throw new \Exception ( " Asset assignment Loop for Asset ID: " . $first_asset -> id );
}
$assigned_to = Asset :: find ( $this -> assigned_to ); //have to do this this way because otherwise it errors
2017-10-31 08:47:40 -07:00
if ( $assigned_to ) {
2017-12-04 23:00:55 -08:00
return $assigned_to -> assetLoc ( $iterations + 1 , $first_asset );
2017-10-31 08:47:40 -07:00
} // Recurse until we have a final location
2017-05-22 17:49:03 -07:00
}
if ( $this -> assignedType () == self :: LOCATION ) {
2017-10-31 08:47:40 -07:00
if ( $this -> assignedTo ) {
return $this -> assignedTo ;
}
2016-12-27 16:24:41 -08:00
}
2017-05-22 17:49:03 -07:00
if ( $this -> assignedType () == self :: USER ) {
2017-10-31 08:47:40 -07:00
if (( $this -> assignedTo ) && $this -> assignedTo -> userLoc ) {
return $this -> assignedTo -> userLoc ;
2017-09-25 11:25:15 -07:00
}
2017-10-31 08:47:40 -07:00
//this makes no sense
return $this -> defaultLoc ;
2017-05-22 17:49:03 -07:00
}
2017-09-25 11:25:15 -07:00
2016-03-25 01:18:05 -07:00
}
2017-10-28 01:48:27 -07:00
return $this -> defaultLoc ;
2016-03-25 01:18:05 -07:00
}
2018-08-01 00:06:41 -07:00
/**
* Gets the lowercased name of the type of target the asset is assigned to
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return string
*/
2016-12-27 16:24:41 -08:00
public function assignedType ()
{
return strtolower ( class_basename ( $this -> assigned_type ));
}
2018-08-01 00:06:41 -07:00
/**
* Get the asset ' s location based on default RTD location
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function defaultLoc ()
{
return $this -> belongsTo ( '\App\Models\Location' , 'rtd_location_id' );
}
2018-08-01 00:06:41 -07:00
/**
* Get the image URL of the asset .
*
* Check first to see if there is a specific image uploaded to the asset ,
* and if not , check for an image uploaded to the asset model .
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return string | false
*/
2017-03-14 08:37:39 -07:00
public function getImageUrl ()
{
2017-01-24 22:46:07 -08:00
if ( $this -> image && ! empty ( $this -> image )) {
2018-09-29 21:33:52 -07:00
return Storage :: disk ( 'public' ) -> url ( app ( 'assets_upload_path' ) . e ( $this -> image ));
2017-01-24 22:46:07 -08:00
} elseif ( $this -> model && ! empty ( $this -> model -> image )) {
2018-09-29 21:33:52 -07:00
return Storage :: disk ( 'public' ) -> url ( app ( 'models_upload_path' ) . e ( $this -> model -> image ));
2017-01-24 22:46:07 -08:00
}
return false ;
}
2018-08-01 00:06:41 -07:00
/**
* Get the asset ' s logs
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function assetlog ()
{
2016-09-06 19:39:42 -07:00
return $this -> hasMany ( '\App\Models\Actionlog' , 'item_id' )
-> where ( 'item_type' , '=' , Asset :: class )
2016-03-25 01:18:05 -07:00
-> orderBy ( 'created_at' , 'desc' )
-> withTrashed ();
}
2018-04-06 16:23:39 -07:00
/**
2018-08-01 00:06:41 -07:00
* Get the list of checkouts for this asset
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
2018-04-06 16:23:39 -07:00
*/
public function checkouts ()
{
return $this -> assetlog () -> where ( 'action_type' , '=' , 'checkout' )
-> orderBy ( 'created_at' , 'desc' )
-> withTrashed ();
}
/**
2018-08-01 00:06:41 -07:00
* Get the list of checkins for this asset
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
2018-04-06 16:23:39 -07:00
*/
public function checkins ()
{
return $this -> assetlog ()
-> where ( 'action_type' , '=' , 'checkin from' )
-> orderBy ( 'created_at' , 'desc' )
-> withTrashed ();
}
/**
2018-08-01 00:06:41 -07:00
* Get the asset ' s user requests
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
2018-04-06 16:23:39 -07:00
*/
public function userRequests ()
{
return $this -> assetlog ()
-> where ( 'action_type' , '=' , 'requested' )
-> orderBy ( 'created_at' , 'desc' )
-> withTrashed ();
}
2016-03-25 01:18:05 -07:00
2018-08-01 00:06:41 -07:00
/**
* Get maintenances for this asset
*
* @ author Vincent Sposato < vincent . sposato @ gmail . com >
* @ since 1.0
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function assetmaintenances ()
{
return $this -> hasMany ( '\App\Models\AssetMaintenance' , 'asset_id' )
2016-12-01 00:55:00 -08:00
-> orderBy ( 'created_at' , 'desc' );
2016-03-25 01:18:05 -07:00
}
2018-08-01 00:06:41 -07:00
/**
* Get action logs history for this asset
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v1 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function adminuser ()
{
return $this -> belongsTo ( '\App\Models\User' , 'user_id' );
}
2018-08-01 00:06:41 -07:00
/**
* Establishes the asset -> status relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v1 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function assetstatus ()
{
return $this -> belongsTo ( '\App\Models\Statuslabel' , 'status_id' );
}
2018-08-01 00:06:41 -07:00
/**
* Establishes the asset -> model relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v1 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function model ()
{
return $this -> belongsTo ( '\App\Models\AssetModel' , 'model_id' ) -> withTrashed ();
}
2018-08-01 00:06:41 -07:00
/**
* Return the assets with a warranty expiring within x days
*
* @ param $days
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return mixed
*/
2016-03-25 01:18:05 -07:00
public static function getExpiringWarrantee ( $days = 30 )
{
2022-01-18 12:21:49 -08:00
$days = ( is_null ( $days )) ? 30 : $days ;
2016-03-25 01:18:05 -07:00
return Asset :: where ( 'archived' , '=' , '0' )
-> whereNotNull ( 'warranty_months' )
-> whereNotNull ( 'purchase_date' )
-> whereNull ( 'deleted_at' )
-> whereRaw ( \DB :: raw ( 'DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
. $days
2022-01-18 12:21:49 -08:00
. ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()' ))
2016-03-25 01:18:05 -07:00
-> orderBy ( 'purchase_date' , 'ASC' )
-> get ();
}
2018-08-01 00:06:41 -07:00
/**
* Establishes the asset -> assigned licenses relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function licenses ()
{
return $this -> belongsToMany ( '\App\Models\License' , 'license_seats' , 'asset_id' , 'license_id' );
}
2018-08-01 00:06:41 -07:00
/**
* Establishes the asset -> status relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function licenseseats ()
{
return $this -> hasMany ( '\App\Models\LicenseSeat' , 'asset_id' );
}
2018-08-01 00:06:41 -07:00
/**
* Establishes the asset -> aupplier relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2016-03-25 01:18:05 -07:00
public function supplier ()
{
return $this -> belongsTo ( '\App\Models\Supplier' , 'supplier_id' );
}
2018-08-01 00:06:41 -07:00
/**
* Establishes the asset -> location relationship
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v2 . 0 ]
* @ return \Illuminate\Database\Eloquent\Relations\Relation
*/
2017-10-28 01:48:27 -07:00
public function location ()
{
return $this -> belongsTo ( '\App\Models\Location' , 'location_id' );
}
2016-03-25 01:18:05 -07:00
2018-08-01 00:06:41 -07:00
/**
* Get the next autoincremented asset tag
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return string | false
*/
2016-03-25 01:18:05 -07:00
public static function autoincrement_asset ()
{
$settings = \App\Models\Setting :: getSettings ();
2017-06-15 19:42:43 -07:00
2016-03-25 01:18:05 -07:00
if ( $settings -> auto_increment_assets == '1' ) {
2017-01-06 02:54:06 -08:00
$temp_asset_tag = \DB :: table ( 'assets' )
2016-03-25 01:18:05 -07:00
-> where ( 'physical' , '=' , '1' )
2017-01-06 02:54:06 -08:00
-> max ( 'asset_tag' );
2017-01-06 03:14:32 -08:00
$asset_tag_digits = preg_replace ( '/\D/' , '' , $temp_asset_tag );
$asset_tag = preg_replace ( '/^0*/' , '' , $asset_tag_digits );
2016-07-27 21:28:00 -07:00
if ( $settings -> zerofill_count > 0 ) {
2017-06-15 19:42:43 -07:00
return $settings -> auto_increment_prefix . Asset :: zerofill ( $settings -> next_auto_tag_base , $settings -> zerofill_count );
2016-07-27 21:28:00 -07:00
}
2017-06-20 12:13:36 -07:00
return $settings -> auto_increment_prefix . $settings -> next_auto_tag_base ;
2016-03-25 01:18:05 -07:00
} else {
return false ;
}
}
2018-08-01 00:06:41 -07:00
/**
* Get the next base number for the auto - incrementer .
2017-06-15 19:42:43 -07:00
*
2018-08-01 00:06:41 -07:00
* We ' ll add the zerofill and prefixes on the fly as we generate the number .
2017-06-15 19:42:43 -07:00
*
2018-08-01 00:06:41 -07:00
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return int
2017-06-15 19:42:43 -07:00
*/
public static function nextAutoIncrement ( $assets )
{
$max = 1 ;
foreach ( $assets as $asset ) {
$results = preg_match ( " / \ d+ $ / " , $asset [ 'asset_tag' ], $matches );
if ( $results )
{
$number = $matches [ 0 ];
if ( $number > $max )
{
$max = $number ;
}
}
}
return $max + 1 ;
}
2018-08-01 00:06:41 -07:00
/**
* Add zerofilling based on Settings
*
* We ' ll add the zerofill and prefixes on the fly as we generate the number .
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return string
*/
2016-12-29 14:02:18 -08:00
public static function zerofill ( $num , $zerofill = 3 )
2016-07-27 21:28:00 -07:00
{
return str_pad ( $num , $zerofill , '0' , STR_PAD_LEFT );
}
2018-08-01 00:06:41 -07:00
/**
* Determine whether to send a checkin / checkout email based on
* asset model category
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return boolean
*/
2016-12-23 17:52:00 -08:00
public function checkin_email ()
2016-03-25 01:18:05 -07:00
{
return $this -> model -> category -> checkin_email ;
}
2018-08-01 00:06:41 -07:00
/**
* Determine whether this asset requires acceptance by the assigned user
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return boolean
*/
2016-03-25 01:18:05 -07:00
public function requireAcceptance ()
{
2019-12-06 18:17:03 -08:00
if (( $this -> model ) && ( $this -> model -> category )) {
return $this -> model -> category -> require_acceptance ;
}
2016-03-25 01:18:05 -07:00
}
2018-08-01 00:06:41 -07:00
/**
* Checks for a category - specific EULA , and if that doesn ' t exist ,
* checks for a settings level EULA
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v4 . 0 ]
* @ return string | false
*/
2016-03-25 01:18:05 -07:00
public function getEula ()
{
$Parsedown = new \Parsedown ();
2019-12-06 18:17:03 -08:00
if (( $this -> model ) && ( $this -> model -> category )) {
if ( $this -> model -> category -> eula_text ) {
return $Parsedown -> text ( e ( $this -> model -> category -> eula_text ));
} elseif ( $this -> model -> category -> use_default_eula == '1' ) {
return $Parsedown -> text ( e ( Setting :: getSettings () -> default_eula_text ));
} else {
return false ;
}
2016-03-25 01:18:05 -07:00
}
2019-12-06 18:17:03 -08:00
return false ;
2016-03-25 01:18:05 -07:00
}
2018-08-01 00:06:41 -07:00
/**
* -----------------------------------------------
* BEGIN QUERY SCOPES
* -----------------------------------------------
**/
2018-07-16 14:13:07 -07:00
/**
* Run additional , advanced searches .
2018-08-01 00:06:41 -07:00
*
* @ param \Illuminate\Database\Eloquent\Builder $query
2018-07-16 17:44:31 -07:00
* @ param array $terms The search terms
2018-08-01 00:06:41 -07:00
* @ return \Illuminate\Database\Eloquent\Builder
2018-07-16 14:13:07 -07:00
*/
2018-07-16 17:44:31 -07:00
public function advancedTextSearch ( Builder $query , array $terms ) {
2018-08-01 00:06:41 -07:00
/**
* Assigned user
*/
$query = $query -> leftJoin ( 'users as assets_users' , function ( $leftJoin ) {
2018-07-16 14:13:07 -07:00
$leftJoin -> on ( " assets_users.id " , " = " , " assets.assigned_to " )
-> where ( " assets.assigned_type " , " = " , User :: class );
2018-08-01 00:06:41 -07:00
});
2018-07-16 17:44:31 -07:00
2018-08-01 00:06:41 -07:00
foreach ( $terms as $term ) {
2018-07-16 17:44:31 -07:00
2018-08-01 00:06:41 -07:00
$query = $query
-> orWhere ( 'assets_users.first_name' , 'LIKE' , '%' . $term . '%' )
-> orWhere ( 'assets_users.last_name' , 'LIKE' , '%' . $term . '%' )
-> orWhere ( 'assets_users.username' , 'LIKE' , '%' . $term . '%' )
2021-09-06 22:15:21 -07:00
-> orWhereRaw ( 'CONCAT(' . DB :: getTablePrefix () . 'assets_users.first_name," ",' . DB :: getTablePrefix () . 'assets_users.last_name) LIKE ?' , [ " % $term % " ]);
2018-07-16 17:44:31 -07:00
2018-08-01 00:06:41 -07:00
}
2018-07-16 17:44:31 -07:00
2018-08-01 00:06:41 -07:00
/**
* Assigned location
*/
$query = $query -> leftJoin ( 'locations as assets_locations' , function ( $leftJoin ) {
$leftJoin -> on ( " assets_locations.id " , " = " , " assets.assigned_to " )
-> where ( " assets.assigned_type " , " = " , Location :: class );
});
2018-07-16 14:13:07 -07:00
2018-08-01 00:06:41 -07:00
foreach ( $terms as $term ) {
2018-07-16 14:13:07 -07:00
2018-08-01 00:06:41 -07:00
$query = $query -> orWhere ( 'assets_locations.name' , 'LIKE' , '%' . $term . '%' );
2018-07-16 17:44:31 -07:00
2018-08-01 00:06:41 -07:00
}
2018-07-16 17:44:31 -07:00
2018-08-01 00:06:41 -07:00
/**
* Assigned assets
*/
$query = $query -> leftJoin ( 'assets as assigned_assets' , function ( $leftJoin ) {
$leftJoin -> on ( 'assigned_assets.id' , '=' , 'assets.assigned_to' )
-> where ( 'assets.assigned_type' , '=' , Asset :: class );
});
2018-07-16 14:13:07 -07:00
2018-08-01 00:06:41 -07:00
foreach ( $terms as $term ) {
2018-07-16 14:13:07 -07:00
2018-08-01 00:06:41 -07:00
$query = $query -> orWhere ( 'assigned_assets.name' , 'LIKE' , '%' . $term . '%' );
2018-07-16 17:44:31 -07:00
2018-08-01 00:06:41 -07:00
}
2018-07-16 14:13:07 -07:00
2018-08-01 00:06:41 -07:00
return $query ;
2018-07-16 14:13:07 -07:00
}
2016-03-25 01:18:05 -07:00
2018-08-01 00:06:41 -07:00
/**
* Query builder scope for hardware
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
2016-03-25 01:18:05 -07:00
public function scopeHardware ( $query )
{
return $query -> where ( 'physical' , '=' , '1' );
}
2018-08-01 00:06:41 -07:00
/**
* Query builder scope for pending assets
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
2016-03-25 01:18:05 -07:00
public function scopePending ( $query )
{
return $query -> whereHas ( 'assetstatus' , function ( $query ) {
$query -> where ( 'deployable' , '=' , 0 )
-> where ( 'pending' , '=' , 1 )
-> where ( 'archived' , '=' , 0 );
});
}
2016-04-19 20:23:04 -07:00
/**
2017-09-05 17:54:58 -07:00
* Query builder scope for searching location
2016-04-19 20:23:04 -07:00
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-04-19 20:23:04 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-04-19 20:23:04 -07:00
*/
public function scopeAssetsByLocation ( $query , $location )
{
2016-06-22 12:27:41 -07:00
return $query -> where ( function ( $query ) use ( $location ) {
2017-09-05 17:54:58 -07:00
$query -> whereHas ( 'assignedTo' , function ( $query ) use ( $location ) {
$query -> where ([
[ 'users.location_id' , '=' , $location -> id ],
[ 'assets.assigned_type' , '=' , User :: class ]
]) -> orWhere ([
[ 'locations.id' , '=' , $location -> id ],
[ 'assets.assigned_type' , '=' , Location :: class ]
]) -> orWhere ([
[ 'assets.rtd_location_id' , '=' , $location -> id ],
[ 'assets.assigned_type' , '=' , Asset :: class ]
]);
2016-06-22 12:27:41 -07:00
}) -> orWhere ( function ( $query ) use ( $location ) {
2016-04-19 20:23:04 -07:00
$query -> where ( 'assets.rtd_location_id' , '=' , $location -> id );
$query -> whereNull ( 'assets.assigned_to' );
});
});
}
/**
* Query builder scope for RTD assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-04-19 20:23:04 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-04-19 20:23:04 -07:00
*/
2016-03-25 01:18:05 -07:00
public function scopeRTD ( $query )
{
2018-07-25 06:46:06 -07:00
return $query -> whereNull ( 'assets.assigned_to' )
2016-03-25 01:18:05 -07:00
-> whereHas ( 'assetstatus' , function ( $query ) {
$query -> where ( 'deployable' , '=' , 1 )
-> where ( 'pending' , '=' , 0 )
-> where ( 'archived' , '=' , 0 );
});
}
/**
* Query builder scope for Undeployable assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeUndeployable ( $query )
{
return $query -> whereHas ( 'assetstatus' , function ( $query ) {
$query -> where ( 'deployable' , '=' , 0 )
-> where ( 'pending' , '=' , 0 )
-> where ( 'archived' , '=' , 0 );
});
}
2016-09-01 13:28:15 -07:00
/**
* Query builder scope for non - Archived assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-09-01 13:28:15 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-09-01 13:28:15 -07:00
*/
public function scopeNotArchived ( $query )
{
return $query -> whereHas ( 'assetstatus' , function ( $query ) {
$query -> where ( 'archived' , '=' , 0 );
});
}
2019-05-05 19:32:52 -07:00
/**
* Query builder scope for Assets that are due for auditing , based on the assets . next_audit_date
* and settings . audit_warning_days .
*
* This is / will be used in the artisan command snipeit : upcoming - audits and also
* for an upcoming API call for retrieving a report on assets that will need to be audited .
*
* Due for audit soon :
* next_audit_date greater than or equal to now ( must be in the future )
* and ( next_audit_date - threshold days ) <= now ()
*
* Example :
* next_audit_date = May 4 , 2025
* threshold for alerts = 30 days
* now = May 4 , 2019
*
* @ author A . Gianotto < snipe @ snipe . net >
* @ since v4 . 6.16
* @ param Setting $settings
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeDueForAudit ( $query , $settings )
{
2019-11-21 21:34:41 -08:00
$interval = $settings -> audit_warning_days ? ? 0 ;
2019-05-05 19:32:52 -07:00
return $query -> whereNotNull ( 'assets.next_audit_date' )
-> where ( 'assets.next_audit_date' , '>=' , Carbon :: now ())
2019-11-21 21:34:41 -08:00
-> whereRaw ( " DATE_SUB(assets.next_audit_date, INTERVAL $interval DAY) <= ' " . Carbon :: now () . " ' " )
2019-05-05 19:32:52 -07:00
-> where ( 'assets.archived' , '=' , 0 )
-> NotArchived ();
}
/**
* Query builder scope for Assets that are OVERDUE for auditing , based on the assets . next_audit_date
* and settings . audit_warning_days . It checks to see if assets . next audit_date is before now
*
* This is / will be used in the artisan command snipeit : upcoming - audits and also
* for an upcoming API call for retrieving a report on overdue assets .
*
* @ author A . Gianotto < snipe @ snipe . net >
* @ since v4 . 6.16
* @ param Setting $settings
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeOverdueForAudit ( $query )
{
return $query -> whereNotNull ( 'assets.next_audit_date' )
-> where ( 'assets.next_audit_date' , '<' , Carbon :: now ())
-> where ( 'assets.archived' , '=' , 0 )
-> NotArchived ();
}
/**
* Query builder scope for Assets that are due for auditing OR overdue , based on the assets . next_audit_date
* and settings . audit_warning_days .
*
* This is / will be used in the artisan command snipeit : upcoming - audits and also
* for an upcoming API call for retrieving a report on assets that will need to be audited .
*
* @ author A . Gianotto < snipe @ snipe . net >
* @ since v4 . 6.16
* @ param Setting $settings
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeDueOrOverdueForAudit ( $query , $settings )
{
2019-07-18 14:37:48 -07:00
$interval = $settings -> audit_warning_days ? ? 0 ;
2019-05-05 19:32:52 -07:00
return $query -> whereNotNull ( 'assets.next_audit_date' )
Squashed commit of the following:
commit e321aeabaed580f8de6ee309b377654620f117be
Merge: 8ec99ff43 37568ae9e
Author: snipe <snipe@snipe.net>
Date: Mon Aug 31 12:14:44 2020 -0700
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
commit 37568ae9ec021789d910de91bdef5f64e517451a
Merge: 01a832169 32ad9050c
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:49:37 2020 -0700
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cff8a9bfc89e5a832a9bbf1ad03dadd3
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:48:53 2020 -0700
Added google maps to CSP
commit 01a832169c7572960340e743e569fe9ffdc3f996
Merge: bcad49ce7 3c6883489
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:38:31 2020 -0700
Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489c030df8d90e2f18cab3ad96121205e5
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:37:30 2020 -0700
Added assignedTo scope
commit bcad49ce79ad7aab99bec8b273a78bb531c48ef0
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:10:22 2020 -0700
Try to better handle slack “too many requests” issue
commit b5acca89d72a43f42fb81a4bf06e8b7c3da0b93b
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:02:15 2020 -0700
Check for admin for slack notifications
commit e52919cf1b17871c6bf294cfb1a9be59f6033289
Merge: 714576be4 29f3a5c48
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:35:15 2020 -0700
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f9b9fc4fcfb19cc6eebb1ce1e0e5a91
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:27:40 2020 -0700
Use more verbose annotation for Auth::user if/else
commit 134e8e6fb9958e71b8fa960de53c041324bd9e1c
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:25:07 2020 -0700
Moved user email nulling until after the save
commit 714576be45dabe9a2b23d3090ec0c72ab8ec28da
Merge: b999c50a2 512899294
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Aug 14 15:24:03 2020 -0700
Merge pull request #8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 5128992940b8565e5e87a2a917d3bcde8e21b711
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Fri Aug 14 15:03:03 2020 -0700
Fix deprecation report for customers with many active assets
commit 02913235020d242e959f274fec588d9ebf8e39fa
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:57:58 2020 -0700
Use the user as the target
commit e0f6f9b83972ef9fde79dbc342555580a0574591
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:37 2020 -0700
Artisan command to check in licenses from all users
commit f1a6308002caa865fe1a9b17b91d34fbfdd94a75
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:07 2020 -0700
Check for Auth::user before trying to log id (for cli)
commit b999c50a2eef14bdf44be8e4359f794194170d2d
Merge: 9ca20e496 e3906b245
Author: snipe <snipe@snipe.net>
Date: Wed Aug 12 12:37:47 2020 -0700
Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9b85eca723bffa88b9af28f290e0fe
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 12 12:27:18 2020 -0700
added translation for admin/licenses/message.not_found
commit 9ca20e4964e57621af8f6b2e790e0d68b69b1afb
Merge: e0644dbbf 456a74d88
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Aug 11 17:33:19 2020 -0700
Merge pull request #8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c1b1f14828aaf63e5122eb8b6831755
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:41:20 2020 -0700
De-merge out incorrectly merged files. Whoops!
commit 799c059070eff849c81550423d16344748522bc7
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:21:18 2020 -0700
Add internationalized version of LDAP error message
commit c62d43a77831dd798054b95e7ad9e72210f6accf
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:04:17 2020 -0700
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
commit b725bd0fae2b062d81a460283aa07b2186a99197
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:23:04 2020 -0700
Add @PeterUpfold as a contributor
commit e0644dbbf6b5601b6712ca16877b481799e9652c
Merge: 5b6925b00 004ecad05
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Mon Aug 10 17:22:31 2020 -0700
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00c04b1abdea0235d04dda32c89215201
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 21:00:37 2020 -0700
Removed debugging :(
commit df17a859bfab8876d3e849c42692e01bdfdbd886
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:59:54 2020 -0700
Changed modal IDs so manager creation modal works on user creation main page
commit 24c43056ba9e738334eb2310db7c9920d9ab0613
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:58:28 2020 -0700
Moved pGenerator script to default layout footer
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
commit 606b7e905df1918336cef64984e54207ca6a7644
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 17:02:33 2020 -0700
Small edits to PR template
Slight text changes to ask specifics about versions
commit d73ddad477cb9c675f15fbd54bdb1486bf8f14fc
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 16:59:26 2020 -0700
Created a PR template
First draft of the PR guidelines template
commit 9a39cf721e82aa25623e41eeb280d7bed3b3c178
Merge: 7410b1683 8994f3e15
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 12:18:49 2020 -0700
Merge pull request #8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835bab1563bf2b7baaddb55377083a3a0
Merge: e955c983a b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Jul 24 16:22:44 2020 -0700
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15e9fef5d1ec9c44764b424fa7edf9448
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 19:57:06 2020 -0400
cleanup
commit d23f1a77cac396a3a4962c5993cf1bdbfcf52a29
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 18:46:02 2020 -0400
implement checkout API
commit e955c983a3a9bd7793cf9a5f63b6e2c56d53d63f
Merge: 2fa17ac18 eed41e454
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 13:43:29 2020 -0700
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b3bc424d5960de9f5ffd272b2f19c272
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Wed Jul 22 13:32:16 2020 -0700
Add new useraccountcontrol value for valid AD users; document algorithm and values
commit 2fa17ac18557969f5627953f6d041610207656a6
Merge: b90515437 3b1e46f72
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 12:06:31 2020 -0700
Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b81bd27e5ba0783c88f9d0d0038d611
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:25:57 2020 -0700
Update general.php
commit 0c1a1de2a21dfd3639e3d2d2df995c3452c15a11
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:24:36 2020 -0700
Update general.php
fixed typo
commit 20c9ae5818ae22846bf2149f261e7f70cc8a7c71
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 22 10:21:19 2020 -0700
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
commit eed41e454962bb6e9e6cbcf79cb4aed292ac2bbf
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:57:32 2020 -0700
Moved address down further, fixed broken HTML
commit b750f4754f5f4245c0f490f6b6832b4c10615f27
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:54 2020 -0700
Added city to bulk user importer
commit c17a06792a76ee11215bd576f2df9732416b3e9d
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:38 2020 -0700
Added address, city, state, country to user importer
commit 4f76cc6cfbad1eeded1981e8569e915ca37b87d9
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:46:13 2020 -0700
I don’t actually know what this file is for
commit b905154373bcf0b1ef64d57bb95f184557caba37
Author: snipe <snipe@snipe.net>
Date: Mon Jul 20 14:29:32 2020 -0700
Fixed #8247 - added notes field to user details display
commit daf748e531324215bfd746b406407fee7476d0ab
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:32:01 2020 -0700
Bumped hash
commit 799a93c46a198a8235bbce1527ea7bf4929129c2
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:11:32 2020 -0700
Allow for email/username search on users
commit 34aa12e229fef497b355a492b5ef2c003337786b
Merge: 81a633288 897757bd0
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:44:13 2020 -0700
Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd0461cefd2e82aba344d416ed6843c49c
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:43:44 2020 -0700
Removed added line for location
commit c7125c39375b101f852930536dabcc079f2d5e88
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 16:34:39 2020 -0700
Set location_id to rtd_location_id on asset creation
commit 81a6332889e9e4684ee65a669bc2b3bc1a3ced50
Author: snipe <snipe@snipe.net>
Date: Tue Jul 14 13:55:38 2020 -0700
Removed license ID from seats table cookie info
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
commit 6e563f6e4bfd9f8b52c8c8d39a60b466e64ba654
Merge: 5320f5c67 7f69ae953
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:54 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 5320f5c67ce7dbf4605cc5b7fd7be8773c8ee157
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:45 2020 -0700
Disallow non-super users from editing their own permissions
commit 7f69ae953b7990107bd0db3de16621e5238136e9
Merge: c79f8c1ba 17f6fbabf
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:00 2020 -0700
Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfaa15f203a6accecf6a7b83c35d56ef8
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 21:12:03 2020 -0700
Switch to 'items' to maintain compatbility with other internal API's
commit c79f8c1baf920f41d43827094691275eec529448
Merge: 12c92e30b 536401fe0
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 17:42:16 2020 -0700
Merge pull request #8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c91c14280f96e0e58f9921f73cf88c43
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 17:14:31 2020 -0700
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 12c92e30b7a20ecd0e45b5a052b43c81dd35cc97
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 16:21:27 2020 -0700
Show whether or not the user was imported via LDAP in the view page
commit fd10b755b0241e354a265454c13965228a265a85
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 11:30:01 2020 -0700
Removed the sr-only tag in table headers
It was breaking Bootstrap Tables column selector :(
commit dbbb7680d9d92ab42ffcca825fd93ff6cc3e5f89
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 21:12:50 2020 -0700
A few more fixes for the cli
Do not check out a piece of software if it’s already been checked out to the user
commit cf0dd5bbadef3689dd9110d96e7d060ddb5fc827
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:43:13 2020 -0700
Small fixes for cli tool
commit 25e53d8c7f4ba1d5977bb5fbc5265ac9c8c543d9
Merge: ec6ed256f 89d433b41
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:27:01 2020 -0700
Merge pull request #8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41aa0de862cb60142c8d6ef80f339a958
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:26:02 2020 -0700
Removed duplicate seat call
commit e2570ada6f158dfc9acead583a0b2fa7fae17ca6
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:04:05 2020 -0700
CLI tool to checkout a license to ALL users
commit 45afe725a1f039dddd87537e16470963684f0711
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:03:47 2020 -0700
Only try to get the company if there is an auth’d user
(Needed for command line tools, where no Auth::user() is present)
commit 536401fe0ff97cd6a8077cef993bfe755ed46851
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com>
Date: Tue Jul 7 08:21:36 2020 +0200
Update snipeit.sh
Ubuntu 20.04
commit ec6ed256fbc7740f76ee22867b6fe2008ff7873e
Author: snipe <snipe@snipe.net>
Date: Mon Jul 6 18:45:43 2020 -0700
Bumped minor version
commit 2aaa7bed2d4fad6e8f7b101ecdae1f46ab8a00c2
Merge: 339bdddc3 cc9f1577a
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 18:37:41 2020 -0700
Merge pull request #8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a47708a6e11dffeab4797982be243cfa
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:43:53 2020 -0700
Removed unused use directives
commit ab1fe8be0c72522273c468dfd5551553d9f92665
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:42:39 2020 -0700
Added merge utility
commit 339bdddc384aa655fa186dc36e02cc587487d4af
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 11:00:33 2020 -0700
Fix for Vue js not loading due to CSP :(
commit 35b9cf4b703b9ced785daec1d35973ca266cdc49
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 02:41:59 2020 -0700
Fixed missing db prefix on scopeDueOrOverdueForAudit
commit 7ccb41371e0efc46d51abc790f49a9fb73e9b8bc
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:09:39 2020 -0700
Removed unoptimized images directive
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
commit 2e60a457bf45640a0563a2bc4b66e02b0d226271
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:07:00 2020 -0700
Dumb fix for feature-policy being dumb.
commit 2390d2160bff7b4b340696fa527b1bc871bddff1
Merge: b42801f6a 00b051b8c
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:27:47 2020 -0700
Merge pull request #8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c7f1af5218a11f2b33fcab37934bd894
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:26:09 2020 -0700
Added a few more comments
commit 05b3a9ad7e72cc71b09ed8ef2e87db19fa3700ee
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 23:17:27 2020 -0700
Config variable for HSTS
commit 4fb880384fd455bd59a3b91c4244c392d7198c48
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:37:14 2020 -0700
Changed comment
commit 43042ad8412d8d89a9b09e47e5da8b276c9655f2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:35:59 2020 -0700
Consolidated ReferrerPolicy into new SecurityHeaders file
commit a716382ac43d0a58b96604a3ec15e389b7ae97c2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:33:37 2020 -0700
Removed CSP middleware (it’s added in the general header)
commit 36c8f7f4f116666c63ae7bc0d12e15f77a8fd6bc
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:31:01 2020 -0700
Additional security headers
commit b42801f6ae635e843d9e062b4119d86fb3d05fc6
Merge: de4934f21 946129f20
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:47:35 2020 -0700
Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f20614e65bbbecbbda70cfba81b89d0937
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:45:20 2020 -0700
Made quote style consistent
commit b941ef1e08f84f40f503db6ebe67d0e8dca9c74a
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:41:40 2020 -0700
Pulled CSS font awesome styles out of the blade and into overrides.css
commit d1aa11ec89347fb2c139d751719c4459c2448321
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:29:19 2020 -0700
Fix for weird padlock display in asset listing with encrypted custom fields
commit de4934f21d34a628e57992fc6a59813f42c55d90
Merge: af06e4205 b10076b01
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 17:28:38 2020 -0700
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015ac0034fded62548135aaff3f1b2a0a
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Jun 22 17:04:39 2020 -0700
corrected an error where font-size for labels were static in settings.
commit af06e4205627b29f583b2e2e770fd2913fce5e46
Author: snipe <snipe@snipe.net>
Date: Wed Jun 17 11:17:25 2020 -0700
Bumped version
commit 9a2440dc4b98a9c12b38a04504875c7c196a510c
Merge: beae8efb2 2ac1c1636
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 20:20:07 2020 -0700
Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c672db59d601bd5c73d4a8023533ec9
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 16:12:57 2020 -0700
Better handle the logic to determine if we should display the license checkout blade
commit 004ecad059d636cc5be62aa5f112e3c4f9762326
Author: Peter Upfold <pgithub@upfold.org.uk>
Date: Wed Jun 3 08:59:50 2020 +0100
Force suppress deprecation warning on ldap_control_paged_result()
commit beae8efb21c2675b3da4308a87d911c534e70361
Merge: d14ab7e3e 9839e5e56
Author: snipe <snipe@snipe.net>
Date: Wed May 27 23:01:33 2020 -0700
Merge pull request #8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566f51f85abe6860dfc8377042834c89b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed May 27 12:27:40 2020 -0700
adjusted for all label text, removed local variable
commit d14ab7e3e1bf09c931ad148fdb6b65ee5a3dc7b8
Author: snipe <snipe@snipe.net>
Date: Wed May 27 00:22:44 2020 -0700
Porting change from #8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c179730f8b8502da5e2c1c90fa8ec594
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:22:45 2020 -0700
Label_Woes
commit e97cf011b65df9e66826c26464fed7bf4001917a
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:15:39 2020 -0700
Label_Woes
commit ed23505054cd1bdf2ef695b6b010e025382f38da
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:10:45 2020 -0700
Label_Woes
commit 001e721530c41fd8ad8e925cecdef2eb8c96ab4c
Merge: f88683766 8210da6e8
Author: snipe <snipe@snipe.net>
Date: Wed May 20 10:21:52 2020 -0700
Merge pull request #8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82018afab07197abe591a7666a56af21
Author: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Wed May 20 10:29:27 2020 -0400
Fix Missing Category selection in Asset Model Modal dialog.
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
commit f88683766b1c7e9636aebe2fc952e6f036d3882c
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:55:47 2020 -0700
Roll back previous change
Signed-off-by: snipe <snipe@snipe.net>
commit e4385c0f8c584061670a1f98b13bbe90a124ac05
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:48:30 2020 -0700
Fixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa4e5569bd7ca28354ca282ca2ef2825
Author: snipe <snipe@snipe.net>
Date: Tue May 12 10:31:54 2020 -0700
Fix for session fixation vulnerability
Signed-off-by: snipe <snipe@snipe.net>
commit 7fb3a9b82c09b3aab65bf2b00f76efc66356155e
Merge: 9a2ed804c ecb1e87fe
Author: snipe <snipe@snipe.net>
Date: Mon May 11 22:41:36 2020 -0700
Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6e7ab67900936a0f158670cc4c21c56
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:45:15 2020 -0700
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit f43df5f04147ded31cc625ef92f87127993e94b3
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:44:46 2020 -0700
Fixed form label
Signed-off-by: snipe <snipe@snipe.net>
commit 95cc48e422e54b373d3a88d20d15d7536a323dce
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:41:10 2020 -0700
Added option to disable backup in import
Signed-off-by: snipe <snipe@snipe.net>
commit 9a2ed804ca9f71a9705da604a2c721ceeb9a5567
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:42 2020 -0700
Fixed mismatched HTML header tags
Signed-off-by: snipe <snipe@snipe.net>
commit d20fad28e5e807c7577d9bd0e5146e5607affa33
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:24 2020 -0700
Use more modern request helper
Signed-off-by: snipe <snipe@snipe.net>
commit ae813ddf75b21c45420016033c667ee35a9fc52b
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:11:16 2020 -0700
Add @alek13 as a contributor
commit bb42109c0c76b6709f39190ae4a1daa55865d306
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:10:45 2020 -0700
Added a clarifying comment
Signed-off-by: snipe <snipe@snipe.net>
commit f46ecf8ec0c1723e2e04036357c74644c30d4cb7
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:20 2020 -0700
Updated composer lock
Signed-off-by: snipe <snipe@snipe.net>
commit b9e821c0e65e0745064b42aa6cccf9627c5df3e6
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:14 2020 -0700
Small fix for Group Functional Tests
Signed-off-by: snipe <snipe@snipe.net>
commit 9ee28c7513616018f8ff0b8f5b167469e19070eb
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:02 2020 -0700
Switched to use info instead of danger on undeployable statuses
Signed-off-by: snipe <snipe@snipe.net>
commit 1a8ba06702727b1de870d05df53443270b35b8b7
Merge: 0fd232e70 ee4d69b1c
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:32 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 0fd232e70d2be9ce845a73745ac98800bcfef9e2
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:24 2020 -0700
Fixed group functional test
(We had changed the minimum to 2 instead of 3)
Signed-off-by: snipe <snipe@snipe.net>
commit ee4d69b1c59c6baf832574da9e9bbbe67248a4bc
Merge: 31c535094 d1ad11194
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:52:45 2020 -0700
Merge pull request #8041 from alek13/patch-1
use supported package for slack
commit d1ad11194936c51050d2e7a77d01c0daa1dde4fd
Author: Alexander Chibrikin <alek13.me@gmail.com>
Date: Mon May 11 20:31:13 2020 +0300
use supported package for slack
see https://github.com/maknz/slack/issues/94
commit 31c5350941c7330aed01652b0670b61f6660b15b
Author: snipe <snipe@snipe.net>
Date: Fri May 1 01:05:48 2020 -0700
Fixed incorrect route for groups edit
Signed-off-by: snipe <snipe@snipe.net>
commit 7eb70e17e0b4d0f1ed1fe3ed7fbff1728eb077fb
Merge: 5bb4f271a 3dfcb4699
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:50:37 2020 -0700
Merge pull request #7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb469910456b3213e00c5cd2f839d25dbf2c7
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:41:08 2020 -0700
Minor formatting changes
Signed-off-by: snipe <snipe@snipe.net>
commit 96eb96f964c40b798d5ceed25eff2bbef4f0bc51
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:27:00 2020 -0700
Removed stray val (typo)
Signed-off-by: snipe <snipe@snipe.net>
commit a2f08bd3baa6fb23633ceb58e5408b125b0f0029
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:08:54 2020 -0700
Added comments
Signed-off-by: snipe <snipe@snipe.net>
commit e009fbe59f39a717a4ad7bea5027d39cb5323225
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:04:53 2020 -0700
Converted table heading icons in People to CSS glyphs
Signed-off-by: snipe <snipe@snipe.net>
commit 5bb4f271aaa42a0c211d25e06a500a76c5a224f4
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 00:47:19 2020 -0700
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
-> whereRaw ( " DATE_SUB( " . DB :: getTablePrefix () . " assets.next_audit_date, INTERVAL $interval DAY) <= ' " . Carbon :: now () . " ' " )
2019-05-05 19:32:52 -07:00
-> where ( 'assets.archived' , '=' , 0 )
-> NotArchived ();
}
2016-03-25 01:18:05 -07:00
/**
* Query builder scope for Archived assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeArchived ( $query )
{
return $query -> whereHas ( 'assetstatus' , function ( $query ) {
$query -> where ( 'deployable' , '=' , 0 )
-> where ( 'pending' , '=' , 0 )
-> where ( 'archived' , '=' , 1 );
});
}
/**
* Query builder scope for Deployed assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeDeployed ( $query )
{
return $query -> where ( 'assigned_to' , '>' , '0' );
}
/**
* Query builder scope for Requestable assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeRequestableAssets ( $query )
{
2016-07-26 16:22:56 -07:00
return Company :: scopeCompanyables ( $query -> where ( 'requestable' , '=' , 1 ))
2016-04-19 20:23:04 -07:00
-> whereHas ( 'assetstatus' , function ( $query ) {
2016-06-22 12:27:41 -07:00
$query -> where ( 'deployable' , '=' , 1 )
2016-04-19 20:23:04 -07:00
-> where ( 'pending' , '=' , 0 )
-> where ( 'archived' , '=' , 0 );
});
2016-03-25 01:18:05 -07:00
}
/**
* scopeInModelList
* Get all assets in the provided listing of model ids
*
* @ param $query
* @ param array $modelIdListing
*
* @ return mixed
* @ author Vincent Sposato < vincent . sposato @ gmail . com >
* @ version v1 . 0
*/
public function scopeInModelList ( $query , array $modelIdListing )
{
2017-11-08 20:03:26 -08:00
return $query -> whereIn ( 'assets.model_id' , $modelIdListing );
2016-03-25 01:18:05 -07:00
}
/**
* Query builder scope to get not - yet - accepted assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeNotYetAccepted ( $query )
{
return $query -> where ( " accepted " , " = " , " pending " );
}
/**
* Query builder scope to get rejected assets
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeRejected ( $query )
{
return $query -> where ( " accepted " , " = " , " rejected " );
}
/**
* Query builder scope to get accepted assets
*
2017-06-15 19:42:43 -07:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
*
2017-06-15 19:42:43 -07:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeAccepted ( $query )
{
2016-07-15 11:11:48 -07:00
return $query -> where ( " accepted " , " = " , " accepted " );
2016-03-25 01:18:05 -07:00
}
2017-11-16 16:49:16 -08:00
/**
* Query builder scope to search on text for complex Bootstrap Tables API .
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $search Search term
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeAssignedSearch ( $query , $search )
{
$search = explode ( ' OR ' , $search );
return $query -> leftJoin ( 'users as assets_users' , function ( $leftJoin ) {
$leftJoin -> on ( " assets_users.id " , " = " , " assets.assigned_to " )
-> where ( " assets.assigned_type " , " = " , User :: class );
}) -> leftJoin ( 'locations as assets_locations' , function ( $leftJoin ) {
$leftJoin -> on ( " assets_locations.id " , " = " , " assets.assigned_to " )
-> where ( " assets.assigned_type " , " = " , Location :: class );
}) -> leftJoin ( 'assets as assigned_assets' , function ( $leftJoin ) {
$leftJoin -> on ( 'assigned_assets.id' , '=' , 'assets.assigned_to' )
-> where ( 'assets.assigned_type' , '=' , Asset :: class );
}) -> where ( function ( $query ) use ( $search ) {
foreach ( $search as $search ) {
$query -> whereHas ( 'model' , function ( $query ) use ( $search ) {
$query -> whereHas ( 'category' , function ( $query ) use ( $search ) {
$query -> where ( function ( $query ) use ( $search ) {
$query -> where ( 'categories.name' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'models.name' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'models.model_number' , 'LIKE' , '%' . $search . '%' );
});
});
}) -> orWhereHas ( 'model' , function ( $query ) use ( $search ) {
$query -> whereHas ( 'manufacturer' , function ( $query ) use ( $search ) {
$query -> where ( function ( $query ) use ( $search ) {
$query -> where ( 'manufacturers.name' , 'LIKE' , '%' . $search . '%' );
});
});
}) -> orWhere ( function ( $query ) use ( $search ) {
$query -> where ( 'assets_users.first_name' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'assets_users.last_name' , 'LIKE' , '%' . $search . '%' )
2021-09-06 22:15:21 -07:00
-> orWhereRaw ( 'CONCAT(' . DB :: getTablePrefix () . 'assets_users.first_name," ",' . DB :: getTablePrefix () . 'assets_users.last_name) LIKE ?' , [ " % $search % " ])
2017-11-16 16:49:16 -08:00
-> orWhere ( 'assets_users.username' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'assets_locations.name' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'assigned_assets.name' , 'LIKE' , '%' . $search . '%' );
2016-03-25 01:18:05 -07:00
}) -> orWhere ( 'assets.name' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'assets.asset_tag' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'assets.serial' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'assets.order_number' , 'LIKE' , '%' . $search . '%' )
-> orWhere ( 'assets.notes' , 'LIKE' , '%' . $search . '%' );
}
2019-05-24 13:50:11 -07:00
2017-09-29 01:21:08 -07:00
}) -> withTrashed () -> whereNull ( " assets.deleted_at " ); //workaround for laravel bug
2016-03-25 01:18:05 -07:00
}
2018-10-31 15:19:13 -07:00
/**
* Query builder scope to search the department ID of users assigned to assets
*
* @ author [ A . Gianotto ] [ < snipe @ snipe . net > ]
* @ since [ v5 . 0 ]
* @ return string | false
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeCheckedOutToTargetInDepartment ( $query , $search )
{
return $query -> leftJoin ( 'users as assets_dept_users' , function ( $leftJoin ) {
$leftJoin -> on ( " assets_dept_users.id " , " = " , " assets.assigned_to " )
-> where ( " assets.assigned_type " , " = " , User :: class );
}) -> where ( function ( $query ) use ( $search ) {
$query -> where ( 'assets_dept_users.department_id' , '=' , $search );
}) -> withTrashed () -> whereNull ( " assets.deleted_at " ); //workaround for laravel bug
}
2017-03-11 04:26:01 -08:00
/**
* Query builder scope to search on text filters for complex Bootstrap Tables API
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $filter JSON array of search keys and terms
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeByFilter ( $query , $filter )
{
return $query -> where ( function ( $query ) use ( $filter ) {
foreach ( $filter as $key => $search_val ) {
2017-10-18 10:07:35 -07:00
$fieldname = str_replace ( 'custom_fields.' , '' , $key ) ;
if ( $fieldname == 'asset_tag' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'assets.asset_tag' , 'LIKE' , '%' . $search_val . '%' );
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'name' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'assets.name' , 'LIKE' , '%' . $search_val . '%' );
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'product_key' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'assets.serial' , 'LIKE' , '%' . $search_val . '%' );
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'purchase_date' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'assets.purchase_date' , 'LIKE' , '%' . $search_val . '%' );
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'purchase_cost' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'assets.purchase_cost' , 'LIKE' , '%' . $search_val . '%' );
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'notes' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'assets.notes' , 'LIKE' , '%' . $search_val . '%' );
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'order_number' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'assets.order_number' , 'LIKE' , '%' . $search_val . '%' );
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'status_label' ) {
2017-03-11 04:26:01 -08:00
$query -> whereHas ( 'assetstatus' , function ( $query ) use ( $search_val ) {
$query -> where ( 'status_labels.name' , 'LIKE' , '%' . $search_val . '%' );
});
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'location' ) {
2017-11-02 08:06:10 -07:00
$query -> whereHas ( 'location' , function ( $query ) use ( $search_val ) {
2017-03-11 04:26:01 -08:00
$query -> where ( 'locations.name' , 'LIKE' , '%' . $search_val . '%' );
});
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'checkedout_to' ) {
2017-10-05 00:35:37 -07:00
$query -> whereHas ( 'assigneduser' , function ( $query ) use ( $search_val ) {
$query -> where ( function ( $query ) use ( $search_val ) {
$query -> where ( 'users.first_name' , 'LIKE' , '%' . $search_val . '%' )
-> orWhere ( 'users.last_name' , 'LIKE' , '%' . $search_val . '%' );
2017-03-11 04:26:01 -08:00
});
});
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'manufacturer' ) {
2017-03-11 04:26:01 -08:00
$query -> whereHas ( 'model' , function ( $query ) use ( $search_val ) {
$query -> whereHas ( 'manufacturer' , function ( $query ) use ( $search_val ) {
$query -> where ( function ( $query ) use ( $search_val ) {
$query -> where ( 'manufacturers.name' , 'LIKE' , '%' . $search_val . '%' );
});
});
});
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'category' ) {
2017-10-05 00:35:37 -07:00
$query -> whereHas ( 'model' , function ( $query ) use ( $search_val ) {
$query -> whereHas ( 'category' , function ( $query ) use ( $search_val ) {
2017-03-11 04:26:01 -08:00
$query -> where ( function ( $query ) use ( $search_val ) {
$query -> where ( 'categories.name' , 'LIKE' , '%' . $search_val . '%' )
-> orWhere ( 'models.name' , 'LIKE' , '%' . $search_val . '%' )
-> orWhere ( 'models.model_number' , 'LIKE' , '%' . $search_val . '%' );
});
});
});
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'model' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( function ( $query ) use ( $search_val ) {
$query -> whereHas ( 'model' , function ( $query ) use ( $search_val ) {
$query -> where ( 'models.name' , 'LIKE' , '%' . $search_val . '%' );
});
});
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'model_number' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( function ( $query ) use ( $search_val ) {
$query -> whereHas ( 'model' , function ( $query ) use ( $search_val ) {
$query -> where ( 'models.model_number' , 'LIKE' , '%' . $search_val . '%' );
});
});
}
2017-10-18 10:07:35 -07:00
if ( $fieldname == 'company' ) {
2017-03-11 04:26:01 -08:00
$query -> where ( function ( $query ) use ( $search_val ) {
$query -> whereHas ( 'company' , function ( $query ) use ( $search_val ) {
$query -> where ( 'companies.name' , 'LIKE' , '%' . $search_val . '%' );
});
});
}
2018-04-25 20:25:03 -07:00
if ( $fieldname == 'supplier' ) {
$query -> where ( function ( $query ) use ( $search_val ) {
$query -> whereHas ( 'supplier' , function ( $query ) use ( $search_val ) {
$query -> where ( 'suppliers.name' , 'LIKE' , '%' . $search_val . '%' );
});
});
}
2017-03-11 04:26:01 -08:00
}
2019-07-31 14:24:01 -07:00
/**
* THIS CLUNKY BIT IS VERY IMPORTANT
*
* Although inelegant , this section matters a lot when querying against fields that do not
* exist on the asset table . There ' s probably a better way to do this moving forward , for
* example using the Schema :: methods to determine whether or not a column actually exists ,
* or even just using the $searchableRelations variable earlier in this file .
*
* In short , this set of statements tells the query builder to ONLY query against an
* actual field that 's being passed if it doesn' t meet known relational fields . This
* allows us to query custom fields directly in the assetsv table
* ( regardless of their name ) and * skip * any fields that we already know can only be
* searched through relational searches that we do earlier in this method .
*
* For example , we do not store " location " as a field on the assets table , we store
* that relationship through location_id on the assets table , therefore querying
* assets . location would fail , as that field doesn 't exist -- plus we' re already searching
* against those relationships earlier in this method .
*
* - snipe
*
*/
2019-07-31 13:55:21 -07:00
if (( $fieldname != 'category' ) && ( $fieldname != 'model_number' ) && ( $fieldname != 'rtd_location' ) && ( $fieldname != 'location' ) && ( $fieldname != 'supplier' )
2017-12-05 14:23:46 -08:00
&& ( $fieldname != 'status_label' ) && ( $fieldname != 'model' ) && ( $fieldname != 'company' ) && ( $fieldname != 'manufacturer' )) {
2017-11-06 10:26:09 -08:00
$query -> orWhere ( 'assets.' . $fieldname , 'LIKE' , '%' . $search_val . '%' );
2017-11-02 08:06:10 -07:00
}
2017-10-18 10:07:35 -07:00
2017-10-05 23:09:02 -07:00
2017-03-11 04:26:01 -08:00
});
2017-10-05 23:09:02 -07:00
2017-03-11 04:26:01 -08:00
}
2016-03-25 01:18:05 -07:00
/**
* Query builder scope to order on model
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
* @ param text $order Order
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeOrderModels ( $query , $order )
{
2017-11-16 14:14:30 -08:00
return $query -> join ( 'models as asset_models' , 'assets.model_id' , '=' , 'asset_models.id' ) -> orderBy ( 'asset_models.name' , $order );
2016-03-25 01:18:05 -07:00
}
2016-06-27 22:32:40 -07:00
/**
* Query builder scope to order on model number
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-06-27 22:32:40 -07:00
* @ param text $order Order
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-06-27 22:32:40 -07:00
*/
public function scopeOrderModelNumber ( $query , $order )
{
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
return $query -> join ( 'models' , 'assets.model_id' , '=' , 'models.id' ) -> orderBy ( 'models.model_number' , $order );
2016-06-27 22:32:40 -07:00
}
2016-03-25 01:18:05 -07:00
2016-11-11 19:46:25 -08:00
/**
* Query builder scope to order on assigned user
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-11-11 19:46:25 -08:00
* @ param text $order Order
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-11-11 19:46:25 -08:00
*/
2016-03-25 01:18:05 -07:00
public function scopeOrderAssigned ( $query , $order )
{
2017-11-02 13:47:37 -07:00
return $query -> leftJoin ( 'users as users_sort' , 'assets.assigned_to' , '=' , 'users_sort.id' ) -> select ( 'assets.*' ) -> orderBy ( 'users_sort.first_name' , $order ) -> orderBy ( 'users_sort.last_name' , $order );
2016-03-25 01:18:05 -07:00
}
/**
* Query builder scope to order on status
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
* @ param text $order Order
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeOrderStatus ( $query , $order )
{
2017-11-02 13:47:37 -07:00
return $query -> join ( 'status_labels as status_sort' , 'assets.status_id' , '=' , 'status_sort.id' ) -> orderBy ( 'status_sort.name' , $order );
2016-03-25 01:18:05 -07:00
}
2017-05-15 20:55:39 -07:00
/**
2016-03-25 01:18:05 -07:00
* Query builder scope to order on company
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
* @ param text $order Order
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeOrderCompany ( $query , $order )
{
2017-11-02 13:47:37 -07:00
return $query -> leftJoin ( 'companies as company_sort' , 'assets.company_id' , '=' , 'company_sort.id' ) -> orderBy ( 'company_sort.name' , $order );
2016-03-25 01:18:05 -07:00
}
2017-02-03 19:34:24 -08:00
/**
* Query builder scope to return results of a category
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $order Order
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeInCategory ( $query , $category_id )
{
2018-09-07 03:19:54 -07:00
return $query -> join ( 'models as category_models' , 'assets.model_id' , '=' , 'category_models.id' )
-> join ( 'categories' , 'category_models.category_id' , '=' , 'categories.id' ) -> where ( 'category_models.category_id' , '=' , $category_id );
2017-02-03 19:34:24 -08:00
}
2017-02-03 19:52:00 -08:00
/**
* Query builder scope to return results of a manufacturer
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $order Order
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeByManufacturer ( $query , $manufacturer_id )
{
return $query -> join ( 'models' , 'assets.model_id' , '=' , 'models.id' )
2017-03-14 08:37:39 -07:00
-> join ( 'manufacturers' , 'models.manufacturer_id' , '=' , 'manufacturers.id' ) -> where ( 'models.manufacturer_id' , '=' , $manufacturer_id );
2017-02-03 19:52:00 -08:00
}
2017-02-03 19:34:24 -08:00
/**
* Query builder scope to order on category
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $order Order
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
2016-03-25 01:18:05 -07:00
public function scopeOrderCategory ( $query , $order )
{
2017-11-02 13:47:37 -07:00
return $query -> join ( 'models as order_model_category' , 'assets.model_id' , '=' , 'order_model_category.id' )
-> join ( 'categories as category_order' , 'order_model_category.category_id' , '=' , 'category_order.id' )
-> orderBy ( 'category_order.name' , $order );
2016-03-25 01:18:05 -07:00
}
2016-05-12 10:38:57 -07:00
/**
* Query builder scope to order on manufacturer
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-05-12 10:38:57 -07:00
* @ param text $order Order
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-05-12 10:38:57 -07:00
*/
public function scopeOrderManufacturer ( $query , $order )
{
return $query -> join ( 'models' , 'assets.model_id' , '=' , 'models.id' )
-> join ( 'manufacturers' , 'models.manufacturer_id' , '=' , 'manufacturers.id' )
-> orderBy ( 'manufacturers.name' , $order );
}
2017-02-08 03:31:42 -08:00
/**
2016-06-28 12:19:14 -07:00
* Query builder scope to order on location
2016-03-25 01:18:05 -07:00
*
2017-02-03 19:34:24 -08:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
2016-03-25 01:18:05 -07:00
* @ param text $order Order
*
2017-02-03 19:34:24 -08:00
* @ return \Illuminate\Database\Query\Builder Modified query builder
2016-03-25 01:18:05 -07:00
*/
public function scopeOrderLocation ( $query , $order )
{
2017-11-16 16:49:48 -08:00
return $query -> leftJoin ( 'locations as asset_locations' , 'asset_locations.id' , '=' , 'assets.location_id' ) -> orderBy ( 'asset_locations.name' , $order );
2016-03-25 01:18:05 -07:00
}
2017-02-08 03:31:42 -08:00
2018-01-24 14:27:12 -08:00
/**
* Query builder scope to order on default
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $order Order
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeOrderRtdLocation ( $query , $order )
{
return $query -> leftJoin ( 'locations as rtd_asset_locations' , 'rtd_asset_locations.id' , '=' , 'assets.rtd_location_id' ) -> orderBy ( 'rtd_asset_locations.name' , $order );
}
2017-05-15 20:55:39 -07:00
/**
* Query builder scope to order on supplier name
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $order Order
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeOrderSupplier ( $query , $order )
{
2017-11-03 13:28:57 -07:00
return $query -> leftJoin ( 'suppliers as suppliers_assets' , 'assets.supplier_id' , '=' , 'suppliers_assets.id' ) -> orderBy ( 'suppliers_assets.name' , $order );
2017-05-15 20:55:39 -07:00
}
2017-02-08 03:31:42 -08:00
/**
* Query builder scope to search on location ID
*
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $search Search term
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeByLocationId ( $query , $search )
{
return $query -> where ( function ( $query ) use ( $search ) {
2017-11-16 16:49:48 -08:00
$query -> whereHas ( 'location' , function ( $query ) use ( $search ) {
2017-02-08 03:31:42 -08:00
$query -> where ( 'locations.id' , '=' , $search );
2017-08-25 06:30:10 -07:00
});
2017-02-08 03:31:42 -08:00
});
2017-11-03 20:10:05 -07:00
2017-02-08 03:31:42 -08:00
}
2017-05-15 20:55:39 -07:00
2017-10-17 11:20:05 -07:00
/**
2019-11-22 16:13:42 -08:00
* Query builder scope to search on depreciation name
2017-10-17 11:20:05 -07:00
* @ param \Illuminate\Database\Query\Builder $query Query builder instance
* @ param text $search Search term
*
* @ return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeByDepreciationId ( $query , $search )
{
return $query -> join ( 'models' , 'assets.model_id' , '=' , 'models.id' )
-> join ( 'depreciations' , 'models.depreciation_id' , '=' , 'depreciations.id' ) -> where ( 'models.depreciation_id' , '=' , $search );
}
2016-03-25 01:18:05 -07:00
}