Merge remote-tracking branch 'origin/develop'

.gitignore

@@ -47,6 +47,7 @@ storage/private_uploads/users/*
 tests/_data/scenarios
 tests/_output/*
 tests/_support/_generated/*
+tests/coverage/*
 /npm-debug.log
 /storage/oauth-private.key
 /storage/oauth-public.key

app/Http/Controllers/DashboardController.php

@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Session;
 
 
 /**
@@ -44,6 +45,8 @@ public function index() : View | RedirectResponse
 
             return view('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts);
         } else {
+            Session::reflash();
+
             // Redirect to the profile page
             return redirect()->intended('account/view-assets');
         }

app/Http/Controllers/Users/BulkUsersController.php

@@ -118,6 +118,7 @@ public function update(Request $request)
             ->conditionallyAddItem('activated')
             ->conditionallyAddItem('start_date')
             ->conditionallyAddItem('end_date')
+            ->conditionallyAddItem('city')
             ->conditionallyAddItem('autoassign_licenses');
 
 

app/Models/Asset.php

@@ -950,11 +950,12 @@ public function getEula()
     {
 
         if (($this->model) && ($this->model->category)) {
-            if ($this->model->category->eula_text) {
+            if (($this->model->category->eula_text) && ($this->model->category->use_default_eula === 0)) {
                 return Helper::parseEscapedMarkedown($this->model->category->eula_text);
-            } elseif ($this->model->category->use_default_eula == '1') {
+            } elseif ($this->model->category->use_default_eula === 1) {
                 return Helper::parseEscapedMarkedown(Setting::getSettings()->default_eula_text);
             } else {
+
                 return false;
             }
         }

composer.json

@@ -120,7 +120,9 @@
     ],
     "post-create-project-cmd": [
       "php artisan key:generate"
-    ]
+    ],
+    "coverage:herd:clover": "herd coverage vendor/bin/phpunit --coverage-clover tests/coverage/clover.xml",
+    "coverage:herd:html": "herd coverage vendor/bin/phpunit --coverage-html tests/coverage/html"
   },
   "config": {
     "preferred-install": "dist",

database/factories/UserFactory.php

@@ -241,6 +241,11 @@ public function viewComponents()
         return $this->appendPermission(['components.view' => '1']);
     }
 
+    public function createCompanies()
+    {
+        return $this->appendPermission(['companies.create' => '1']);
+    }
+
     public function createComponents()
     {
         return $this->appendPermission(['components.create' => '1']);

resources/lang/aa-ER/admin/locations/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'crwdns650:0crwdne650:0',
-    'assoc_users'    => 'crwdns12666:0crwdne12666:0',
+    'assoc_users'    => 'crwdns12740:0crwdne12740:0',
     'assoc_assets'	 => 'crwdns1404:0crwdne1404:0',
     'assoc_child_loc'	 => 'crwdns1405:0crwdne1405:0',
     'assigned_assets' => 'crwdns11179:0crwdne11179:0',

resources/lang/aa-ER/admin/settings/general.php

@@ -31,6 +31,8 @@
     'backups'					=> 'crwdns1331:0crwdne1331:0',
     'backups_help'              => 'crwdns6812:0crwdne6812:0',
     'backups_restoring'         => 'crwdns6325:0crwdne6325:0',
+    'backups_clean' => 'crwdns12712:0crwdne12712:0',
+    'backups_clean_helptext' => "crwdns12714:0crwdne12714:0",
     'backups_upload'            => 'crwdns6327:0crwdne6327:0',
     'backups_path'              => 'crwdns6329:0crwdne6329:0',
     'backups_restore_warning'   => 'crwdns11531:0crwdne11531:0',

resources/lang/aa-ER/admin/users/message.php

@@ -6,7 +6,7 @@
     'declined'                  => 'crwdns1345:0crwdne1345:0',
     'bulk_manager_warn'	        => 'crwdns1849:0crwdne1849:0',
     'user_exists'               => 'crwdns787:0crwdne787:0',
-    'user_not_found'            => 'crwdns11623:0crwdne11623:0',
+    'user_not_found'            => 'crwdns12744:0crwdne12744:0',
     'user_login_required'       => 'crwdns789:0crwdne789:0',
     'user_has_no_assets_assigned' => 'crwdns11868:0crwdne11868:0',
     'user_password_required'    => 'crwdns790:0crwdne790:0',
@@ -53,6 +53,7 @@
         'ldap_could_not_search' => 'crwdns1415:0crwdne1415:0',
         'ldap_could_not_get_entries' => 'crwdns1416:0crwdne1416:0',
         'password_ldap' => 'crwdns1889:0crwdne1889:0',
+        'multi_company_items_assigned' => 'crwdns12742:0crwdne12742:0'
     ),
 
     'deletefile' => array(

resources/lang/aa-ER/general.php

@@ -418,7 +418,7 @@
     'bulk_soft_delete'      =>'crwdns10524:0crwdne10524:0',
     'bulk_checkin_delete_success' => 'crwdns10526:0crwdne10526:0',
     'bulk_checkin_success' => 'crwdns10528:0crwdne10528:0',
-    'set_to_null'           => 'crwdns10538:0crwdne10538:0',
+    'set_to_null'           => 'crwdns12738:0crwdne12738:0',
     'set_users_field_to_null'  => 'crwdns11449:0crwdne11449:0',
     'na_no_purchase_date'   => 'crwdns10540:0crwdne10540:0',
     'assets_by_status'      => 'crwdns10542:0crwdne10542:0',
@@ -558,8 +558,8 @@
     'expires' => 'crwdns12310:0crwdne12310:0',
     'map_fields'=> 'crwdns12572:0crwdne12572:0',
     'remaining_var' => 'crwdns12612:0crwdne12612:0',
-    'assets_in_var' => 'crwdns12688:0crwdne12688:0',
     'label' => 'crwdns12690:0crwdne12690:0',
     'import_asset_tag_exists' => 'crwdns12692:0crwdne12692:0',
+    'countries_manually_entered_help' => 'crwdns12702:0crwdne12702:0',
 
 ];

resources/lang/aa-ER/localizations.php

@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'crwdns10560:0crwdne10560:0',
+    'select_language' => 'crwdns12746:0crwdne12746:0',
     'languages' => [
         'en-US'=> 'crwdns11932:0crwdne11932:0',
         'en-GB'=> 'crwdns10564:0crwdne10564:0',
@@ -68,7 +68,7 @@
         'zu-ZA'=> 'crwdns12020:0crwdne12020:0',
     ],
 
-    'select_country' => 'crwdns10672:0crwdne10672:0',
+    'select_country' => 'crwdns12748:0crwdne12748:0',
 
     'countries' => [
         'AC'=>'crwdns10674:0crwdne10674:0',
@@ -135,6 +135,7 @@
         'EC'=>'crwdns10796:0crwdne10796:0',
         'EE'=>'crwdns10798:0crwdne10798:0',
         'EG'=>'crwdns10800:0crwdne10800:0',
+        'GB-ENG'=>'crwdns12704:0crwdne12704:0',
         'ER'=>'crwdns10802:0crwdne10802:0',
         'ES'=>'crwdns10804:0crwdne10804:0',
         'ET'=>'crwdns10806:0crwdne10806:0',
@@ -233,6 +234,7 @@
         'NG'=>'crwdns10992:0crwdne10992:0',
         'NI'=>'crwdns10994:0crwdne10994:0',
         'NL'=>'crwdns10996:0crwdne10996:0',
+        'GB-NIR' => 'crwdns12706:0crwdne12706:0',
         'NO'=>'crwdns10998:0crwdne10998:0',
         'NP'=>'crwdns11000:0crwdne11000:0',
         'NR'=>'crwdns11002:0crwdne11002:0',
@@ -260,7 +262,7 @@
         'RU'=>'crwdns11046:0crwdne11046:0',
         'RW'=>'crwdns11048:0crwdne11048:0',
         'SA'=>'crwdns11050:0crwdne11050:0',
-        'UK'=>'crwdns11052:0crwdne11052:0',
+        'GB-SCT'=>'crwdns12708:0crwdne12708:0',
         'SB'=>'crwdns11054:0crwdne11054:0',
         'SC'=>'crwdns11056:0crwdne11056:0',
         'SS'=>'crwdns11241:0crwdne11241:0',
@@ -312,6 +314,7 @@
         'VI'=>'crwdns11148:0crwdne11148:0',
         'VN'=>'crwdns11150:0crwdne11150:0',
         'VU'=>'crwdns11152:0crwdne11152:0',
+        'GB-WLS' =>'crwdns12710:0crwdne12710:0',
         'WF'=>'crwdns11154:0crwdne11154:0',
         'WS'=>'crwdns11156:0crwdne11156:0',
         'YE'=>'crwdns11158:0crwdne11158:0',

resources/lang/aa-ER/mail.php

@@ -28,19 +28,19 @@
     'a_user_requested' => 'crwdns1705:0crwdne1705:0',
     'acceptance_asset_accepted' => 'crwdns10552:0crwdne10552:0',
     'acceptance_asset_declined' => 'crwdns10554:0crwdne10554:0',
-    'accessory_name' => 'crwdns1706:0crwdne1706:0',
-    'additional_notes' => 'crwdns1707:0crwdne1707:0',
+    'accessory_name' => 'crwdns12732:0crwdne12732:0',
+    'additional_notes' => 'crwdns12734:0crwdne12734:0',
     'admin_has_created' => 'crwdns1708:0crwdne1708:0',
-    'asset' => 'crwdns1709:0crwdne1709:0',
-    'asset_name' => 'crwdns1710:0crwdne1710:0',
+    'asset' => 'crwdns12750:0crwdne12750:0',
+    'asset_name' => 'crwdns12716:0crwdne12716:0',
     'asset_requested' => 'crwdns1711:0crwdne1711:0',
     'asset_tag' => 'crwdns6068:0crwdne6068:0',
     'assets_warrantee_alert' => 'crwdns6313:0crwdne6313:0',
     'assigned_to' => 'crwdns1714:0crwdne1714:0',
     'best_regards' => 'crwdns1715:0crwdne1715:0',
-    'canceled' => 'crwdns1716:0crwdne1716:0',
-    'checkin_date' => 'crwdns1717:0crwdne1717:0',
-    'checkout_date' => 'crwdns1718:0crwdne1718:0',
+    'canceled' => 'crwdns12718:0crwdne12718:0',
+    'checkin_date' => 'crwdns12720:0crwdne12720:0',
+    'checkout_date' => 'crwdns12722:0crwdne12722:0',
     'checkedout_from' => 'crwdns12066:0crwdne12066:0',
     'checkedin_from'  => 'crwdns12082:0crwdne12082:0',
     'checked_into' => 'crwdns12068:0crwdne12068:0',
@@ -49,13 +49,13 @@
     'click_to_confirm' => 'crwdns1719:0crwdne1719:0',
     'current_QTY' => 'crwdns1727:0crwdne1727:0',
     'days' => 'crwdns1729:0crwdne1729:0',
-    'expecting_checkin_date' => 'crwdns1730:0crwdne1730:0',
+    'expecting_checkin_date' => 'crwdns12724:0crwdne12724:0',
     'expires' => 'crwdns1731:0crwdne1731:0',
     'hello' => 'crwdns1734:0crwdne1734:0',
     'hi' => 'crwdns1735:0crwdne1735:0',
     'i_have_read' => 'crwdns1736:0crwdne1736:0',
     'inventory_report' => 'crwdns11243:0crwdne11243:0',
-    'item' => 'crwdns1737:0crwdne1737:0',
+    'item' => 'crwdns12726:0crwdne12726:0',
     'item_checked_reminder' => 'crwdns12322:0crwdne12322:0',
     'license_expiring_alert' => 'crwdns2048:0crwdne2048:0',
     'link_to_update_password' => 'crwdns1742:0crwdne1742:0',
@@ -66,11 +66,11 @@
     'name' => 'crwdns1747:0crwdne1747:0',
     'new_item_checked' => 'crwdns1748:0crwdne1748:0',
     'notes' => 'crwdns12070:0crwdne12070:0',
-    'password' => 'crwdns1749:0crwdne1749:0',
+    'password' => 'crwdns12728:0crwdne12728:0',
     'password_reset' => 'crwdns1750:0crwdne1750:0',
     'read_the_terms' => 'crwdns1751:0crwdne1751:0',
     'read_the_terms_and_click' => 'crwdns12072:0crwdne12072:0',
-    'requested' => 'crwdns1753:0crwdne1753:0',
+    'requested' => 'crwdns12730:0crwdne12730:0',
     'reset_link' => 'crwdns1754:0crwdne1754:0',
     'reset_password' => 'crwdns1755:0crwdne1755:0',
     'rights_reserved' => 'crwdns11245:0crwdne11245:0',

resources/lang/af-ZA/admin/locations/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Ligging bestaan ​​nie.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this location and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again. ',
     'assoc_assets'	 => 'Hierdie ligging is tans geassosieer met ten minste een bate en kan nie uitgevee word nie. Dateer asseblief jou bates op om nie meer hierdie ligging te verwys nie en probeer weer.',
     'assoc_child_loc'	 => 'Hierdie ligging is tans die ouer van ten minste een kind se plek en kan nie uitgevee word nie. Werk asseblief jou liggings by om nie meer hierdie ligging te verwys nie en probeer weer.',
     'assigned_assets' => 'Assigned Assets',

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

@@ -31,6 +31,8 @@
     'backups'					=> 'rugsteun',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
     'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',

resources/lang/af-ZA/admin/users/message.php

@@ -6,7 +6,7 @@
     'declined'                  => 'Jy het hierdie bate suksesvol geweier.',
     'bulk_manager_warn'	        => 'Jou gebruikers is suksesvol opgedateer, maar jou bestuurderinskrywing is nie gestoor nie, want die bestuurder wat jy gekies het, was ook in die gebruikerslys om geredigeer te word, en gebruikers mag nie hul eie bestuurder wees nie. Kies asseblief u gebruikers weer, behalwe die bestuurder.',
     'user_exists'               => 'Gebruiker bestaan ​​reeds!',
-    'user_not_found'            => 'Gebruiker bestaan ​​nie.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Die aanmeldingsveld is nodig',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Die wagwoord is nodig.',
@@ -53,6 +53,7 @@
         'ldap_could_not_search' => 'Kon nie die LDAP-bediener soek nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer. <br>Error van LDAP-bediener:',
         'ldap_could_not_get_entries' => 'Kon nie inskrywings van die LDAP-bediener kry nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer. <br>Error van LDAP-bediener:',
         'password_ldap' => 'Die wagwoord vir hierdie rekening word bestuur deur LDAP / Active Directory. Kontak asseblief u IT-afdeling om u wagwoord te verander.',
+        'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
     ),
 
     'deletefile' => array(

resources/lang/af-ZA/general.php

@@ -419,7 +419,7 @@
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
@@ -559,8 +559,8 @@
     'expires' => 'verstryk',
     'map_fields'=> 'Map :item_type Field',
     'remaining_var' => ':count Remaining',
-    'assets_in_var' => 'Assets in :name :type',
     'label' => 'Label',
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
 
 ];

resources/lang/af-ZA/localizations.php

@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -68,7 +68,7 @@
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
 
     'countries' => [
         'AC'=>'Ascension Island',
@@ -135,6 +135,7 @@
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -233,6 +234,7 @@
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -260,7 +262,7 @@
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -312,6 +314,7 @@
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',

resources/lang/af-ZA/mail.php

@@ -28,19 +28,19 @@
     'a_user_requested' => '\'N Gebruiker het \'n item op die webwerf versoek',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Toebehore Naam:',
-    'additional_notes' => 'Bykomende aantekeninge:',
+    'accessory_name' => 'Toebehore Naam',
+    'additional_notes' => 'Bykomende aantekeninge',
     'admin_has_created' => '\'N Administrateur het \'n rekening vir jou op die webtuiste gemaak.',
-    'asset' => 'bate:',
-    'asset_name' => 'Bate Naam:',
+    'asset' => 'bate',
+    'asset_name' => 'Bate Naam',
     'asset_requested' => 'Bate aangevra',
     'asset_tag' => 'Bate-tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Toevertrou aan',
     'best_regards' => 'Beste wense,',
-    'canceled' => 'gekanselleer:',
-    'checkin_date' => 'Incheckdatum:',
-    'checkout_date' => 'Checkout Datum:',
+    'canceled' => 'gekanselleer',
+    'checkin_date' => 'Incheckdatum',
+    'checkout_date' => 'Checkout Datum',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,13 +49,13 @@
     'click_to_confirm' => 'Klik asseblief op die volgende skakel om u webadres te bevestig:',
     'current_QTY' => 'Huidige QTY',
     'days' => 'dae',
-    'expecting_checkin_date' => 'Verwagte inskrywingsdatum:',
+    'expecting_checkin_date' => 'Verwagte tjekdatum',
     'expires' => 'verstryk',
     'hello' => 'hallo',
     'hi' => 'Hi',
     'i_have_read' => 'Ek het die gebruiksvoorwaardes gelees en ingestem en het hierdie item ontvang.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'item:',
+    'item' => 'item',
     'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Klik asseblief op die volgende skakel om u webtuiste te verander:',
@@ -66,11 +66,11 @@
     'name' => 'naam',
     'new_item_checked' => '\'N Nuwe item is onder u naam nagegaan, besonderhede is hieronder.',
     'notes' => 'notas',
-    'password' => 'wagwoord:',
+    'password' => 'wagwoord',
     'password_reset' => 'Wagwoord Herstel',
     'read_the_terms' => 'Lees asseblief die gebruiksvoorwaardes hieronder.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'versoek:',
+    'requested' => 'versoek',
     'reset_link' => 'Jou wagwoord herstel skakel',
     'reset_password' => 'Klik hier om jou wagwoord terug te stel:',
     'rights_reserved' => 'All rights reserved.',