Merge pull request #18111 from grokability/#16914-better-ldap-sync-phrasing

Fixed #16914: better ldap sync phrasing

app/Console/Commands/SendUpcomingAuditReport.php

@@ -16,7 +16,7 @@ class SendUpcomingAuditReport extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:upcoming-audits';
+    protected $signature = 'snipeit:upcoming-audits {--with-output : Display the results in a table in your console in addition to sending the email}';
 
     /**
      * The console command description.
@@ -47,43 +47,69 @@ class SendUpcomingAuditReport extends Command
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval);
 
-        $assets = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'asc')->get();
-        $this->info($assets->count() . ' assets must be audited in on or before ' . $interval_date . ' is deadline');
-
-
-        if ((count($assets) !== 0) && ($assets->count() > 0) && ($settings->alert_email != '')) {
-            // Send a rollup to the admin, if settings dictate
-            $recipients = collect(explode(',', $settings->alert_email))
-                ->map(fn($item) => trim($item))
-                ->filter(fn($item) => !empty($item))
-                ->all();
-
-
-            $this->info('Sending Admin SendUpcomingAuditNotification to: ' . $settings->alert_email);
-            Mail::to($recipients)->send(new SendUpcomingAuditMail($assets, $settings->audit_warning_days));
-
-            $this->table(
-                [
-                    trans('general.id'),
-                    trans('general.name'),
-                    trans('general.last_audit'),
-                    trans('general.next_audit_date'),
-                    trans('mail.Days'),
-                    trans('mail.supplier'),
-                    trans('mail.assigned_to'),
-
-                ],
-                $assets->map(fn($item) => [
-                    trans('general.id') => $item->id,
-                    trans('general.name') => $item->display_name,
-                    trans('general.last_audit') => $item->last_audit_formatted_date,
-                    trans('general.next_audit_date') => $item->next_audit_formatted_date,
-                    trans('mail.Days') => round($item->next_audit_diff_in_days),
-                    trans('mail.supplier') => $item->supplier ? $item->supplier->name : '',
-                    trans('mail.assigned_to') => $item->assignedTo ? $item->assignedTo->display_name : '',
-                ])
-            );
+        $assets_query = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'asc')->with('supplier');
+        $asset_count = $assets_query->count();
+        $this->info(number_format($asset_count) . ' assets must be audited on or before ' . $interval_date);
+        if (!$this->option('with-output')) {
+            $this->info('Run this command with the --with-output option to see the full list in the console.');
         }
 
+
+        if ($asset_count > 0) {
+
+            $assets_for_email = $assets_query->limit(30)->get();
+
+            // Send a rollup to the admin, if settings dictate
+            if ($settings->alert_email != '') {
+
+                $recipients = collect(explode(',', $settings->alert_email))
+                    ->map(fn($item) => trim($item))
+                    ->filter(fn($item) => !empty($item))
+                    ->all();
+
+                Mail::to($recipients)->send(new SendUpcomingAuditMail($assets_for_email, $settings->audit_warning_days, $asset_count));
+                $this->info('Audit notification sent to: ' . $settings->alert_email);
+
+            } else {
+                $this->info('There is no admin alert email set so no email will be sent.');
+            }
+
+
+
+            if ($this->option('with-output')) {
+
+
+                // Get the full list if the user wants output in the console
+                $assets_for_output = $assets_query->limit(null)->get();
+
+                $this->table(
+                    [
+                        trans('general.id'),
+                        trans('general.name'),
+                        trans('general.last_audit'),
+                        trans('general.next_audit_date'),
+                        trans('mail.Days'),
+                        trans('mail.supplier'),
+                        trans('mail.assigned_to'),
+
+                    ],
+                    $assets_for_output->map(fn($item) => [
+                        trans('general.id') => $item->id,
+                        trans('general.name') => $item->display_name,
+                        trans('general.last_audit') => $item->last_audit_formatted_date,
+                        trans('general.next_audit_date') => $item->next_audit_formatted_date,
+                        trans('mail.Days') => round($item->next_audit_diff_in_days),
+                        trans('mail.supplier') => $item->supplier ? $item->supplier->name : '',
+                        trans('mail.assigned_to') => $item->assignedTo ? $item->assignedTo->display_name : '',
+                    ])
+                );
+            }
+
+        } else {
+            $this->info('There are no assets due for audit in the next ' . $interval . ' days.');
+        }
+
+
+
     }
 }

app/Mail/SendUpcomingAuditMail.php

@@ -17,10 +17,11 @@ class SendUpcomingAuditMail extends Mailable
     /**
      * Create a new message instance.
      */
-    public function __construct($params, $threshold)
+    public function __construct($params, $threshold, $total)
     {
         $this->assets = $params;
         $this->threshold = $threshold;
+        $this->total = $total;
     }
 
     /**
@@ -32,7 +33,7 @@ class SendUpcomingAuditMail extends Mailable
 
         return new Envelope(
             from: $from,
-            subject: trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]),
+            subject: trans_choice('mail.upcoming-audits', $this->total, ['count' => $this->total, 'threshold' => $this->threshold]),
         );
     }
 
@@ -49,6 +50,7 @@ class SendUpcomingAuditMail extends Mailable
             with:  [
                 'assets'  => $this->assets,
                 'threshold'  => $this->threshold,
+                'total'  => $this->total,
             ],
         );
     }

app/Models/LicenseSeat.php

@@ -76,7 +76,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
     protected function displayName(): Attribute
     {
         return Attribute:: make(
-            get: fn(mixed $value) => $this->license->name,
+            get: fn(mixed $value) => $this->license?->name,
         );
     }
 

app/Notifications/CheckoutAssetNotification.php

@@ -93,8 +93,8 @@ class CheckoutAssetNotification extends Notification
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>',
-            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>',
+            trans('general.to_user') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>',
+            trans('general.by_user') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>',
         ];
 
         if ($item->location) {

resources/lang/en-US/admin/users/general.php

@@ -15,7 +15,8 @@ return [
     'info'				=> 'Info',
     'restore_user'		=> 'Click here to restore them.',
     'last_login'        => 'Last Login',
-    'ldap_config_text'  => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
+    'ldap_config_text'  => 'The selected location will be set for ALL imported users. This will overwrite their existing location, and is an unusual use-case, so leaving this blank is typically best.',
+    'ldap_sync_intro'   => 'Click on the button below to manually sync your LDAP users. To learn more about configuring LDAP sync to run automatically, please see the <a href=":link" target="_blank">documentation <i class="fa fa-external-link"></i></a> .',
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',

resources/lang/en-US/general.php

@@ -350,6 +350,7 @@ return [
     'login_disabled'        => 'Login Disabled',
     'audit_due'             => 'Due for Audit',
     'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'audit_due_days_view_all' => '{}Assets Due or Overdue for Audit|[1]View All Assets Due or Overdue for Audit Within a Day|[2,*]View All Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
     'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
@@ -390,6 +391,7 @@ return [
     'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
     'changed'               => 'Changed',
     'to'                    => 'To',
+    'to_user'               => 'To',
     'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
             <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
     'range'                 => 'Range',
@@ -615,6 +617,8 @@ return [
     'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
     'from' => 'From',
     'by' => 'By',
+    'by_user' => 'By',
+    'ldap_sync_location' => 'Sync All Users to This Location (Optional)',
     'version' => 'Version',
     'build' => 'build',
     'use_cloned_image' => 'Clone image from original',

resources/lang/en-US/mail.php

@@ -100,7 +100,8 @@ return [
     'the_following_item' => 'The following item has been checked in: ',
     'to_reset' => 'To reset your :web password, complete this form:',
     'type' => 'Type',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days. ',
+    'upcoming-audits_click' => 'This email may not contain the full list so as not to exceed email size limits. Click on the button below to view all assets due for audit.',
     'user' => 'User',
     'username' => 'Username',
     'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',

resources/views/notifications/markdown/upcoming-audits.blade.php

@@ -1,12 +1,17 @@
 @component('mail::message')
 
-{{ trans_choice('mail.upcoming-audits', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]) }}
+{{ trans_choice('mail.upcoming-audits', $total, ['count' => $total, 'threshold' => $threshold]) }}
+{{ trans('mail.upcoming-audits_click') }}
+
+<x-mail::button :url="route('assets.audit.due')">
+    {{ trans_choice('general.audit_due_days_view_all', $threshold, ['days' => $threshold]) }}
+</x-mail::button>
 
 <x-mail::table>
 |        |        |          |
 | ------------- | ------------- | ------------- |
 @foreach ($assets as $asset)
-| {{ ($asset->next_audit_diff_in_days <= 7) ? '🚨' : (($asset->next_audit_diff_in_days <= 14) ? '⚠️' : '⚠️') }} **{{ trans('mail.name') }}** | <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->display_name }}</a> |
+| {{ ($asset->next_audit_diff_in_days <= 7) ? '🚨' : (($asset->next_audit_diff_in_days <= 14) ? '⚠️' : '⚠️') }} **{{ trans('mail.name') }}** | <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->display_name }}</a>  (<a href="{{ route('asset.audit.create', $asset->id) }}">{{ trans('general.audit') }}</a>)|
 @if ($asset->serial)
 | **{{ trans('general.serial_number') }}** | {{ $asset->serial }} |
 @endif
@@ -33,6 +38,6 @@
 </x-mail::table>
 
 <x-mail::button :url="route('assets.audit.due')">
-    {{ trans_choice('general.audit_due_days', $threshold, ['days' => $threshold]) }}
+    {{ trans_choice('general.audit_due_days_view_all', $threshold, ['days' => $threshold]) }}
 </x-mail::button>
 @endcomponent

resources/views/reports/custom.blade.php

@@ -412,9 +412,10 @@
             <div class="form-group purchase-range{{ ($errors->has('purchase_start') || $errors->has('purchase_end')) ? ' has-error' : '' }}">
               <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }}</label>
               <div class="input-daterange input-group col-md-7" id="purchase-range-datepicker">
-                  <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start" value="{{ $template->textValue('purchase_start', old('purchase_start')) }}">
-                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                  <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end" value="{{ $template->textValue('purchase_end', old('purchase_end')) }}">
+
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="purchase_start" aria-label="purchase_start" value="{{ $template->textValue('purchase_start', old('purchase_start')) }}">
+                  <span class="input-group-addon"> - </span>
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="purchase_end" aria-label="purchase_end" value="{{ $template->textValue('purchase_end', old('purchase_end')) }}">
               </div>
 
                 @if ($errors->has('purchase_start') || $errors->has('purchase_end'))
@@ -431,7 +432,7 @@
               <label for="purchase_cost_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.cost') }}</label>
               <div class="input-group col-md-7">
                   <input type="number" min="0" step="0.01" class="form-control" name="purchase_cost_start" aria-label="purchase_cost_start" value="{{ $template->textValue('purchase_cost_start', old('purchase_cost_start')) }}">
-                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                  <span class="input-group-addon"> - </span>
                   <input type="number" min="0" step="0.01" class="form-control" name="purchase_cost_end" aria-label="purchase_cost_end" value="{{ $template->textValue('purchase_cost_end', old('purchase_cost_end')) }}">
               </div>
 
@@ -448,9 +449,9 @@
             <div class="form-group created-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
               <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} </label>
               <div class="input-daterange input-group col-md-7" id="created-range-datepicker">
-                  <input type="text" class="form-control" name="created_start" aria-label="created_start" value="{{ $template->textValue('created_start', old('created_start')) }}">
-                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                  <input type="text" class="form-control" name="created_end" aria-label="created_end" value="{{ $template->textValue('created_end', old('created_end')) }}">
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="created_start" aria-label="created_start" value="{{ $template->textValue('created_start', old('created_start')) }}">
+                  <span class="input-group-addon"> - </span>
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="created_end" aria-label="created_end" value="{{ $template->textValue('created_end', old('created_end')) }}">
               </div>
 
                 @if ($errors->has('created_start') || $errors->has('created_end'))
@@ -465,9 +466,9 @@
           <div class="form-group checkout-range{{ ($errors->has('checkout_date_start') || $errors->has('checkout_date_end')) ? ' has-error' : '' }}">
               <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} </label>
               <div class="input-daterange input-group col-md-7" id="checkout-range-datepicker">
-                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ $template->textValue('checkout_date_start', old('checkout_date_start')) }}">
-                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ $template->textValue('checkout_date_end', old('checkout_date_end')) }}">
+                  <input type="text" placeholder="{{ trans('general.select_date') }}"  class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ $template->textValue('checkout_date_start', old('checkout_date_start')) }}">
+                  <span class="input-group-addon"> - </span>
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ $template->textValue('checkout_date_end', old('checkout_date_end')) }}">
               </div>
 
               @if ($errors->has('checkout_date_start') || $errors->has('checkout_date_end'))
@@ -483,9 +484,9 @@
           <div class="form-group checkin-range{{ ($errors->has('checkin_date_start') || $errors->has('checkin_date_end')) ? ' has-error' : '' }}">
               <label for="checkin_date" class="col-md-3 control-label">{{ trans('admin/hardware/table.last_checkin_date') }}</label>
               <div class="input-daterange input-group col-md-7" id="checkin-range-datepicker">
-                  <input type="text" class="form-control" name="checkin_date_start" aria-label="checkin_date_start" value="{{ $template->textValue('checkin_date_start', old('checkin_date_start')) }}">
-                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                  <input type="text" class="form-control" name="checkin_date_end" aria-label="checkin_date_end" value="{{ $template->textValue('checkin_date_end', old('checkin_date_end')) }}">
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="checkin_date_start" aria-label="checkin_date_start" value="{{ $template->textValue('checkin_date_start', old('checkin_date_start')) }}">
+                  <span class="input-group-addon"> - </span>
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="checkin_date_end" aria-label="checkin_date_end" value="{{ $template->textValue('checkin_date_end', old('checkin_date_end')) }}">
               </div>
 
               @if ($errors->has('checkin_date_start') || $errors->has('checkin_date_end'))
@@ -500,9 +501,9 @@
             <div class="form-group expected_checkin-range{{ ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end')) ? ' has-error' : '' }}">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
               <div class="input-daterange input-group col-md-7" id="expected_checkin-range-datepicker">
-                  <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ $template->textValue('expected_checkin_start', old('expected_checkin_start')) }}">
-                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                  <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ $template->textValue('expected_checkin_end', old('expected_checkin_end')) }}">
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ $template->textValue('expected_checkin_start', old('expected_checkin_start')) }}">
+                  <span class="input-group-addon"> - </span>
+                  <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ $template->textValue('expected_checkin_end', old('expected_checkin_end')) }}">
               </div>
 
                 @if ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end'))
@@ -518,9 +519,9 @@
               <div class="form-group asset_eol_date-range {{ ($errors->has('asset_eol_date_start') || $errors->has('asset_eol_date_end')) ? ' has-error' : '' }}">
                   <label for="asset_eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
                   <div class="input-daterange input-group col-md-7" id="asset_eol_date-range-datepicker">
-                      <input type="text" class="form-control" name="asset_eol_date_start" aria-label="asset_eol_date_start" value="{{ $template->textValue('asset_eol_date_start', old('asset_eol_date_start')) }}">
-                      <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="asset_eol_date_end" aria-label="asset_eol_date_end" value="{{ $template->textValue('asset_eol_date_end', old('asset_eol_date_end')) }}">
+                      <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="asset_eol_date_start" aria-label="asset_eol_date_start" value="{{ $template->textValue('asset_eol_date_start', old('asset_eol_date_start')) }}">
+                      <span class="input-group-addon"> - </span>
+                      <input type="text" placeholder="{{ trans('general.select_date') }}" class="form-control" name="asset_eol_date_end" aria-label="asset_eol_date_end" value="{{ $template->textValue('asset_eol_date_end', old('asset_eol_date_end')) }}">
                   </div>
 
                   @if ($errors->has('asset_eol_date_start') || $errors->has('asset_eol_date_end'))
@@ -535,9 +536,9 @@
               <div class="form-group last_audit-range{{ ($errors->has('last_audit_start') || $errors->has('last_audit_end')) ? ' has-error' : '' }}">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
                   <div class="input-daterange input-group col-md-7" id="last_audit-range-datepicker">
-                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ $template->textValue('last_audit_start', old('last_audit_start')) }}">
-                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ $template->textValue('last_audit_end', old('last_audit_end')) }}">
+                      <input type="text" placeholder="{{ trans('general.select_date') }}"  class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ $template->textValue('last_audit_start', old('last_audit_start')) }}">
+                      <span class="input-group-addon"> - </span>
+                      <input type="text" placeholder="{{ trans('general.select_date') }}"  class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ $template->textValue('last_audit_end', old('last_audit_end')) }}">
                   </div>
 
                   @if ($errors->has('last_audit_start') || $errors->has('last_audit_end'))
@@ -552,9 +553,9 @@
               <div class="form-group next_audit-range{{ ($errors->has('next_audit_start') || $errors->has('next_audit_end')) ? ' has-error' : '' }}">
                   <label for="next_audit_start" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
                   <div class="input-daterange input-group col-md-7" id="next_audit-range-datepicker">
-                      <input type="text" class="form-control" name="next_audit_start" aria-label="next_audit_start" value="{{ $template->textValue('next_audit_start', old('next_audit_start')) }}">
-                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ $template->textValue('next_audit_end', old('next_audit_end')) }}">
+                      <input type="text" placeholder="{{ trans('general.select_date') }}"  class="form-control" name="next_audit_start" aria-label="next_audit_start" value="{{ $template->textValue('next_audit_start', old('next_audit_start')) }}">
+                      <span class="input-group-addon"> - </span>
+                      <input type="text" placeholder="{{ trans('general.select_date') }}"  class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ $template->textValue('next_audit_end', old('next_audit_end')) }}">
                   </div>
 
                   @if ($errors->has('next_audit_start') || $errors->has('next_audit_end'))
@@ -569,9 +570,9 @@
               <div class="form-group last_updated-range{{ ($errors->has('last_updated_start') || $errors->has('last_updated_end')) ? ' has-error' : '' }}">
                   <label for="last_updated_start" class="col-md-3 control-label">{{ trans('general.updated_at') }}</label>
                   <div class="input-daterange input-group col-md-7" id="last_updated-range-datepicker">
-                      <input type="text" class="form-control" name="last_updated_start" aria-label="last_updated_start" value="{{ $template->textValue('last_updated_start', old('last_updated_start')) }}">
-                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                      <input type="text" class="form-control" name="last_updated_end" aria-label="last_updated_end" value="{{ $template->textValue('last_updated_end', old('last_updated_end')) }}">
+                      <input type="text" placeholder="{{ trans('general.select_date') }}"  class="form-control" name="last_updated_start" aria-label="last_updated_start" value="{{ $template->textValue('last_updated_start', old('last_updated_start')) }}">
+                      <span class="input-group-addon"> - </span>
+                      <input type="text" placeholder="{{ trans('general.select_date') }}"  class="form-control" name="last_updated_end" aria-label="last_updated_end" value="{{ $template->textValue('last_updated_end', old('last_updated_end')) }}">
                   </div>
 
                   @if ($errors->has('last_updated_start') || $errors->has('last_updated_end'))

resources/views/settings/general.blade.php

@@ -34,7 +34,7 @@
 
                    <div class="col-md-12">
 
-                       <fieldset">
+                       <fieldset>
                            <x-form-legend>
                                {{ trans('admin/settings/general.legends.scoping') }}
                            </x-form-legend>

resources/views/users/ldap.blade.php

@@ -16,7 +16,7 @@
 @section('content')
 
 <div class="row">
-  <div class="col-md-9">
+  <div class="col-md-12">
     @if ($snipeSettings->ldap_enabled == 0)
       {{ trans('admin/users/message.ldap_not_configured') }}
     @else
@@ -24,13 +24,19 @@
       {{csrf_field()}}
       <div class="box box-default">
         <div class="box-body">
+
+                <div class="callout callout-legend col-md-12">
+
+                    <p>
+                        <i class="fa-solid fa-lightbulb"></i>
+                        <strong>{!!  trans('admin/users/general.ldap_sync_intro', ['link' => 'https://snipe-it.readme.io/docs/ldap-sync#/']) !!}</strong>
+                    </p>
+                </div>
+         
           <!-- location_id-->
           <div class="form-group {{ $errors->has('location_id') ? 'has-error' : '' }}">
-            
-            <div class="col-md-12">
                <!-- Location -->
-              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id[]', 'multiple' => true])
-            </div>
+              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.ldap_sync_location'), 'help_text' => trans('admin/users/general.ldap_config_text'), 'fieldname' => 'location_id[]', 'multiple' => true])
           </div>
 
             <div class="box-footer">
@@ -50,10 +56,7 @@
     </form>
   </div>
   <div class="col-md-3">
-    <p>
-        {{ trans('admin/users/general.ldap_config_text') }}
-    </p>
-  <p><a href="{{ route('settings.ldap.index') }}">{{ trans('admin/settings/general.ldap_settings_link') }}</a></p>
+
   </div>
 </div>
 

routes/web/users.php

@@ -2,6 +2,7 @@
 
 use App\Http\Controllers\Users;
 use Illuminate\Support\Facades\Route;
+use Tabuna\Breadcrumbs\Trail;
 
 // User Management
 
@@ -13,7 +14,10 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
             Users\LDAPImportController::class, 
             'create'
         ]
-    )->name('ldap/user');
+    )->name('ldap/user')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('users.index')
+            ->push(trans('general.ldap_user_sync'), route('ldap/user')));;
 
     Route::post(
         'ldap',

tests/Unit/LdapTest.php

@@ -121,7 +121,7 @@ class LdapTest extends TestCase
         $ldap_set_option->expects($this->exactly(12));
 
         //
-        $this->getFunctionMock("App\\Models", "ldap_bind")->expects($this->exactly(4))->willReturn(
+        $this->getFunctionMock("App\\Models", "ldap_bind")->expects($this->exactly(3))->willReturn(
             true, /* initial admin connection for 'fast path' */
             false, /* the actual login for the user */
             false, /* the direct login for the user binding-as-themselves in the legacy path */