Merge pull request #7 from hf2186/fix-state-lookup-issues

Fix state lookup issues
Affirm · Mar 30, 2019 · 8e6ee8f · 8e6ee8f
2 parents b185405 + 0055d63
commit 8e6ee8f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', tag: 'v0.2.24'
-gem 'spree_gateway', github: 'spree/spree_gateway', tag: 'v0.2.24'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', tag: 'v0.2.24'
+gem 'spree', github: 'spree/spree', tag: 'v0.2.25'
+gem 'spree_gateway', github: 'spree/spree_gateway', tag: 'v0.2.25'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', tag: 'v0.2.25'
 
 group :test do
   gem 'coffee-rails'

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018, Affirm
+Copyright (c) 2019, Affirm
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -48,4 +48,4 @@ Simply add this require statement to your spec_helper:
 require 'spree_affirm/factories'
 ```
 
-Copyright (c) 2018 Affirm, released under the New BSD License
+Copyright (c) 2019 Affirm, released under the New BSD License
diff --git a/app/controllers/spree/affirm_controller.rb b/app/controllers/spree/affirm_controller.rb
@@ -91,11 +91,14 @@ def completion_route(order)
 
     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"])
 
+
+      _state    = Spree::State.find_by(abbr: affirm_address["address"]["region1_code"], country: _country) or
+                  Spree::State.find_by_abbr(affirm_address["address"]["region1_code"]) or
+                  Spree::State.find_by_name(affirm_address["address"]["region1_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?

diff --git a/lib/spree_affirm/version.rb b/lib/spree_affirm/version.rb
@@ -1,3 +1,3 @@
 module SpreeAffirm
-  VERSION = "0.2.24"
+  VERSION = "0.2.25"
 end