app/models/imports/donations_import.rb in artfully_ose-1.1.0 vs app/models/imports/donations_import.rb in artfully_ose-1.2.0.alpha.1

@@ -34,43 +34,24 @@
     end  
   end
   
   def row_valid?(parsed_row)
     raise Import::RowError, "No Amount included in this row: #{parsed_row.row}" if parsed_row.unparsed_amount.blank?
-    raise Import::RowError, "Please include a first name, last name, or email in this row: #{parsed_row.row}" unless attach_person(parsed_row).person_info
+    raise Import::RowError, "Please include a first name, last name, email, or company name in this row: #{parsed_row.row}" unless attach_person(parsed_row).naming_details_available?
     raise Import::RowError, "Please include a payment method in this row: #{parsed_row.row}" if parsed_row.payment_method.blank?
-    raise Import::RowError, "Donation type must be 'Monetary' or 'In-Kind': #{parsed_row.row}" unless Action::GIVE_TYPES.include? (parsed_row.donation_type)
+    raise Import::RowError, "Donation type must be 'Monetary' or 'In-Kind': #{parsed_row.row}" unless GiveAction.subtypes.include? (parsed_row.donation_type)
     valid_date?   parsed_row.donation_date
     
     [:unparsed_amount, :unparsed_nongift_amount, :unparsed_deductible_amount].each do |amt|
       valid_amount? parsed_row.send(amt)   unless parsed_row.send(amt).blank?
     end
     
     validate_amounts(parsed_row)
     true
   end
-  
-  def create_person(parsed_row)
-    Rails.logger.info("Import #{id} DONATION_IMPORT: Creating person")
-    if !parsed_row.email.blank?
-      person = Person.first_or_create(parsed_row.email, self.organization, parsed_row.person_attributes) do |p|
-        p.import = self
-      end
-    else    
-      person = attach_person(parsed_row)
-      if !person.save
-        Rails.logger.info("Import #{id} DONATION_IMPORT: Person save failed")
-        self.import_errors.create! :row_data => parsed_row.row, :error_message => person.errors.full_messages.join(", ")
-        self.reload
-        fail!
-      end 
-    end
-    puts person.inspect
-    person  
-  end
    
   def create_contribution(parsed_row, person)
-    Rails.logger.info("Import #{id} DONATION_IMPORT: Creating contribution")
+    Rails.logger.info("Processing Import [#{id}] DONATION_IMPORT: Creating contribution")
     validate_amounts(parsed_row)
     amount              = parsed_row.amount
     deductible_amount   = parsed_row.unparsed_deductible_amount.blank?  ? amount - parsed_row.nongift_amount     : parsed_row.deductible_amount
     nongift_amount      = parsed_row.unparsed_nongift_amount.blank?     ? amount - deductible_amount             : parsed_row.nongift_amount
     
\ No newline at end of file