Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

.github/autolabeler.yml

@@ -18,5 +18,5 @@ importer: ["/app/Importer/*","/app/Http/Livewire/Importer.php", "resources/views
 cli / artisan: ["/app/Console/*"]
 LDAP: ["*Ldap*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
 docker: ["*docker/*", "Dockerfile", "Dockerfile.alpine", "Dockerfile.fpm-alpine", ".dockerignore", ".env.docker"]
-tests: ["/tests/*", "/stubs"]
+tests: ["/tests/*", "/database/factories/*", "/stubs"]
 config: .github

.github/workflows/docker-alpine.yml

@@ -32,6 +32,7 @@ jobs:
         type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
         type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
         type=ref,event=tag,suffix=-alpine
+        type=semver,pattern=v{{major}}-latest-alpine 
       # Define default tag "flavor" for docker/metadata-action per
       # https://github.com/docker/metadata-action#flavor-input
       # We turn off 'latest' tag by default.

.github/workflows/docker.yml

@@ -32,6 +32,7 @@ jobs:
         type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
         type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
         type=ref,event=tag
+        type=semver,pattern=v{{major}}-latest 
       # Define default tag "flavor" for docker/metadata-action per
       # https://github.com/docker/metadata-action#flavor-input
       # We turn off 'latest' tag by default.

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.2.0-pre',
-  'full_app_version' => 'v6.2.0-pre - build 11531-g20da6cccb',
-  'build_version' => '11531',
+  'app_version' => 'v6.2.0',
+  'full_app_version' => 'v6.2.0 - build 11566-g5a5b07f5a',
+  'build_version' => '11566',
   'prerelease_version' => '',
-  'hash_version' => 'g20da6cccb',
-  'full_hash' => 'v6.2.0-pre-591-g20da6cccb',
+  'hash_version' => 'g5a5b07f5a',
+  'full_hash' => 'v6.2.0-626-g5a5b07f5a',
   'branch' => 'master',
 );

database/factories/CompanyFactory.php

@@ -22,7 +22,7 @@ class CompanyFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->company(),
+            'name' => $this->faker->unique()->company(),
         ];
     }
 }

database/factories/CustomFieldFactory.php

@@ -22,7 +22,7 @@ class CustomFieldFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->catchPhrase(),
+            'name' => $this->faker->unique()->catchPhrase(),
             'format' => '',
             'element' => 'text',
             'auto_add_to_fieldsets' => '0',

database/factories/CustomFieldsetFactory.php

@@ -22,7 +22,7 @@ class CustomFieldsetFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->catchPhrase(),
+            'name' => $this->faker->unique()->catchPhrase(),
         ];
     }
 

database/factories/DepreciationFactory.php

@@ -23,7 +23,7 @@ class DepreciationFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->catchPhrase(),
+            'name' => $this->faker->unique()->catchPhrase(),
             'user_id' => User::factory()->superuser(),
             'months' => 36,
         ];

database/factories/ManufacturerFactory.php

@@ -23,7 +23,7 @@ class ManufacturerFactory extends Factory
     public function definition()
     {
         return [
-            'name' => $this->faker->company(),
+            'name' => $this->faker->unique()->company(),
             'user_id' => User::factory()->superuser(),
             'support_phone' => $this->faker->phoneNumber(),
             'url' => $this->faker->url(),

database/factories/UserFactory.php

@@ -33,11 +33,11 @@ public function definition()
             'permissions' => '{}',
             'phone' => $this->faker->phoneNumber(),
             'state' => $this->faker->stateAbbr(),
-            'username' => $this->faker->username(),
+            'username' => $this->faker->unique()->username(),
             'zip' => $this->faker->postcode(),
         ];
     }
-    
+
     public function firstAdmin()
     {
         return $this->state(function () {

resources/lang/af/admin/companies/message.php

@@ -2,6 +2,7 @@
 
 return [
     'does_not_exist' => 'Maatskappy bestaan ​​nie.',
+    'deleted'        => 'Deleted company',
     'assoc_users'    => 'Hierdie maatskappy is tans geassosieer met ten minste een model en kan nie verwyder word nie. Dateer asseblief jou modelle op om nie meer hierdie maatskappy te verwys nie en probeer weer.',
     'create' => [
         'error'   => 'Maatskappy is nie geskep nie, probeer asseblief weer.',

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

@@ -10,6 +10,9 @@
     'bulk_update'		=> 'Grootskaalse opdateringsbates',
     'bulk_update_help'	=> 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.',
     'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
+    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
+    'bulk_update_model_prefix' => 'On Models', 
+    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
     'checkedout_to'		=> 'Gekontroleer na',
     'checkout_date'		=> 'Checkout Datum',
     'checkin_date'		=> 'Incheckdatum',

resources/lang/af/admin/hardware/table.php

@@ -14,6 +14,7 @@
     'dl_csv' 		=> 'Laai CSV af',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
+    'last_checkin_date' => 'Last Checkin Date',
     'location' 		=> 'plek',
     'purchase_cost'	=> 'koste',
     'purchase_date'	=> 'gekoop',

resources/lang/af/admin/labels/message.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
+    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
+    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+
+    'does_not_exist' => 'Label does not exist',
+
+];

resources/lang/af/admin/labels/table.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+
+    'labels_per_page'    => 'Labels',
+    'support_fields'     => 'Fields',
+    'support_asset_tag'  => 'Tag',
+    'support_1d_barcode' => '1D',
+    'support_2d_barcode' => '2D',
+    'support_logo'       => 'Logo',
+    'support_title'      => 'Title',
+
+];

resources/lang/af/admin/licenses/general.php

@@ -26,6 +26,7 @@
                 'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
+                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
                 'log_msg'           => 'Checked in via bulk license checkout in license GUI',
             ],

resources/lang/af/admin/manufacturers/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://support.apple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'Vervaardiger bestaan ​​nie.',
     'assoc_users'	 => 'Hierdie vervaardiger word tans geassosieer met ten minste een model en kan nie verwyder word nie. Dateer asseblief jou modelle op om nie meer hierdie vervaardiger te gebruik nie en probeer weer.',
 

resources/lang/af/admin/models/message.php

@@ -2,6 +2,7 @@
 
 return array(
 
+    'deleted' => 'Deleted asset model',
     'does_not_exist' => 'Model bestaan ​​nie.',
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',

resources/lang/af/admin/settings/general.php

@@ -330,9 +330,30 @@
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'label2_enable'           => 'New Label Engine',
+    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
+    'label2_template'         => 'Template',
+    'label2_template_help'    => 'Select which template to use for label generation',
+    'label2_title'            => 'Title',
+    'label2_title_help'       => 'The title to show on labels that support it',
+    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
+    'label2_asset_logo'       => 'Use Asset Logo',
+    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
+    'label2_1d_type'          => '1D Barcode Type',
+    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_2d_type'          => '2D Barcode Type',
+    'label2_2d_type_help'     => 'Format for 2D barcodes',
+    'label2_2d_target'        => '2D Barcode Target',
+    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_fields'           => 'Field Definitions',
+    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
+    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'default'               => 'Default',
+    'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
     'google_login'      => 'Google Workspace Login Settings',
     'enable_google_login'  => 'Enable users to login with Google Workspace',
     'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-
 ];

resources/lang/af/admin/suppliers/message.php

@@ -2,6 +2,7 @@
 
 return array(
 
+    'deleted' => 'Deleted supplier',
     'does_not_exist' => 'Verskaffer bestaan ​​nie.',
 
 

resources/lang/af/admin/users/table.php

@@ -29,6 +29,7 @@
     'show_deleted'          => 'Wys verwyderde gebruikers',
     'title' 				=> 'Titel',
 	'to_restore_them'		=> 'om hulle te herstel.',
+    'total_assets_cost'     => "Total Assets Cost",
     'updateuser' 			=> 'Update gebruiker',
     'username' 				=> 'Gebruikersnaam',
 	'user_deleted_text' 	=> 'Hierdie gebruiker is gemerk as verwyder.',

resources/lang/af/general.php

@@ -120,6 +120,9 @@
     'firstname_lastname_underscore_format' => 'First Name Last Name ([email protected])',
     'lastnamefirstinitial_format' =>  'Last Name First Initial ([email protected])',
     'firstintial_dot_lastname_format' => 'First Initial Last Name ([email protected])',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
     'first'					=> 'eerste',
     'firstnamelastname'     => 'First Name Last Name ([email protected])',
     'lastname_firstinitial' => 'Last Name First Initial ([email protected])',
@@ -265,6 +268,8 @@
     'supplier'              => 'verskaffer',
     'suppliers'  			=> 'Verskaffers',
     'sure_to_delete'        => 'Is jy seker jy wil verwyder',
+    'sure_to_delete_var'    => 'Are you sure you wish to delete :item?',
+    'delete_what'           => 'Delete :item',
     'submit'				=> 'Indien',
     'target'                => 'teiken',
     'time_and_date_display' => 'Tyd en datum vertoon',
@@ -283,6 +288,7 @@
     'user'					=> 'gebruiker',
     'accepted'			    => 'aanvaarde',
     'declined'			    => 'afgeneem',
+    'unassigned'            => 'Unassigned',
     'unaccepted_asset_report' => 'Onaanvaarde Bates',
     'users'                 => 'gebruikers',
     'viewall'				=> 'View All',
@@ -364,9 +370,10 @@
     'licenses_count'        => 'Licenses Count',
     'notification_error'    => 'Error:',
     'notification_error_hint' => 'Please check the form below for errors',
-    'notification_success'  => 'Success:',
-    'notification_warning'   => 'Warning:',
-    'notification_info'      => 'Info:',
+    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
+    'notification_success'  => 'Success',
+    'notification_warning'   => 'Warning',
+    'notification_info'      => 'Info',
     'asset_information'     => 'Asset Information',
     'model_name'            => 'Model Name',
     'asset_name'            => 'Asset Name',
@@ -452,6 +459,8 @@
     'serial_number'        => 'Serial Number',
     'item_notes' => ':item Notes',
     'item_name_var' => ':item Name',
+    'error_user_company' => 'User and Asset companies missmatch',
+    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
     'importer' => [
         'checked_out_to_fullname' => 'Checked Out to: Full Name',
         'checked_out_to_first_name' => 'Checked Out to: First Name',
@@ -474,5 +483,8 @@
         'address2' => 'Address Line 2',
         'import_note' => 'Imported using csv importer',
     ],
+    'percent_complete' => '% complete',
+    'uploading' => 'Uploading... ',
+    'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.'
 
 ];

resources/lang/am/admin/companies/message.php

@@ -2,6 +2,7 @@
 
 return [
     'does_not_exist' => 'Company does not exist.',
+    'deleted'        => 'Deleted company',
     'assoc_users'    => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
     'create' => [
         'error'   => 'Company was not created, please try again.',

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

@@ -10,6 +10,9 @@
     'bulk_update'		=> 'Bulk Update Assets',
     'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
     'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
+    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
+    'bulk_update_model_prefix' => 'On Models', 
+    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
     'checkedout_to'		=> 'Checked Out To',
     'checkout_date'		=> 'Checkout Date',
     'checkin_date'		=> 'Checkin Date',

resources/lang/am/admin/hardware/table.php

@@ -14,6 +14,7 @@
     'dl_csv' 		=> 'Download CSV',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
+    'last_checkin_date' => 'Last Checkin Date',
     'location' 		=> 'Location',
     'purchase_cost'	=> 'Cost',
     'purchase_date'	=> 'Purchased',

resources/lang/am/admin/labels/message.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
+    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
+    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+
+    'does_not_exist' => 'Label does not exist',
+
+];

resources/lang/am/admin/labels/table.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+
+    'labels_per_page'    => 'Labels',
+    'support_fields'     => 'Fields',
+    'support_asset_tag'  => 'Tag',
+    'support_1d_barcode' => '1D',
+    'support_2d_barcode' => '2D',
+    'support_logo'       => 'Logo',
+    'support_title'      => 'Title',
+
+];

resources/lang/am/admin/licenses/general.php

@@ -26,6 +26,7 @@
                 'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
+                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
                 'log_msg'           => 'Checked in via bulk license checkout in license GUI',
             ],

resources/lang/am/admin/manufacturers/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'support_url_help' => 'Use <code>{LOCALE}</code> and <code>{SERIAL}</code> in your URL as variables to have those values auto-populate when viewing assets.',
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://support.apple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'Manufacturer does not exist.',
     'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
 

resources/lang/am/admin/models/message.php

@@ -2,6 +2,7 @@
 
 return array(
 
+    'deleted' => 'Deleted asset model',
     'does_not_exist' => 'Model does not exist.',
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',