diff --git a/app/models/light/user.rb b/app/models/light/user.rb index 8309e65..1fb38b9 100644 --- a/app/models/light/user.rb +++ b/app/models/light/user.rb @@ -69,7 +69,8 @@ def self.add_users_from_worksheet(worksheet, column = 1) end def self.import(file, email='') - return {error: "Please select CSV file"} if (file.blank? or file.content_type != 'text/csv') + mime_types = ['application/vnd.ms-excel', 'text/csv'] + return {error: "Please select CSV file"} unless (file.present? && mime_types.include?(file.content_type) ) file = CSV.open(file.path, :row_sep => :auto, :col_sep => ",") rows = file.read header = rows.delete_at(0) diff --git a/app/workers/light/import_worker.rb b/app/workers/light/import_worker.rb index 3b3a522..0cc9137 100644 --- a/app/workers/light/import_worker.rb +++ b/app/workers/light/import_worker.rb @@ -16,8 +16,8 @@ def perform(rows, email_id, source = "Business Card") is_subscribed: false, sidekiq_status: Light::User::NEW_USER) if email.present? or name.present? csv << [email, row[0], user.errors.messages] if user.present? and user.errors.present? end - UserMailer.import_contacts_update(email_id, file_path).deliver end + UserMailer.delay_for(30.seconds).import_contacts_update(email_id, file_path) end end end