A free open source IT asset/license management system
Added tag color to importer
snipe4f610ac1af24
diff --git a/app/Importer/Importer.php b/app/Importer/Importer.phpindex a5142f4380..0075a8de9f 100644--- a/app/Importer/Importer.php+++ b/app/Importer/Importer.php@@ -93,6 +93,7 @@ abstract class Importer'min_amt' => 'minimum quantity','remote' => 'remote','vip' => 'vip',+ 'tag_color' => 'tag color',];/*** Map of item fields->csv namesdiff --git a/app/Importer/LocationImporter.php b/app/Importer/LocationImporter.phpindex 013d99a61d..bed7f680e6 100644--- a/app/Importer/LocationImporter.php+++ b/app/Importer/LocationImporter.php@@ -75,6 +75,7 @@ class LocationImporter extends ItemImporter$this->item['manager'] = trim($this->findCsvMatch($row, 'manager'));$this->item['manager_username'] = trim($this->findCsvMatch($row, 'manager_username'));$this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));+ $this->item['tag_color'] = trim($this->findCsvMatch($row, 'tag_color'));if ($this->findCsvMatch($row, 'parent_location')) {diff --git a/app/Livewire/Importer.php b/app/Livewire/Importer.phpindex e3235ac81e..1f512bc752 100644--- a/app/Livewire/Importer.php+++ b/app/Livewire/Importer.php@@ -361,6 +361,7 @@ class Importer extends Component'parent_location' => trans('admin/locations/table.parent'),'state' => trans('general.state'),'zip' => trans('general.zip'),+ 'tag_color' => trans('general.tag_color'),];$this->suppliers_fields = [@@ -609,6 +610,14 @@ class Importer extends Component['Manager Username',],+ 'tag_color' =>+ [+ 'color',+ 'tag color',+ 'label color',+ 'color code',+ trans('general.tag_color'),+ ],];$this->columnOptions[''] = $this->getColumns(''); //blank mode? I don't know what this is supposed to meandiff --git a/sample_csvs/locations-sample.csv b/sample_csvs/locations-sample.csvindex cd449c54a5..8a2a40c0b2 100644--- a/sample_csvs/locations-sample.csv+++ b/sample_csvs/locations-sample.csv@@ -1,11 +1,11 @@-name,company,address,address2,city,state,country,zip,notes,phone,fax,currency-Shizi,"Awesomesauce, Inc",811 Algoma Center,1690,Shimen,,CN,,ipsum ac tellus semper interdum mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum ac lobortis vel dapibus,280-997-3795,673-737-7438,CNY-Takum,"Failsauce, LTD",354 Sugar Way,88222,Old Shinyanga,,NG,,proin risus praesent lectus vestibulum quam sapien varius ut blandit non interdum in ante vestibulum ante,810-325-0609,746-868-1843,NGN-Unaizah,,56243 Lawn Drive,14,Irecê,,SA,,in blandit ultrices enim lorem ipsum dolor sit amet consectetuer adipiscing elit proin interdum mauris,841-568-9664,419-246-9966,SAR-Pontarlier,,80411 Lyons Alley,0,Colinas,Franche-Comté,FR,25304,enim in tempor turpis nec euismod scelerisque quam turpis adipiscing lorem vitae,927-638-2175,683-361-5521,EUR-Inongo,,377 Nancy Lane,236,Placencia,,CD,,nam dui proin leo odio porttitor id consequat in consequat ut nulla sed accumsan felis ut at dolor quis,278-277-8326,744-879-3383,CDF-San Diego,,294 Spohn Center,04,Yanmen,,CO,202038,quis orci eget orci vehicula condimentum curabitur in libero ut,255-785-7948,874-491-7898,COP-Lewotola,Very Midco,22308 Oriole Way,505,Celso Ramos,,ID,,nam nulla integer pede justo lacinia eget tincidunt eget tempus vel pede morbi porttitor lorem id ligula suspendisse ornare,431-503-0615,960-849-7404,IDR-Pieńsk,,7 Maryland Junction,77656,Cela,,PL,59-930,ut blandit non interdum in ante vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae,723-739-7799,431-889-4342,PLN-Mataguži,,5 Mayfield Drive,0,Zhaogezhuang,,ME,,nulla neque libero convallis eget eleifend luctus ultricies eu nibh quisque id justo sit amet sapien dignissim vestibulum vestibulum,356-728-4662,689-866-7531,EUR-Xixiang,,2540 Rockefeller Place,2,Alegria,,CN,,vivamus metus arcu adipiscing molestie hendrerit at vulputate vitae nisl aenean lectus,388-760-0441,110-938-9032,CNY\ No newline at end of file+name,company,address,address2,city,state,country,zip,notes,phone,fax,currency,tag color+Shizi,"Awesomesauce, Inc",811 Algoma Center,1690,Shimen,,CN,,ipsum ac tellus semper interdum mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum ac lobortis vel dapibus,280-997-3795,673-737-7438,CNY,#ffffff+Takum,"Failsauce, LTD",354 Sugar Way,88222,Old Shinyanga,,NG,,proin risus praesent lectus vestibulum quam sapien varius ut blandit non interdum in ante vestibulum ante,810-325-0609,746-868-1843,NGN,+Unaizah,,56243 Lawn Drive,14,Irecê,,SA,,in blandit ultrices enim lorem ipsum dolor sit amet consectetuer adipiscing elit proin interdum mauris,841-568-9664,419-246-9966,SAR,+Pontarlier,,80411 Lyons Alley,0,Colinas,Franche-Comté,FR,25304,enim in tempor turpis nec euismod scelerisque quam turpis adipiscing lorem vitae,927-638-2175,683-361-5521,EUR,#454545+Inongo,,377 Nancy Lane,236,Placencia,,CD,,nam dui proin leo odio porttitor id consequat in consequat ut nulla sed accumsan felis ut at dolor quis,278-277-8326,744-879-3383,CDF,+San Diego,,294 Spohn Center,04,Yanmen,,CO,202038,quis orci eget orci vehicula condimentum curabitur in libero ut,255-785-7948,874-491-7898,COP,+Lewotola,Very Midco,22308 Oriole Way,505,Celso Ramos,,ID,,nam nulla integer pede justo lacinia eget tincidunt eget tempus vel pede morbi porttitor lorem id ligula suspendisse ornare,431-503-0615,960-849-7404,IDR,+Pieńsk,,7 Maryland Junction,77656,Cela,,PL,59-930,ut blandit non interdum in ante vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae,723-739-7799,431-889-4342,PLN,+Mataguži,,5 Mayfield Drive,0,Zhaogezhuang,,ME,,nulla neque libero convallis eget eleifend luctus ultricies eu nibh quisque id justo sit amet sapien dignissim vestibulum vestibulum,356-728-4662,689-866-7531,EUR,+Xixiang,,2540 Rockefeller Place,2,Alegria,,CN,,vivamus metus arcu adipiscing molestie hendrerit at vulputate vitae nisl aenean lectus,388-760-0441,110-938-9032,CNY,\ No newline at end of file