app/controllers/spree/affirm_controller.rb in spree_affirm-0.2.22 vs app/controllers/spree/affirm_controller.rb in spree_affirm-0.2.30

@@ -22,46 +22,22 @@
         order: order,
         token: params[:checkout_token],
         payment_method: payment_method
       )
 
-      # check if data needs to be updated
-      unless _affirm_checkout.valid?
+      order.save
 
-        _affirm_checkout.errors.each do |field, error|
-          case field
-          when :billing_address
-            # FIXME(brian): pass the phone number to the |order| in a better place
-            phone = order.bill_address.phone
-            order.bill_address = generate_spree_address(_affirm_checkout.details['billing'])
-            order.bill_address.phone = phone
-
-          when :shipping_address
-            # FIXME(brian): pass the phone number to the |order| in a better place
-            phone = order.shipping_address.phone
-            order.ship_address = generate_spree_address(_affirm_checkout.details['shipping'])
-            order.ship_address.phone = phone
-
-          when :billing_email
-            order.email = _affirm_checkout.details["billing"]["email"]
-
-          end
-        end
-
-        order.save
-      end
-
       _affirm_checkout.save
 
       _affirm_payment = order.payments.create!({
         payment_method: payment_method,
         amount: order.total,
         source: _affirm_checkout
       })
 
       # transition to confirm or complete
-      while order.next; end
+      order.next
 
       if order.completed?
         session[:order_id] = nil
         flash.notice = Spree.t(:order_processed_successfully)
         flash[:order_completed] = true
@@ -85,43 +61,8 @@
       payment_method.provider
     end
 
     def completion_route(order)
       spree.order_path(order)
-    end
-
-    def generate_spree_address(affirm_address)
-      # find the state and country in spree
-      _state    = Spree::State.find_by_abbr(affirm_address["address"]["region1_code"]) or
-                  Spree::State.find_by_name(affirm_address["address"]["region1_code"])
-      _country  = Spree::Country.find_by_iso3(affirm_address["address"]["country_code"]) or
-                  Spree::Country.find_by_iso(affirm_address["address"]["country_code"])
-
-      # try to get the name from first and last
-      _firstname = affirm_address["name"]["first"] if affirm_address["name"]["first"].present?
-      _lastname  = affirm_address["name"]["last"]  if affirm_address["name"]["last"].present?
-
-      # fall back to using the full name if available
-      if _firstname.nil? and _lastname.nil? and affirm_address["name"]["full"].present?
-        _name_parts = affirm_address["name"]["full"].split " "
-        _lastname   = _name_parts.pop
-        _firstname  = _name_parts.join " "
-      end
-
-      # create new address
-      _spree_address = Spree::Address.new(
-        city:       affirm_address["address"]["city"],
-        phone:      affirm_address["phone_number"],
-        zipcode:    affirm_address["address"]["postal_code"],
-        address1:   affirm_address["address"]["street1"],
-        address2:   affirm_address["address"]["street2"],
-        state:      _state,
-        country:    _country,
-        lastname:   _lastname,
-        firstname:  _firstname
-      )
-
-      _spree_address.save
-      _spree_address
     end
   end
 end