Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/lang/en/admin/locations/general.php

Dockerfile

@@ -23,6 +23,7 @@ php7.4-xml \
 php7.4-mbstring \
 php7.4-zip \
 php7.4-bcmath \
+php7.4-redis \
 patch \
 curl \
 wget  \

Dockerfile.alpine

@@ -27,6 +27,7 @@ RUN  apk add --no-cache \
         php7-xmlwriter \
         php7-xmlreader \
         php7-sodium \
+        php7-redis \
         curl \
         wget \
         vim \

app/Helpers/Helper.php

@@ -841,6 +841,16 @@ class Helper
         return preg_replace('/\s+/u', '_', trim($string));
     }
 
+    /**
+     * Return an array (or null) of the the raw and formatted date object for easy use in
+     * the API and the bootstrap table listings.
+     *
+     * @param $date
+     * @param $type
+     * @param $array
+     * @return array|string|null
+     */
+
     public static function getFormattedDateObject($date, $type = 'datetime', $array = true)
     {
         if ($date == '') {
@@ -848,21 +858,42 @@ class Helper
         }
 
         $settings = Setting::getSettings();
-        $tmp_date = new \Carbon($date);
 
-        if ($type == 'datetime') {
+        /**
-            $dt['datetime'] = $tmp_date->format('Y-m-d H:i:s');
+         * Wrap this in a try/catch so that if Carbon crashes, for example if the $date value
-            $dt['formatted'] = $tmp_date->format($settings->date_display_format.' '.$settings->time_display_format);
+         * isn't actually valid, we don't crash out completely.
-        } else {
+         *
-            $dt['date'] = $tmp_date->format('Y-m-d');
+         * While this *shouldn't* typically happen since we validate dates before entering them
-            $dt['formatted'] = $tmp_date->format($settings->date_display_format);
+         * into the database (and we use date/datetime fields for native fields in the system),
+         * it is a possible scenario that a custom field could be created as an "ANY" field, data gets
+         * added, and then the custom field format gets edited later. If someone put bad data in the
+         * database before then - or if they manually edited the field's value - it will crash.
+         *
+         */
+
+
+        try {
+            $tmp_date = new \Carbon($date);
+
+            if ($type == 'datetime') {
+                $dt['datetime'] = $tmp_date->format('Y-m-d H:i:s');
+                $dt['formatted'] = $tmp_date->format($settings->date_display_format.' '.$settings->time_display_format);
+            } else {
+                $dt['date'] = $tmp_date->format('Y-m-d');
+                $dt['formatted'] = $tmp_date->format($settings->date_display_format);
+            }
+
+            if ($array == 'true') {
+                return $dt;
+            }
+
+            return $dt['formatted'];
+
+        } catch (\Exception $e) {
+            \Log::warning($e);
+            return $date.' (Invalid '.$type.' value.)';
         }
 
-        if ($array == 'true') {
-            return $dt;
-        }
-
-        return $dt['formatted'];
     }
 
     // Nicked from Drupal :)

app/Http/Controllers/Api/UsersController.php

@@ -519,10 +519,14 @@ class UsersController extends Controller
     {
         $this->authorize('view', User::class);
         $this->authorize('view', License::class);
-        $user = User::where('id', $id)->withTrashed()->first();
+        
-        $licenses = $user->licenses()->get();
+        if ($user = User::where('id', $id)->withTrashed()->first()) {
+            $licenses = $user->licenses()->get();
+            return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))));
 
-        return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
     }
 
     /**

app/Http/Controllers/LocationsController.php

@@ -211,23 +211,35 @@ class LocationsController extends Controller
 
     public function print_assigned($id)
     {
-        $location = Location::where('id', $id)->first();
-        $parent = Location::where('id', $location->parent_id)->first();
-        $manager = User::where('id', $location->manager_id)->first();
-        $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
-        $assets = Asset::where('assigned_to', $id)->where('assigned_type', Location::class)->with('model', 'model.category')->get();
 
-        return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
+        if ($location = Location::where('id', $id)->first()) {
+            $parent = Location::where('id', $location->parent_id)->first();
+            $manager = User::where('id', $location->manager_id)->first();
+            $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
+            $assets = Asset::where('assigned_to', $id)->where('assigned_type', Location::class)->with('model', 'model.category')->get();
+            return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
+
+        }
+
+        return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
+
+
+
     }
 
     public function print_all_assigned($id)
     {
-        $location = Location::where('id', $id)->first();
+        if ($location = Location::where('id', $id)->first()) {
-        $parent = Location::where('id', $location->parent_id)->first();
+            $parent = Location::where('id', $location->parent_id)->first();
-        $manager = User::where('id', $location->manager_id)->first();
+            $manager = User::where('id', $location->manager_id)->first();
-        $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
+            $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
-        $assets = Asset::where('location_id', $id)->with('model', 'model.category')->get();
+            $assets = Asset::where('location_id', $id)->with('model', 'model.category')->get();
+            return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
+
+        }
+        return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
+
+
 
-        return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
     }
 }

resources/lang/en/admin/locations/general.php

@@ -6,4 +6,5 @@ return array(
     'assigned_to' => 'Assigned To:',
     'manager' => 'Manager',
     'date' => 'Current Date:',
+
 );

resources/views/locations/print.blade.php

@@ -156,34 +156,23 @@
 <table>
     <tr>
         <td>{{ trans('admin/locations/table.signed_by_asset_auditor') }}</td>
-        <td>___________________________</td>
+        <td><br>------------------------------------------------------ &nbsp;&nbsp;&nbsp;<br></td>
-        <td></td>
         <td>{{ trans('admin/locations/table.date') }}</td>
-        <td>____________________</td>
+        <td><br>------------------------------ &nbsp;&nbsp;&nbsp;<br></td>
     </tr>
-</table>
+
-<br>
-<br>
-<br>
-<table>
     <tr>
         <td>{{ trans('admin/locations/table.signed_by_finance_auditor') }}</td>
-        <td>____________________</td>
+        <td><br>------------------------------------------------------ &nbsp;&nbsp;&nbsp;<br></td>
-        <td></td>
         <td>{{ trans('admin/locations/table.date') }}</td>
-        <td>____________________</td>
+        <td><br>------------------------------ &nbsp;&nbsp;&nbsp;<br></td>
     </tr>
-</table>
+
-<br>
-<br>
-<br>
-<table>
     <tr>
         <td>{{ trans('admin/locations/table.signed_by_location_manager') }}</td>
-        <td>_______________________</td>
+        <td><br>------------------------------------------------------ &nbsp;&nbsp;&nbsp;<br></td>
-        <td></td>
         <td>{{ trans('admin/locations/table.date') }}</td>
-        <td>____________________</td>
+        <td><br>------------------------------ &nbsp;&nbsp;&nbsp;<br></td>
     </tr>
 </table>
 

resources/views/locations/view.blade.php

@@ -191,9 +191,20 @@
 
   <div class="col-md-3">
 
+      <div class="col-md-12">
+          <a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary pull-left">{{ trans('admin/locations/table.update') }} </a>
+      </div>
+      <div class="col-md-12" style="padding-top: 5px;">
+          <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_assigned') }} </a>
+      </div>
+      <div class="col-md-12" style="padding-top: 5px; padding-bottom: 20px;">
+          <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_all_assigned') }} </a>
+      </div>
+
+
     @if ($location->image!='')
       <div class="col-md-12 text-center" style="padding-bottom: 20px;">
-        <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" alt="{{ $location->name }}">
+        <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
       </div>
     @endif
       <div class="col-md-12">
@@ -220,21 +231,13 @@
 
         @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
           <div class="col-md-12 text-center">
-            <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
+            <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
           </div>
         @endif
 
       </div>
 
-		<div class="col-md-12">
+
-			<a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 50%;" class="btn btn-sm btn-primary pull-left">{{ trans('admin/locations/table.update') }} </a>
-		</div>
-        <div class="col-md-12" style="padding-top: 5px;">
-			<a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 50%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_assigned') }} </a>
-		</div>
-		<div class="col-md-12" style="padding-top: 5px;">
-			<a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 50%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_all_assigned') }} </a>
-		</div>
 		
   </div>