From d119372ff0abf8154b96f12b352a674b5e3a21d4 Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Tue, 3 Oct 2017 11:46:06 -0400
Subject: [PATCH] Fix License Import. (#4121)

The license name is not unique, so keying by license alone was causing issues.  Match using name + serial instead.
---
 app/Importer/LicenseImporter.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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;
             }