Fix License Import. (snipe#4121)

The license name is not unique, so keying by license alone was causing issues. Match using name + serial instead.
dmeltzer · Oct 3, 2017 · d119372 · d119372
1 parent d303cbd
commit d119372
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php
@@ -33,10 +33,12 @@ protected function handle($row)
     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;
             }