DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13169 from akemidx/license_sn_check1

Browse source 
Making Serial Number the logic checked against for new imports
This commit is contained in:
snipe 2023-07-06 16:40:27 +01:00 committed by GitHub
parent d37aaee4c8 00fd541963
commit 2faa73f983
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Importer/LicenseImporter.php
View file

@ -27,15 +27,24 @@ class LicenseImporter extends ItemImporter
* @since 4.0 * @since 4.0
* @param array $row * @param array $row
* @return License|mixed|null * @return License|mixed|null
* updated @author Jes Vinsmoke
* @since 6.1
*
*/ */
public function createLicenseIfNotExists(array $row) public function createLicenseIfNotExists(array $row)
{ {
$editingLicense = false; $editingLicense = false;
$license = License::where('name', $this->item['name']) $license = License::where('serial', $this->item['serial'])->where('name', $this->item['name'])
->first(); ->first();
if ($license) { if ($license) {
if (! $this->updating) { if (! $this->updating) {
if($this->item['serial'] != "") {
$this->log('A matching License ' . $this->item['name'] . ' with serial ' . $this->item['serial'] . ' already exists'); $this->log('A matching License ' . $this->item['name'] . ' with serial ' . $this->item['serial'] . ' already exists');
}
else {
$this->log('A matching License ' . $this->item['name'] . ' with no serial number already exists');
}
return; return;
} }
@ -57,6 +66,10 @@ class LicenseImporter extends ItemImporter
$this->item['maintained'] = $this->findCsvMatch($row, 'maintained'); $this->item['maintained'] = $this->findCsvMatch($row, 'maintained');
$this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order'); $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order');
$this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable'); $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable');
if($this->item['reassignable'] == "")
{
$this->item['reassignable'] = 1;
}
$this->item['seats'] = $this->findCsvMatch($row, 'seats'); $this->item['seats'] = $this->findCsvMatch($row, 'seats');
$this->item["termination_date"] = null; $this->item["termination_date"] = null;