From 1a448cc4b64927b7666b1d23a3cfac70e41d82af Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 29 Mar 2022 17:31:43 -0600
Subject: [PATCH] Take the values from the importer form to configure the used
 importer

---
 app/Http/Requests/ItemImportRequest.php                   | 4 ++--
 resources/assets/js/components/importer/importer-file.vue | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Http/Requests/ItemImportRequest.php b/app/Http/Requests/ItemImportRequest.php
index d135929cad..f42b45a625 100644
--- a/app/Http/Requests/ItemImportRequest.php
+++ b/app/Http/Requests/ItemImportRequest.php
@@ -60,8 +60,8 @@ class ItemImportRequest extends FormRequest
         }
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
                  ->setUserId(Auth::id())
-                 ->setUpdating($this->has('import-update'))
-                 ->setShouldNotify($this->has('send-welcome'))
+                 ->setUpdating($this->get('import-update'))
+                 ->setShouldNotify($this->get('send-welcome'))
                  ->setUsernameFormat('firstname.lastname')
                  ->setFieldMappings($fieldMappings);
         $importer->import();
diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue
index 2f692db01c..09d4a53db2 100644
--- a/resources/assets/js/components/importer/importer-file.vue
+++ b/resources/assets/js/components/importer/importer-file.vue
@@ -21,7 +21,7 @@
                         <label for="import-update">Update Existing Values?:</label>
                     </div>
                     <div class="col-md-7 col-xs-12">
-                        <input type="checkbox" class="iCheck minimal" name="import-update" v-model="options.update">
+                        <input type="checkbox" class="icheckbox_minimal" name="import-update" v-model="options.update">
                     </div>
                 </div><!-- /dynamic-form-row -->
 
@@ -30,7 +30,7 @@
                         <label for="send-welcome">Send Welcome Email for new Users?</label>
                     </div>
                     <div class="col-md-7 col-xs-12">
-                        <input type="checkbox" class="minimal" name="send-welcome" v-model="options.send_welcome">
+                        <input type="checkbox" class="icheckbox_minimal" name="send-welcome" v-model="options.send_welcome">
                     </div>
                 </div><!-- /dynamic-form-row -->
 
@@ -39,7 +39,7 @@
                         <label for="run-backup">Backup before importing?</label>
                     </div>
                     <div class="col-md-7 col-xs-12">
-                        <input type="checkbox" class="minimal" name="run-backup" v-model="options.run_backup">
+                        <input type="checkbox" class="icheckbox_minimal" name="run-backup" v-model="options.run_backup">
                     </div>
                 </div><!-- /dynamic-form-row -->
 
@@ -111,6 +111,8 @@
                 options: {
                     importType: this.file.import_type,
                     update: false,
+                    send_welcome: false,
+                    run_backup: false,
                     importTypes: [
                         { id: 'asset', text: 'Assets' },
                         { id: 'accessory', text: 'Accessories' },