diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index b2ea845cc..c63f3e858 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -7,6 +7,7 @@ use Illuminate\Auth\AuthenticationException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use App\Helpers\Helper; use Illuminate\Validation\ValidationException; +use Log; class Handler extends ExceptionHandler { @@ -34,8 +35,10 @@ class Handler extends ExceptionHandler */ public function report(Exception $exception) { - \Log::error($exception); // rollbar - parent::report($exception); + if ($this->shouldReport($exception)) { + Log::error($exception); + return parent::report($exception); + } } /** diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php index 207e346a5..8d1a0ac8f 100644 --- a/app/Importer/LicenseImporter.php +++ b/app/Importer/LicenseImporter.php @@ -33,10 +33,12 @@ class LicenseImporter extends ItemImporter public function createLicenseIfNotExists(array $row) { $editingLicense = false; - $license = License::where('name', $this->item['name'])->first(); + $license = License::where('name', $this->item['name']) + ->where('serial', $this->item['serial']) + ->first(); if ($license) { if (!$this->updating) { - $this->log('A matching License ' . $this->item['name'] . ' already exists'); + $this->log('A matching License ' . $this->item['name'] . 'with serial ' . $this->item['serial'] . ' already exists'); return; } diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index d3e911849..ce1889f6b 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -54,6 +54,7 @@ $('.snipe-table').bootstrapTable({ ignoreColumn: ['actions','change','checkbox','checkincheckout','icon'], worksheetName: "Snipe-IT Export", jspdf: { + orientation: 'l', autotable: { styles: { rowHeight: 20,