Merge branch 'develop' into v8

Author: uberbrady

app/Http/Controllers/Api/CompaniesController.php

@@ -43,7 +43,7 @@ public function index(Request $request) : JsonResponse | array
 
         $companies = Company::withCount(['assets as assets_count'  => function ($query) {
             $query->AssetsForShow();
-        }])->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
+        }])->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
 
         if ($request->filled('search')) {
             $companies->TextSearch($request->input('search'));

app/Http/Controllers/Api/LocationsController.php

@@ -258,7 +258,7 @@ public function assignedAccessories(Request $request, Location $location) : Json
     {
         $this->authorize('view', Accessory::class);
         $this->authorize('view', $location);
-        $accessory_checkouts = AccessoryCheckout::LocationAssigned()->with('adminuser')->with('accessories');
+        $accessory_checkouts = AccessoryCheckout::LocationAssigned()->where('assigned_to', $location->id)->with('adminuser')->with('accessories');
 
         $offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
         $limit = app('api_limit_value');

app/Http/Controllers/SettingsController.php

@@ -800,6 +800,7 @@ public function postLabels(StoreLabelSettings $request) : RedirectResponse
         }
 
         if ($setting->save()) {
+
             return redirect()->route('settings.labels.index')
                 ->with('success', trans('admin/settings/message.update.success'));
         }

app/Http/Requests/StoreLabelSettings.php

@@ -2,8 +2,11 @@
 
 namespace App\Http\Requests;
 
+
+use App\Models\Labels\Label;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;
 
 class StoreLabelSettings extends FormRequest
 {
@@ -22,6 +25,10 @@ public function authorize(): bool
      */
     public function rules(): array
     {
+        $names = Label::find()?->map(function ($label) {
+            return $label->getName();
+        })->values()->toArray();
+
         return [
             'labels_per_page'                     => 'numeric',
             'labels_width'                        => 'numeric',
@@ -36,6 +43,10 @@ public function rules(): array
             'labels_pagewidth'                    => 'numeric|nullable',
             'labels_pageheight'                   => 'numeric|nullable',
             'qr_text'                             => 'max:31|nullable',
+            'label2_template'                     => [
+                'required',
+                Rule::in($names),
+            ],
         ];
     }
 }

app/Models/Labels/Label.php

@@ -411,14 +411,14 @@ public final function write2DBarcode(TCPDF $pdf, $value, $type, $x, $y, $width,
     /**
      * Checks the template is internally valid
      */
-    public final function validate() {
+    public final function validate() : void {
         $this->validateUnits();
         $this->validateSize();
         $this->validateMargins();
         $this->validateSupport();
     }
 
-    private function validateUnits() {
+    private function validateUnits() : void {
         $validUnits = [ 'pt', 'mm', 'cm', 'in' ];
         $unit = $this->getUnit();
         if (!in_array(strtolower($unit), $validUnits)) {
@@ -430,7 +430,7 @@ private function validateUnits() {
         }
     }
 
-    private function validateSize() {
+    private function validateSize() : void {
         $width = $this->getWidth();
         if (!is_numeric($width) || is_string($width)) {
             throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [
@@ -450,7 +450,7 @@ private function validateSize() {
         }
     }
 
-    private function validateMargins() {
+    private function validateMargins() : void {
         $marginTop = $this->getMarginTop();
         if (!is_numeric($marginTop) || is_string($marginTop)) {
             throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [
@@ -488,7 +488,7 @@ private function validateMargins() {
         }
     }
 
-    private function validateSupport() {
+    private function validateSupport() : void {
         $support1D = $this->getSupport1DBarcode();
         if (!is_bool($support1D)) {
             throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [

app/Models/User.php

@@ -626,6 +626,8 @@ public static function generateFormattedNameFromFullName($users_name, $format =
                 $username = str_slug(substr($first_name, 0, 1).'.'.str_slug($last_name));
             } elseif ($format == 'lastname_firstinitial') {
                 $username = str_slug($last_name).'_'.str_slug(substr($first_name, 0, 1));
+            } elseif ($format == 'lastname.firstinitial') {
+                $username = str_slug($last_name).'.'.str_slug(substr($first_name, 0, 1));
             } elseif ($format == 'firstnamelastname') {
                 $username = str_slug($first_name).str_slug($last_name);
             } elseif ($format == 'firstnamelastinitial') {

app/View/Label.php

@@ -7,6 +7,7 @@
 use App\Models\Labels\Sheet;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Traits\Macroable;
 use TCPDF;
@@ -38,7 +39,7 @@ public function render(callable $callback = null)
         $settings = $this->data->get('settings');
         $assets = $this->data->get('assets');
         $offset = $this->data->get('offset');
-        $template = LabelModel::find($settings->label2_template);
+
 
         // If disabled, pass to legacy view
         if ((!$settings->label2_enable)) {
@@ -49,6 +50,12 @@ public function render(callable $callback = null)
                 ->with('count', $this->data->get('count'));
         }
 
+            $template = LabelModel::find($settings->label2_template);
+
+        if ($template === null) {
+            return redirect()->route('settings.labels.index')->with('error', trans('admin/settings/message.labels.null_template'));
+        }
+
         $template->validate();
 
         $pdf = new TCPDF(

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

@@ -109,8 +109,8 @@
     'ldap_pword'                => 'crwdns1453:0crwdne1453:0',
     'ldap_basedn'               => 'crwdns1454:0crwdne1454:0',
     'ldap_filter'               => 'crwdns1455:0crwdne1455:0',
-    'ldap_pw_sync'              => 'crwdns1692:0crwdne1692:0',
-    'ldap_pw_sync_help'         => 'crwdns1693:0crwdne1693:0',
+    'ldap_pw_sync'              => 'crwdns12882:0crwdne12882:0',
+    'ldap_pw_sync_help'         => 'crwdns12884:0crwdne12884:0',
     'ldap_username_field'       => 'crwdns1456:0crwdne1456:0',
     'ldap_lname_field'          => 'crwdns1457:0crwdne1457:0',
     'ldap_fname_field'          => 'crwdns1458:0crwdne1458:0',
@@ -330,6 +330,10 @@
     'purge_help' => 'crwdns6469:0crwdne6469:0',
     'ldap_extension_warning' => 'crwdns6471:0crwdne6471:0',
     'ldap_ad' => 'crwdns6473:0crwdne6473:0',
+    'ldap_test_label' => 'crwdns12892:0crwdne12892:0',
+    'ldap_test_login' => 'crwdns12894:0crwdne12894:0',
+    'ldap_username_placeholder' => 'crwdns12896:0crwdne12896:0',
+    'ldap_password_placeholder' => 'crwdns12898:0crwdne12898:0',
     'employee_number' => 'crwdns6475:0crwdne6475:0',
     'create_admin_user' => 'crwdns6477:0crwdne6477:0',
     'create_admin_success' => 'crwdns6479:0crwdne6479:0',

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

@@ -36,6 +36,9 @@
         'testing_authentication' => 'crwdns6729:0crwdne6729:0',
         'authentication_success' => 'crwdns6731:0crwdne6731:0'
     ],
+    'labels' => [
+        'null_template' => 'crwdns12900:0crwdne12900:0',
+        ],
     'webhook' => [
         'sending' => 'crwdns11373:0crwdne11373:0',
         'success' => 'crwdns11841:0crwdne11841:0',
@@ -46,5 +49,6 @@
         'error_redirect' => 'crwdns11843:0crwdne11843:0',
         'error_misc' => 'crwdns11383:0crwdne11383:0',
         'webhook_fail' => 'crwdns12830:0crwdne12830:0',
+        'webhook_channel_not_found' => 'crwdns12876:0crwdne12876:0'
     ]
 ];

resources/lang/aa-ER/general.php

@@ -92,6 +92,7 @@
     'customize_report'      => 'crwdns6115:0crwdne6115:0',
     'custom_report'         => 'crwdns1139:0crwdne1139:0',
     'dashboard'				=> 'crwdns1202:0crwdne1202:0',
+    'data_source'           => 'crwdns12886:0crwdne12886:0',
     'days'      			=> 'crwdns1917:0crwdne1917:0',
     'days_to_next_audit'    => 'crwdns1918:0crwdne1918:0',
     'date'					=> 'crwdns1045:0crwdne1045:0',
@@ -127,6 +128,7 @@
     'firstname_lastname_underscore_format' => 'crwdns1995:0crwdne1995:0',
     'lastnamefirstinitial_format' =>  'crwdns1999:0crwdne1999:0',
     'firstintial_dot_lastname_format' => 'crwdns5948:0crwdne5948:0',
+    'lastname_dot_firstinitial_format' => 'crwdns12880:0crwdne12880:0',
     'firstname_lastname_display'	=> 'crwdns11779:0crwdne11779:0',
     'lastname_firstname_display'	=> 'crwdns11781:0crwdne11781:0',
     'name_display_format'	=> 'crwdns11783:0crwdne11783:0',
@@ -217,6 +219,8 @@
     'no'  					=> 'crwdns1075:0crwdne1075:0',
     'notes'  				=> 'crwdns1076:0crwdne1076:0',
     'note_added'            => 'crwdns12858:0crwdne12858:0',
+    'options'				=> 'crwdns12888:0crwdne12888:0',
+    'preview'				=> 'crwdns12890:0crwdne12890:0',
     'add_note'              => 'crwdns12860:0crwdne12860:0',
     'note_edited'            => 'crwdns12862:0crwdne12862:0',
     'edit_note'              => 'crwdns12864:0crwdne12864:0',
@@ -560,6 +564,7 @@
         'consumables'  => 'crwdns12144:0crwdne12144:0',
         'components'  => 'crwdns12146:0crwdne12146:0',
     ],
+
     'more_info' => 'crwdns12288:0crwdne12288:0',
     'quickscan_bulk_help' => 'crwdns12290:0crwdne12290:0',
     'whoops' => 'crwdns12304:0crwdne12304:0',
@@ -576,4 +581,9 @@
     'user_managed_passwords_disallow' => 'crwdns12872:0crwdne12872:0',
     'user_managed_passwords_allow' => 'crwdns12874:0crwdne12874:0',
 
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'crwdns12878:0crwdne12878:0',
+    ],
+
 ];