diff --git a/app/Models/Labels/Sheets/Avery/L7162_B.php b/app/Models/Labels/Sheets/Avery/L7162_B.php index 268754e04f..9f24d58c2f 100644 --- a/app/Models/Labels/Sheets/Avery/L7162_B.php +++ b/app/Models/Labels/Sheets/Avery/L7162_B.php @@ -55,7 +55,7 @@ class L7162_B extends L7162 $pdf, $record->get('logo'), $pa->x1, $pa->y1, self::LOGO_MAX_WIDTH, $usableHeight, - 'L', 'T', 300, true, false, 0.1 + 'L', 'T', 300, true, false, 0 ); $currentX += $logoSize[0] + self::LOGO_MARGIN; $usableWidth -= $logoSize[0] + self::LOGO_MARGIN; @@ -100,4 +100,4 @@ class L7162_B extends L7162 } -?> \ No newline at end of file +?> diff --git a/app/Models/User.php b/app/Models/User.php index a115852d5c..9b211e6a04 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -320,7 +320,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo { $setting = Setting::getSettings(); - if ($setting->name_display_format=='last_first') { + if ($setting?->name_display_format == 'last_first') { return ($this->last_name) ? $this->last_name.' '.$this->first_name : $this->first_name; } return $this->last_name ? $this->first_name.' '.$this->last_name : $this->first_name; diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index e4af3d6e78..313bf765ee 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -324,7 +324,7 @@