Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json
2022-07-15 17:11:55 -07:00 · 2022-07-15 17:11:55 -07:00 · 6f1f6c75e6
commit 6f1f6c75e6
parent a0183ff56f 40d5c37aea
14 changed files with 46 additions and 26 deletions
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@ -73,9 +73,6 @@ class LicensesController extends Controller
            $licenses->where('depreciation_id', '=', $request->input('depreciation_id'));
        }

-        if ($request->filled('supplier_id')) {
-            $licenses->where('supplier_id', '=', $request->input('supplier_id'));
-        }

        if (($request->filled('maintained')) && ($request->input('maintained')=='true')) {
            $licenses->where('maintained','=',1);
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@ -642,6 +642,10 @@ class ReportsController extends Controller
            if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
            }
+            if($request->filled('exclude_archived')){
+                $assets->notArchived();
+            }
+
            $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
            
                $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@ -628,14 +628,16 @@ class UsersController extends Controller
    {
        $this->authorize('view', User::class);

-        if( User::where('id', $id)->first()->exists())
-            {
-                $user= User::where('id', $id)->first();
-                $user->notify((new CurrentInventory($user)));
-                return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
-            }
+        if (!$user = User::find($id)) {
+            return redirect()->back()
+                ->with('error', trans('admin/users/message.user_not_found', ['id' => $id]));
+        }
+        if (empty($user->email)) {
+            return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email'));
+        }

-        return redirect()->back()->with('error', 'admin/accessories/message.user_does_not_exist');
+        $user->notify((new CurrentInventory($user)));
+        return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
    }

    /**
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@ -57,7 +57,7 @@ class ActionlogsTransformer

        $file_url = '';
        if($actionlog->filename!='') {
-            if ($actionlog->present()->actionType() == 'accepted') {
+            if ($actionlog->action_type == 'accepted') {
                $file_url = route('log.storedeula.download', ['filename' => $actionlog->filename]);
            } else {
                if ($actionlog->itemType() == 'asset') {
--- a/public/css/build/app.css
+++ b/public/css/build/app.css
--- a/public/css/build/overrides.css
+++ b/public/css/build/overrides.css
--- a/public/css/dist/all.css
+++ b/public/css/dist/all.css
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@ -1,8 +1,8 @@
 {
    "/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea543e967cb778",
    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=2be7c5d95ea8ef31b7e574aeb7a509b0",
-    "/css/build/app.css": "/css/build/app.css?id=11a1c1381fc60fee9d448138adcf2b35",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=6a8926c5699dc8117fce282bddef6222",
+    "/css/build/app.css": "/css/build/app.css?id=e319e07a1e4eeb413e5667136850ea12",
    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa",
    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=083eab0a6e1062adfe24ee21a829e6c3",
    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=43789a18d950ebfc2bdac669bbd55160",
@ -18,7 +18,7 @@
    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=af9b811e81b591789d1155c0d4ed42af",
    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fc501683e0cb04a8717593610d215baf",
    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=476ccb37fe487f4d29ebfb49c198e311",
-    "/css/dist/all.css": "/css/dist/all.css?id=f284ea39416dc9275bd83eccfafd3841",
+    "/css/dist/all.css": "/css/dist/all.css?id=82b3119afe3686b7f39f0ae690959768",
    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
    "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5",
    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@ -434,6 +434,14 @@ h2 {
  font-size: 22px;
 }

+h2.task_menu {
+  font-size: 14px;
+}
+
+h2 small {
+  font-size: 85%;
+}
+
 h3 {
  font-size: 20px;
 }
--- a/resources/lang/en/admin/users/message.php
+++ b/resources/lang/en/admin/users/message.php
@ -14,6 +14,7 @@ return array(
    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',


    'success' => array(
@ -58,4 +59,4 @@ return array(
        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
    ),

-);
+);
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@ -101,6 +101,7 @@ return [
    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'This is used to generate email addresses when importing',
    'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
    'example'				=> 'Example: ',
    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@ -271,7 +271,7 @@

                        <li><!-- Task item -->
                          <a href="{{route($alert_items[$i]['type'].'.show', $alert_items[$i]['id'])}}">
-                            <h2>{{ $alert_items[$i]['name'] }}
+                            <h2 class="task_menu">{{ $alert_items[$i]['name'] }}
                              <small class="pull-right">
                                {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}
                              </small>
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@ -340,11 +340,14 @@
              </div>

            <div class="col-md-9 col-md-offset-3">
+            <label>
+              {{ Form::checkbox('exclude_archived', '1') }}
+              {{ trans('general.exclude_archived') }}
+            </label>
              <label>
                {{ Form::checkbox('use_bom', '1') }}
                {{ trans('general.bom_remark') }}
              </label>
-
            </div>

          </div>
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@ -184,12 +184,16 @@
                @endcan

                @can('view', $user)
-                    <div class="col-md-12" style="padding-top: 5px;">
-                        <form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
-                            {{ csrf_field() }}
-                            <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener">{{ trans('admin/users/general.email_assigned') }}</button>
-                        </form>
-                    </div>
+                  <div class="col-md-12" style="padding-top: 5px;">
+                  @if(!empty($user->email))
+                    <form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
+                      {{ csrf_field() }}
+                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener">{{ trans('admin/users/general.email_assigned') }}</button>
+                    </form>
+                  @else
+                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('admin/users/general.email_assigned') }}</button>
+                  @endif
+                  </div>
                @endcan

                @can('update', $user)