Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Api/AssetMaintenancesController.php

@@ -71,7 +71,8 @@ public function index(Request $request)
                                 'asset_tag',
                                 'asset_name',
                                 'user_id',
-                                'supplier'
+                                'supplier',
+                                'is_warranty',
                             ];
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';

app/Http/Livewire/Importer.php

@@ -288,6 +288,7 @@ public function mount()
         ];
 
         $this->users_fields  = [
+            'id' => trans('general.id'),
             'company' => trans('general.company'),
             'location' => trans('general.location'),
             'department' => trans('general.department'),

app/Http/Transformers/AssetMaintenancesTransformer.php

@@ -59,6 +59,7 @@ public function transformAssetMaintenance(AssetMaintenance $assetmaintenance)
             'user_id'    => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id, 'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
             'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
+            'is_warranty'=> $assetmaintenance->is_warranty,
 
         ];
 

app/Importer/UserImporter.php

@@ -42,6 +42,7 @@ protected function handle($row)
     public function createUserIfNotExists(array $row)
     {
         // Pull the records from the CSV to determine their values
+        $this->item['id'] = $this->findCsvMatch($row, 'id');
         $this->item['username'] = $this->findCsvMatch($row, 'username');
         $this->item['first_name'] = $this->findCsvMatch($row, 'first_name');
         $this->item['last_name'] = $this->findCsvMatch($row, 'last_name');
@@ -76,13 +77,18 @@ public function createUserIfNotExists(array $row)
             $user_formatted_array = User::generateFormattedNameFromFullName($user_full_name, Setting::getSettings()->username_format);
             $this->item['username'] = $user_formatted_array['username'];
         }
-        
-        $user = User::where('username', $this->item['username'])->first();
+
+        // Check if a numeric ID was passed. If it does, use that above all else.
+        if ((array_key_exists('id', $this->item) && ($this->item['id'] != "") && (is_numeric($this->item['id']))))  {
+            $user = User::find($this->item['id']);
+        } else {
+            $user = User::where('username', $this->item['username'])->first();
+        }
+
         if ($user) {
+
             if (! $this->updating) {
-                $this->log('A matching User '.$this->item['name'].' already exists.  ');
                 \Log::debug('A matching User '.$this->item['name'].' already exists.  ');
-
                 return;
             }
             $this->log('Updating User');
@@ -109,7 +115,6 @@ public function createUserIfNotExists(array $row)
         $user->fill($this->sanitizeItemForStoring($user));
 
         if ($user->save()) {
-            // $user->logCreate('Imported using CSV Importer');
             $this->log('User '.$this->item['name'].' was created');
 
             if (($user->email) && ($user->activated == '1')) {

app/Presenters/AssetMaintenancesPresenter.php

@@ -95,6 +95,7 @@ public static function dataTableLayout()
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('admin/asset_maintenances/table.is_warranty'),
+                'formatter' => 'trueFalseFormatter'
             ], [
                 'field' => 'cost',
                 'searchable' => true,

config/dompdf.php

@@ -74,8 +74,11 @@
          * This is only checked on command line call by dompdf.php, but not by
          * direct class use like:
          * $dompdf = new DOMPDF();	$dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
+         * 
+         * 
+         * Hardcoding 2 Paths needed for Docker Containers
          */
-        "chroot" => realpath(base_path()),
+        "chroot" => realpath(base_path()) . ",/var/lib/snipeit/data/uploads,/var/lib/snipeit/data/private_uploads",
 
         /**
          * Whether to enable font subsetting or not.

resources/views/account/requestable-assets.blade.php

@@ -57,6 +57,7 @@ class="table table-striped snipe-table"
                                         <thead>
                                             <tr>
                                                 <th class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="true">{{ trans('general.image') }}</th>
+                                                <th class="col-md-2" data-field="asset_tag" data-sortable="true" >{{ trans('general.asset_tag') }}</th>                                                
                                                 <th class="col-md-2" data-field="model" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
                                                 <th class="col-md-2" data-field="model_number" data-sortable="true">{{ trans('admin/models/table.modelnumber') }}</th>
                                                 <th class="col-md-2" data-field="name" data-sortable="true">{{ trans('admin/hardware/form.name') }}</th>

resources/views/reports/asset_maintenances.blade.php

@@ -48,6 +48,7 @@ class="table table-striped snipe-table"
                     <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right" data-footer-formatter="sumFormatter">{{ trans('admin/asset_maintenances/form.cost') }}</th>
                     <th data-sortable="true" data-field="location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('general.location') }}</th>
                     <th data-sortable="true" data-field="rtd_location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="is_warranty" data-formatter="trueFalseformatter">{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
                 </tr>

resources/views/statuslabels/edit.blade.php

@@ -75,7 +75,7 @@
 
         $(function() {
             $('.color').colorpicker({
-                color: '#AA3399',
+                color: `{{ old('color', $item->color) ?: '#AA3399' }}`,
                 format: 'hex'
             });
         });