save

Signed-off-by: snipe <snipe@snipe.net>

app.json

@@ -26,6 +26,10 @@
         "description": "URL where your Snipe-IT install will be available at.",
         "value": "https://your-app-name.herokuapp.com"
       },
+      "LABEL_URL": {
+        "description": "Labels",
+        "value": "https://your-app-name.herokuapp.com"
+      },
       "APP_TIMEZONE": {
         "description": "Which timezone do you want to use for your install? (http://php.net/manual/en/timezones.php)",
         "value": "UTC"

app/Http/Controllers/Api/ReportsController.php

@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Models\Actionlog;
+use App\Models\Company;
+use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -18,10 +20,11 @@ class ReportsController extends Controller
      */
     public function index(Request $request) : JsonResponse | array
     {
-        $this->authorize('reports.view');
+        $this->authorize('activity.view');
 
         $actionlogs = Actionlog::with('item', 'user', 'adminuser', 'target', 'location');
 
+
         if ($request->filled('search')) {
             $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
         }

app/Http/Controllers/CustomFieldsController.php

@@ -238,8 +238,8 @@ class CustomFieldsController extends Controller
             $display_in_user_view = '0';
         }
         
-        $field->name          = trim(e($request->get("name")));
+        $field->name          = trim($request->get("name"));
-        $field->element       = e($request->get("element"));
+        $field->element       = $request->get("element");
         $field->field_values  = $request->get("field_values");
         $field->created_by       = auth()->id();
         $field->help_text     = $request->get("help_text");
@@ -254,9 +254,9 @@ class CustomFieldsController extends Controller
         $field->display_audit = $request->get("display_audit", 0);
 
         if ($request->get('format') == 'CUSTOM REGEX') {
-            $field->format = e($request->get('custom_format'));
+            $field->format = $request->get('custom_format');
         } else {
-            $field->format = e($request->get('format'));
+            $field->format = $request->get('format');
         }
 
         if ($field->element == 'checkbox' || $field->element == 'radio'){

app/Http/Controllers/ReportsController.php

@@ -485,7 +485,7 @@ class ReportsController extends Controller
                 $header[] = trans('admin/hardware/table.purchase_date');
             }
 
-            if (($request->filled('purchase_cost')) || ($request->filled('depreciation'))) {
+            if ($request->filled('purchase_cost')) {
                 $header[] = trans('admin/hardware/table.purchase_cost');
             }
 

app/Models/Labels/Tapes/Brother/TZe_24mm_D.php

@@ -70,27 +70,38 @@ class TZe_24mm_D extends TZe_24mm
         }
 
         foreach ($record->get('fields') as $field) {
-            // Write label and value on the same line
+            if (!empty($field['label']) && $field['label'] !== "\u{200B}") {
-            // Calculate label width with proportional character spacing
+                // Write label and value on the same line
-            $labelWidth = $pdf->GetStringWidth($field['label'], 'freemono', '', self::LABEL_SIZE);
+                // Calculate label width with proportional character spacing
-            $charCount = strlen($field['label']);
+                $labelWidth = $pdf->GetStringWidth($field['label'], 'freemono', '', self::LABEL_SIZE);
-            $spacingPerChar = 0.5;
+                $charCount = strlen($field['label']);
-            $totalSpacing = $charCount * $spacingPerChar;
+                $spacingPerChar = 0.5;
-            $adjustedWidth = $labelWidth + $totalSpacing;
+                $totalSpacing = $charCount * $spacingPerChar;
+                $adjustedWidth = $labelWidth + $totalSpacing;
 
-            static::writeText(
+                static::writeText(
-                $pdf, $field['label'],
+                    $pdf, $field['label'],
-                $currentX, $currentY,
+                    $currentX, $currentY,
-                'freemono', 'B', self::LABEL_SIZE, 'L',
+                    'freemono', 'B', self::LABEL_SIZE, 'L',
-                $adjustedWidth, self::LABEL_SIZE, true, 0, $spacingPerChar
+                    $adjustedWidth, self::LABEL_SIZE, true, 0, $spacingPerChar
-            );
+                );
 
-            static::writeText(
+                static::writeText(
-                $pdf, $field['value'],
+                    $pdf, $field['value'],
-                $currentX + $adjustedWidth + 2, $currentY,
+                    $currentX + $adjustedWidth + 2, $currentY,
-                'freemono', 'B', self::FIELD_SIZE, 'L',
+                    'freemono', 'B', self::FIELD_SIZE, 'L',
-                $usableWidth - $adjustedWidth - 2, self::FIELD_SIZE, true, 0, 0.3
+                    $usableWidth - $adjustedWidth - 2, self::FIELD_SIZE, true, 0, 0.3
-            );
+                );
+            } else {
+
+                // Label is empty, so write value only.
+                static::writeText(
+                    $pdf, $field['value'],
+                    $currentX, $currentY, // No offset
+                    'freemono', 'B', self::FIELD_SIZE, 'L',
+                    $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+                );
+            }
 
             $currentY += max(self::LABEL_SIZE, self::FIELD_SIZE) + self::FIELD_MARGIN;
         }

app/Presenters/LocationPresenter.php

@@ -33,7 +33,7 @@ class LocationPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('general.company'),
                 'visible' => false,
-                'formatter' => 'locationCompanyObjFilterFormatter'
+                'formatter' => 'companiesLinkObjFormatter'
             ],
             [
                 'field' => 'name',

app/Providers/AuthServiceProvider.php

@@ -168,6 +168,15 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        // -----------------------------------------
+        // Activity
+        // -----------------------------------------
+        Gate::define('activity.view', function ($user) {
+            if (($user->hasAccess('reports.view')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
         // -----------------------------------------
         // Self
         // -----------------------------------------

app/Providers/BreadcrumbsServiceProvider.php

@@ -385,6 +385,7 @@ class BreadcrumbsServiceProvider extends ServiceProvider
 
         Breadcrumbs::for('locations.edit', fn (Trail $trail, Location $location) =>
         $trail->parent('locations.index', route('locations.index'))
+            ->push($location->name, route('locations.show', $location))
             ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $location->name]), route('locations.edit', $location))
         );
 

app/View/Label.php

@@ -142,6 +142,9 @@ class Label implements View
                             case 'location':
                                 $barcode2DTarget = route('locations.show', $asset->location_id);
                                 break;
+                            case 'custom_url_hardware_id':
+                                $barcode2DTarget = route('hardware.show', $asset);
+                                break;
                             case 'hardware_id':
                             default:
                                 $barcode2DTarget = route('hardware.show', $asset);
@@ -177,10 +180,13 @@ class Label implements View
                                 // The end result of this will be in this format:
                                 // {labelOne} {valueOne} | {labelTwo} {valueTwo} | {labelThree} {valueThree}
                                 $previous['value'] = trim(implode(' | ', [
-                                    implode(' ', [null, $previous['value']]),
+                                    implode(' ', [$previous['label'], $previous['value']]),
                                     implode(' ', [$current['label'], $current['value']]),
                                 ]));
 
+                                // We'll set the label to an empty string since we
+                                // injected the label into the value field above.
+                                $previous['label'] = '';
                                 return $previous;
                             });
 

config/app.php

@@ -74,6 +74,7 @@ return [
     */
 
     'url' =>  env('APP_URL', 'http://localhost'),
+    'label_url' =>  env('LABEL_URL', 'http://localhost'),
 
     /*
     |--------------------------------------------------------------------------

resources/lang/en-US/general.php

@@ -390,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',

resources/lang/en-US/validation.php

@@ -172,6 +172,7 @@ return [
     'url' => 'The :attribute field must be a valid URL.',
     'ulid' => 'The :attribute field must be a valid ULID.',
     'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*

resources/views/dashboard.blade.php

@@ -172,26 +172,36 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\Asset::class)
                             <a class="btn bg-teal" style="width: 100%" href="{{ route('hardware.create') }}">{{ trans('general.new_asset') }}</a>
                             @endcan
                         </div>
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\License::class)
                                 <a class="btn bg-maroon" style="width: 100%" href="{{ route('licenses.create') }}">{{ trans('general.new_license') }}</a>
                             @endcan
                         </div>
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\Accessory::class)
                                 <a class="btn bg-orange" style="width: 100%" href="{{ route('accessories.create') }}">{{ trans('general.new_accessory') }}</a>
                             @endcan
                         </div>
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\Consumable::class)
                                 <a class="btn bg-purple" style="width: 100%" href="{{ route('consumables.create') }}">{{ trans('general.new_consumable') }}</a>
                             @endcan
                         </div>
+                        <div class="col-md-2">
+                            @can('create', \App\Models\Component::class)
+                                <a class="btn bg-yellow" style="width: 100%" href="{{ route('components.create') }}">{{ trans('general.new_component') }}</a>
+                            @endcan
+                        </div>
+                        <div class="col-md-2">
+                            @can('create', \App\Models\User::class)
+                                <a class="btn bg-light-blue" style="width: 100%" href="{{ route('users.create') }}">{{ trans('general.new_user') }}</a>
+                            @endcan
+                        </div>
                     </div>
                 </div>
             </div>
@@ -282,7 +292,7 @@
 <div class="row">
     <div class="col-md-6">
 
-		@if ($snipeSettings->full_multiple_companies_support=='1')
+		@if ((($snipeSettings->scope_locations_fmcs!='1') && ($snipeSettings->full_multiple_companies_support=='1')))
 			 <!-- Companies -->	
 			<div class="box box-default">
 				<div class="box-header with-border">

resources/views/hardware/edit.blade.php

@@ -217,7 +217,7 @@
 
             $.ajax({
                 type: 'GET',
-                url: "{{ config('app.url') }}/models/" + modelid + "/custom_fields",
+                url: "{{ config('app.label_url') }}/models/" + modelid + "/custom_fields",
                 headers: {
                     "X-Requested-With": 'XMLHttpRequest',
                     "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
@@ -260,7 +260,7 @@
         if (status_id != '') {
             $(".status_spinner").css("display", "inline");
             $.ajax({
-                url: "{{config('app.url') }}/api/v1/statuslabels/" + status_id + "/deployable",
+                url: "{{config('app.label_url') }}/api/v1/statuslabels/" + status_id + "/deployable",
                 headers: {
                     "X-Requested-With": 'XMLHttpRequest',
                     "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')

resources/views/hardware/labels.blade.php

@@ -112,7 +112,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->label2_1d_type!=
 
         @if ($settings->qr_code=='1')
             <div class="qr_img">
-                <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="qr_img">
+                <img src="{{ config('app.label_url') }}/hardware/{{ $asset->id }}/qr_code" class="qr_img">
             </div>
         @endif
 
@@ -158,7 +158,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->label2_1d_type!=
 
         @if ((($settings->alt_barcode_enabled=='1') && $settings->label2_1d_type!=''))
             <div class="barcode_container">
-                <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/barcode" class="barcode">
+                <img src="{{ config('app.label_url') }}/hardware/{{ $asset->id }}/barcode" class="barcode">
             </div>
         @endif
 

resources/views/partials/bootstrap-table.blade.php

@@ -276,7 +276,7 @@
     function genericRowLinkFormatter(destination) {
         return function (value,row) {
             if (value) {
-                return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '">' + value + '</a>';
+                return '<a href="{{ config('app.label_url') }}/' + destination + '/' + row.id + '">' + value + '</a>';
             }
         };
     }
@@ -318,7 +318,7 @@
                         text_help = '';
                 }
 
-                return '<nobr><a href="{{ config('app.url') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
+                return '<nobr><a href="{{ config('app.label_url') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
             } else if ((value) && (value.name)) {
 
                 // Add some overrides for any funny urls we have
@@ -328,7 +328,7 @@
                     var dpolymorphicItemFormatterest = 'fields/';
                 }
 
-                return '<nobr><a href="{{ config('app.url') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '">' + value.name + '</a></span>';
+                return '<nobr><a href="{{ config('app.label_url') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '">' + value.name + '</a></span>';
             }
         };
     }
@@ -341,7 +341,7 @@
 
 
     function hardwareAuditFormatter(value, row) {
-        return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="btn btn-sm bg-yellow" data-tooltip="true" title="Audit this item">{{ trans('general.audit') }}</a>';
+        return '<a href="{{ config('app.label_url') }}/hardware/' + row.id + '/audit" class="btn btn-sm bg-yellow" data-tooltip="true" title="Audit this item">{{ trans('general.audit') }}</a>';
     }
 
 

resources/views/settings/labels.blade.php

@@ -303,6 +303,7 @@
                                         id="label2_2d_target"
                                         :options="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')',
                                                    'ht_tag'=>'/ht/{asset_tag}',
+                                                   'custom_url_hardware_id'=>'/hardware/{id}',
                                                    'location' => '/location/{location_id}',
                                                    ]"
                                         :selected="old('label2_2d_target', $setting->label2_2d_target)"

resources/views/statuslabels/index.blade.php

@@ -91,7 +91,7 @@
 
       function statuslabelsAssetLinkFormatter(value, row) {
           if ((row) && (row.name)) {
-              return '<a href="{{ config('app.url') }}/hardware/?status_id=' + row.id + '"> ' + row.name + '</a>';
+              return '<a href="{{ config('app.label_url') }}/hardware/?status_id=' + row.id + '"> ' + row.name + '</a>';
           }
       }