Bumped version

Dockerfile

@@ -57,7 +57,6 @@ RUN chown -R docker /var/www/html
 
 RUN \
 	rm -r "/var/www/html/storage/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/storage/private_uploads" \
-      && mkdir -p "/var/lib/snipeit/data/uploads/{assets,avatars,barcodes,models,suppliers}" \
       && rm -rf "/var/www/html/public/uploads" && ln -fs "/var/lib/snipeit/data/uploads" "/var/www/html/public/uploads" \
       && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups"
 

app/Http/Controllers/AccessoriesController.php

@@ -183,6 +183,15 @@ class AccessoriesController extends Controller
 
       // Was the accessory updated?
         if ($accessory->save()) {
+
+            $logaction = new Actionlog();
+            $logaction->item_type = Accessory::class;
+            $logaction->item_id = $accessory->id;
+            $logaction->created_at =  date("Y-m-d H:i:s");
+            $logaction->user_id = Auth::user()->id;
+            $log = $logaction->logaction('update');
+
+
             // Redirect to the updated accessory page
             return redirect()->to("admin/accessories")->with('success', trans('admin/accessories/message.update.success'));
         }
@@ -215,6 +224,13 @@ class AccessoriesController extends Controller
         } else {
             $accessory->delete();
 
+            $logaction = new Actionlog();
+            $logaction->item_type = Accessory::class;
+            $logaction->item_id = $accessory->id;
+            $logaction->created_at =  date("Y-m-d H:i:s");
+            $logaction->user_id = Auth::user()->id;
+            $log = $logaction->logaction('deleted');
+
             // Redirect to the locations management page
             return redirect()->to('admin/accessories')->with('success', trans('admin/accessories/message.delete.success'));
 

app/Http/Controllers/AssetsController.php

@@ -454,7 +454,20 @@ class AssetsController extends Controller
 
         if ($asset->save()) {
             // Redirect to the new asset page
-            \Session::flash('success', trans('admin/hardware/message.update.success'));
+
+                $logaction = new Actionlog();
+                $logaction->item_type = Asset::class;
+                $logaction->item_id = $asset->id;
+                $logaction->created_at =  date("Y-m-d H:i:s");
+                if (Input::has('rtd_location_id')) {
+                    $logaction->location_id = e(Input::get('rtd_location_id'));
+                }
+                $logaction->user_id = Auth::user()->id;
+                $log = $logaction->logaction('update');
+
+                
+                
+                \Session::flash('success', trans('admin/hardware/message.update.success'));
             return response()->json(['redirect_url' => route("view/hardware", $assetId)]);
         }
         \Input::flash();
@@ -488,6 +501,13 @@ class AssetsController extends Controller
 
         $asset->delete();
 
+        $logaction = new Actionlog();
+        $logaction->item_type = Asset::class;
+        $logaction->item_id = $asset->id;
+        $logaction->created_at =  date("Y-m-d H:i:s");
+        $logaction->user_id = Auth::user()->id;
+        $log = $logaction->logaction('deleted');
+
         // Redirect to the asset management page
         return redirect()->to('hardware')->with('success', trans('admin/hardware/message.delete.success'));
 
@@ -1782,7 +1802,7 @@ class AssetsController extends Controller
                 }
 
             } else {
-                if (Gate::allows('assets.checkin')) {
+                if (($asset->assigned_to!='') && (Gate::allows('assets.checkin'))) {
                     $inout = '<a href="' . route('checkin/hardware',
                             $asset->id) . '" class="btn btn-primary btn-sm" title="Checkin this asset" data-toggle="tooltip">' . trans('general.checkin') . '</a>';
                 }

app/Http/Controllers/ConsumablesController.php

@@ -189,6 +189,15 @@ class ConsumablesController extends Controller
         $consumable->qty                    = Helper::ParseFloat(e(Input::get('qty')));
 
         if ($consumable->save()) {
+
+            $logaction = new Actionlog();
+            $logaction->item_type = Consumable::class;
+            $logaction->item_id = $consumable->id;
+            $logaction->created_at =  date("Y-m-d H:i:s");
+            $logaction->user_id = Auth::user()->id;
+            $log = $logaction->logaction('update');
+
+
             return redirect()->to("admin/consumables")->with('success', trans('admin/consumables/message.update.success'));
         }
 
@@ -216,6 +225,13 @@ class ConsumablesController extends Controller
 
             $consumable->delete();
 
+            $logaction = new Actionlog();
+            $logaction->item_type = Consumable::class;
+            $logaction->item_id = $consumable->id;
+            $logaction->created_at =  date("Y-m-d H:i:s");
+            $logaction->user_id = Auth::user()->id;
+            $log = $logaction->logaction('deleted');
+
             // Redirect to the locations management page
             return redirect()->to('admin/consumables')->with('success', trans('admin/consumables/message.delete.success'));
 

app/Http/Controllers/LicensesController.php

@@ -412,6 +412,13 @@ class LicensesController extends Controller
             $licenseseats->delete();
             $license->delete();
 
+            $logaction = new Actionlog();
+            $logaction->item_type = License::class;
+            $logaction->item_id = $license->id;
+            $logaction->created_at =  date("Y-m-d H:i:s");
+            $logaction->user_id = Auth::user()->id;
+            $log = $logaction->logaction('deleted');
+
 
 
 
@@ -744,7 +751,7 @@ class LicensesController extends Controller
     public function getView($licenseId = null)
     {
 
-        $license = License::find($licenseId);
+        $license = License::withTrashed()->find($licenseId);
         $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
 
         if (isset($license->id)) {

app/Http/Controllers/ReportsController.php

@@ -356,8 +356,14 @@ class ReportsController extends Controller
               $activity_item = '<a href="'.route('view/hardware', $activity->item_id).'">'.e($activity->item->asset_tag).' - '. e($activity->item->showAssetName()).'</a>';
                 $item_type = 'asset';
             } elseif ($activity->item) {
-                $activity_item = '<a href="' . route('view/' . $activity->itemType(),
-                        $activity->item_id) . '">' . e($activity->item->name) . '</a>';
+
+                if ($activity->item->deleted_at!='') {
+                    $activity_item = '<del>'. e($activity->item->name).'</del>';
+                } else {
+                    $activity_item = '<a href="' . route('view/' . $activity->itemType(),
+                    $activity->item_id) . '">' . e($activity->item->name) . '</a>';
+                }
+
                 $item_type = $activity->itemType();
 
             } else {

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.4',
-  'build_version' => '12',
-  'hash_version' => 'gf7e4fca',
-  'full_hash' => 'v3.6.4-12-gf7e4fca',
+  'app_version' => 'v3.6.6',
+  'build_version' => '1',
+  'hash_version' => 'gee2c67a',
+  'full_hash' => 'v3.6.6-gee2c67a',
 );

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /resources/lang/en/**/*.php
+    translation: '**/%original_file_name%'

docker/entrypoint.sh

@@ -18,7 +18,7 @@ else
 fi
 
 # create data directories
-for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do
+for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do
 	mkdir -p "/var/lib/snipeit/$dir"
 done
 

resources/lang/en/admin/hardware/form.php

@@ -14,6 +14,7 @@ return array(
     'cost'				=> 'Purchase Cost',
     'create'			=> 'Create Asset',
     'date'				=> 'Purchase Date',
+    'depreciation'	    => 'Depreciation',
     'depreciates_on'	=> 'Depreciates On',
     'default_location'	=> 'Default Location',
     'eol_date'			=> 'EOL Date',

snipeit.sh

@@ -111,10 +111,8 @@ function isinstalled {
 }
 
 if [ -f /etc/lsb-release ]; then
-	. /etc/lsb-release
-	distro="${DISTRIB_ID,,}"
-	version="$DISTRIB_RELEASE"
-	codename="$DISTRIB_CODENAME"
+	distro="$(lsb_release -s -i )"
+	version="$(lsb_release -s -r)"
 elif [ -f /etc/os-release ]; then
 	distro="$(. /etc/os-release && echo $ID)"
 	version="$(. /etc/os-release && echo $VERSION_ID)"