Merge pull request #952 from dbarzin/dev

Dev
dbarzin · Nov 11, 2024 · 2510770 · 2510770
2 parents 612cb9c + 1c7e9b1
commit 2510770
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/Console/Commands/CertificateExpiracy.php b/app/Console/Commands/CertificateExpiracy.php
@@ -66,8 +66,12 @@ public function handle()
                         Log::debug('CertificateExpiracy - ' . $cert->name . ' never notified.');
                         $cert->last_notification = now();
                         $cert->save();
-                    } elseif ($cert->last_notification > now()->addDays(-intval(config('mercator-config.cert.expire-delay')))) {
-                        Log::debug('CertificateExpiracy - ' . $cert->name . ' already notified.');
+                    } elseif (
+                        Carbon::createFromFormat(config('panel.date_format') . ' ' . config('panel.time_format'), $cert->last_notification)
+                        ->lessThan(
+                        now()->addDays(-intval(config('mercator-config.cert.expire-delay'))))
+                        ) {
+                        Log::debug('CertificateExpiracy - ' . $cert->name . ' already notified on ' . $cert->last_notification);
                         $certificates->forget($key);
                     } else {
                         // must be notified

diff --git a/resources/views/admin/processes/create.blade.php b/resources/views/admin/processes/create.blade.php
@@ -11,7 +11,7 @@
         <div class="card-body">
             <div class="form-group">
                 <label class="required" for="name">{{ trans('cruds.process.fields.name') }}</label>
-                <input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', '') }}" required>
+                <input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', '') }}" maxlength=32 required>
                 @if($errors->has('name'))
                     <div class="invalid-feedback">
                         {{ $errors->first('name') }}

diff --git a/resources/views/admin/processes/edit.blade.php b/resources/views/admin/processes/edit.blade.php
@@ -12,7 +12,7 @@
         <div class="card-body">
             <div class="form-group">
                 <label class="required" for="name">{{ trans('cruds.process.fields.name') }}</label>
-                <input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', $process->name) }}" required>
+                <input class="form-control {{ $errors->has('name') ? 'is-invalid' : '' }}" type="text" name="name" id="name" value="{{ old('name', $process->name) }}" maxlength=32 required>
                 @if($errors->has('name'))
                     <div class="invalid-feedback">
                         {{ $errors->first('name') }}