spree_core 2.1.1 → 2.1.2

data/app/models/spree/product/scopes.rb

@@ -23,8 +23,7 @@ module Spree
         # We should not define price scopes here, as they require something slightly different
         next if name.to_s.include?("master_price")
         parts = name.to_s.match(/(.*)_by_(.*)/)
-        order_text = "#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ?  "ASC" : "DESC"}"
-        self.scope(name.to_s, -> { relation.order(order_text) })
+        self.scope(name.to_s, -> { relation.order("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ?  "ASC" : "DESC"}") })
       end
     end
 
@@ -68,14 +67,11 @@ module Spree
     #
     #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
-        scope = select("DISTINCT ON (spree_products.id) spree_products.*")
-      else
-        scope = select("DISTINCT(spree_products.id), spree_products.*")
-      end
-
-      scope.joins(:taxons).
-      where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
+      select("spree_products.id, spree_products.*").
+      where(id: Classification.select('spree_products_taxons.product_id').
+            joins(:taxon).
+            where(Taxon.table_name => { :id => taxon.self_and_descendants.pluck(:id) })
+           )
     end
 
     # This scope selects products in all taxons AND all its descendants
@@ -215,10 +211,7 @@ module Spree
     # problem shown in #1247.
     def self.group_by_products_id
       if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
-        # Need to check, otherwise `column_names` will fail
-        if table_exists?
-          group(column_names.map { |col_name| "#{table_name}.#{col_name}"})
-        end
+        group(column_names.map { |col_name| "#{table_name}.#{col_name}"})
       else
         group("#{self.quoted_table_name}.id")
       end

data/app/models/spree/return_authorization.rb

@@ -63,19 +63,16 @@ module Spree
     end
 
     private
+
       def must_have_shipped_units
         errors.add(:order, Spree.t(:has_no_shipped_units)) if order.nil? || !order.shipped_shipments.any?
       end
 
       def generate_number
-        return if number
-
-        record = true
-        while record
+        self.number ||= loop do
           random = "RMA#{Array.new(9){rand(9)}.join}"
-          record = self.class.where(number: random).first
+          break random unless self.class.exists?(number: random)
         end
-        self.number = random
       end
 
       def process_return

data/app/models/spree/shipment.rb

@@ -103,11 +103,14 @@ module Spree
     def refresh_rates
       return shipping_rates if shipped?
 
+      # StockEstimator.new assigment below will replace the current shipping_method
+      original_shipping_method_id = shipping_method.try(:id)
+
       self.shipping_rates = Stock::Estimator.new(order).shipping_rates(to_package)
 
       if shipping_method
         selected_rate = shipping_rates.detect { |rate|
-          rate.shipping_method_id == shipping_method.id
+          rate.shipping_method_id == original_shipping_method_id
         }
         self.selected_shipping_rate_id = selected_rate.id if selected_rate
       end

data/app/models/spree/state.rb

@@ -1,6 +1,7 @@
 module Spree
   class State < ActiveRecord::Base
     belongs_to :country, class_name: 'Spree::Country'
+    has_many :addresses, dependent: :nullify
 
     validates :country, :name, presence: true
 

data/app/models/spree/stock/availability_validator.rb

@@ -17,7 +17,7 @@ module Spree
           display_name = %Q{#{variant.name}}
           display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?
 
-          line_item.errors[:quantity] << Spree.t(:out_of_stock, :scope => :order_populator, :item => display_name.inspect)
+          line_item.errors[:quantity] << Spree.t(:selected_quantity_not_available, :scope => :order_populator, :item => display_name.inspect)
         end
       end
     end

data/app/models/spree/stock/estimator.rb

@@ -9,41 +9,41 @@ module Spree
       end
 
       def shipping_rates(package, frontend_only = true)
-        shipping_rates = Array.new
-        shipping_methods = shipping_methods(package)
-        return [] unless shipping_methods
-
-        shipping_methods.each do |shipping_method|
-          cost = calculate_cost(shipping_method, package)
-          shipping_rates << shipping_method.shipping_rates.new(:cost => cost) unless cost.nil?
-        end
-
-        shipping_rates.sort_by! { |r| r.cost || 0 }
+        shipping_rates = calculate_shipping_rates(package)
 
         unless shipping_rates.empty?
-          if frontend_only
-            shipping_rates.each do |rate|
-              rate.selected = true and break if rate.shipping_method.frontend?
-            end
-          else
-            shipping_rates.first.selected = true
-          end
+          available_rates = shipping_rates.clone
+          available_rates.select! { |rate| rate.shipping_method.frontend? } if frontend_only
+          choose_default_shipping_rate(available_rates)
         end
 
-        shipping_rates
+        sort_shipping_rates(shipping_rates)
       end
 
       private
-      def shipping_methods(package)
-        shipping_methods = package.shipping_methods
-        shipping_methods.delete_if { |ship_method| !ship_method.calculator.available?(package) }
-        shipping_methods.delete_if { |ship_method| !ship_method.include?(order.ship_address) }
-        shipping_methods.delete_if { |ship_method| !(ship_method.calculator.preferences[:currency].nil? || ship_method.calculator.preferences[:currency] == currency) }
-        shipping_methods
+      def choose_default_shipping_rate(shipping_rates)
+        shipping_rates.min_by(&:cost).selected = true
+      end
+
+      def sort_shipping_rates(shipping_rates)
+        shipping_rates.sort_by!(&:cost)
+      end
+
+      def calculate_shipping_rates(package)
+        shipping_methods(package).map do |shipping_method|
+          cost = shipping_method.calculator.compute(package)
+          shipping_method.shipping_rates.new(cost: cost) if cost
+        end.compact
       end
 
-      def calculate_cost(shipping_method, package)
-        shipping_method.calculator.compute(package)
+      def shipping_methods(package)
+        package.shipping_methods.select do |ship_method|
+          calculator = ship_method.calculator
+          calculator.available?(package) &&
+          ship_method.include?(order.ship_address) &&
+          (calculator.preferences[:currency].nil? ||
+           calculator.preferences[:currency] == currency)
+        end
       end
     end
   end

data/app/models/spree/stock/quantifier.rb

@@ -10,7 +10,7 @@ module Spree
 
       def total_on_hand
         if Spree::Config.track_inventory_levels
-          stock_items.to_a.sum(&:count_on_hand)
+          stock_items.sum(:count_on_hand)
         else
           Float::INFINITY
         end

data/app/models/spree/stock_item.rb

@@ -7,7 +7,7 @@ module Spree
     has_many :stock_movements
 
     validates_presence_of :stock_location, :variant
-    validates_uniqueness_of :variant_id, scope: :stock_location_id
+    validates_uniqueness_of :variant_id, scope: [:stock_location_id, :deleted_at]
 
     delegate :weight, to: :variant
 
@@ -22,7 +22,7 @@ module Spree
     def adjust_count_on_hand(value)
       self.with_lock do
         self.count_on_hand = self.count_on_hand + value
-        process_backorders if in_stock?
+        process_backorders(count_on_hand - count_on_hand_was)
 
         self.save!
       end
@@ -30,7 +30,7 @@ module Spree
 
     def set_count_on_hand(value)
       self.count_on_hand = value
-      process_backorders if in_stock?
+      process_backorders(count_on_hand - count_on_hand_was)
 
       self.save!
     end
@@ -49,10 +49,14 @@ module Spree
         write_attribute(:count_on_hand, value)
       end
 
-      def process_backorders
-        backordered_inventory_units.each do |unit|
-          return unless in_stock?
-          unit.fill_backorder
+      # Process backorders based on amount of stock received
+      # If stock was -20 and is now -15 (increase of 5 units), then we should process 5 inventory orders.
+      # If stock was -20 but then was -25 (decrease of 5 units), do nothing.
+      def process_backorders(number)
+        if number > 0
+          backordered_inventory_units.first(number).each do |unit|
+            unit.fill_backorder
+          end
         end
       end
   end

data/app/models/spree/variant.rb

@@ -15,7 +15,7 @@ module Spree
     has_many :stock_locations, through: :stock_items
     has_many :stock_movements
 
-    has_and_belongs_to_many :option_values, join_table: :spree_option_values_variants
+    has_and_belongs_to_many :option_values, join_table: :spree_option_values_variants, class_name: "Spree::OptionValue"
     has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
 
     has_one :default_price,
@@ -23,7 +23,7 @@ module Spree
       class_name: 'Spree::Price',
       dependent: :destroy
 
-    delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency if Spree::Price.table_exists?
+    delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency 
 
     has_many :prices,
       class_name: 'Spree::Price',
@@ -31,7 +31,8 @@ module Spree
 
     validate :check_price
     validates :price, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: proc { Spree::Config[:require_master_price] }
-    validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true } if self.table_exists? && self.column_names.include?('cost_price')
+
+    validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
 
     before_validation :set_cost_currency
     after_save :save_default_price

data/config/locales/en.yml

@@ -214,6 +214,10 @@ en:
         other: Zones
     errors:
       models:
+        spree/classification:
+          attributes:
+            taxon_id:
+              already_linked: "is already linked to this product"
         spree/credit_card:
           attributes:
             base:
@@ -395,6 +399,7 @@ en:
     capture: Capture
     card_code: Card Code
     card_number: Card Number
+    card_type: Brand
     card_type_is: Card type is
     cart: Cart
     categories: Categories
@@ -639,7 +644,6 @@ en:
     login_name: Login
     logout: Logout
     look_for_similar_items: Look for similar items
-    maestro_or_solo_cards: Maestro/Solo cards
     mail_method_settings: Mail Method Settings
     mail_methods: Mail Methods
     make_refund: Make refund
@@ -751,6 +755,7 @@ en:
     order_number: Order
     order_populator:
       out_of_stock: ! '%{item} is out of stock.'
+      selected_quantity_not_available: ! 'Selected quantity of %{item} is not available.'
       please_enter_reasonable_quantity: Please enter a reasonable quantity.
     order_processed_successfully: Your order has been processed successfully
     order_state:
@@ -989,8 +994,9 @@ en:
     special_instructions: Special Instructions
     split: Split
     spree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.
+    ssl:
+      change_protocol: "Please switch to using HTTP (rather than HTTPS) and retry this request."
     start: Start
-    start_date: Valid from
     state: State
     state_based: State Based
     states: States

data/config/routes.rb

@@ -0,0 +1 @@
+Spree::Core::Engine.draw_routes

data/db/default/spree/countries.rb

@@ -1,7 +1,7 @@
 Spree::Country.create!([
   { name: "Chad", iso3: "TCD", iso: "TD", iso_name: "CHAD", numcode: "148" },
   { name: "Faroe Islands", iso3: "FRO", iso: "FO", iso_name: "FAROE ISLANDS", numcode: "234" },
-  { name: "India", iso3: "IND", iso: "IN", iso_name: "INDIA", numcode: "356" },
+  { name: "India", iso3: "IND", iso: "IN", iso_name: "INDIA", numcode: "356", states_required: true },
   { name: "Nicaragua", iso3: "NIC", iso: "NI", iso_name: "NICARAGUA", numcode: "558" },
   { name: "Saint Lucia", iso3: "LCA", iso: "LC", iso_name: "SAINT LUCIA", numcode: "662" },
   { name: "Fiji", iso3: "FJI", iso: "FJ", iso_name: "FIJI", numcode: "242" },
@@ -9,14 +9,14 @@ Spree::Country.create!([
   { name: "Niger", iso3: "NER", iso: "NE", iso_name: "NIGER", numcode: "562" },
   { name: "Saint Pierre and Miquelon", iso3: "SPM", iso: "PM", iso_name: "SAINT PIERRE AND MIQUELON", numcode: "666" },
   { name: "Finland", iso3: "FIN", iso: "FI", iso_name: "FINLAND", numcode: "246" },
-  { name: "Nigeria", iso3: "NGA", iso: "NG", iso_name: "NIGERIA", numcode: "566" },
+  { name: "Nigeria", iso3: "NGA", iso: "NG", iso_name: "NIGERIA", numcode: "566", states_required: true },
   { name: "Saint Vincent and the Grenadines", iso3: "VCT", iso: "VC", iso_name: "SAINT VINCENT AND THE GRENADINES", numcode: "670" },
   { name: "France", iso3: "FRA", iso: "FR", iso_name: "FRANCE", numcode: "250" },
   { name: "Iran, Islamic Republic of", iso3: "IRN", iso: "IR", iso_name: "IRAN, ISLAMIC REPUBLIC OF", numcode: "364" },
   { name: "Niue", iso3: "NIU", iso: "NU", iso_name: "NIUE", numcode: "570" },
   { name: "Samoa", iso3: "WSM", iso: "WS", iso_name: "SAMOA", numcode: "882" },
   { name: "French Guiana", iso3: "GUF", iso: "GF", iso_name: "FRENCH GUIANA", numcode: "254" },
-  { name: "Iraq", iso3: "IRQ", iso: "IQ", iso_name: "IRAQ", numcode: "368" },
+  { name: "Iraq", iso3: "IRQ", iso: "IQ", iso_name: "IRAQ", numcode: "368", states_required: true },
   { name: "San Marino", iso3: "SMR", iso: "SM", iso_name: "SAN MARINO", numcode: "674" },
   { name: "Ireland", iso3: "IRL", iso: "IE", iso_name: "IRELAND", numcode: "372" },
   { name: "Sao Tome and Principe", iso3: "STP", iso: "ST", iso_name: "SAO TOME AND PRINCIPE", numcode: "678" },
@@ -27,7 +27,7 @@ Spree::Country.create!([
   { name: "Jamaica", iso3: "JAM", iso: "JM", iso_name: "JAMAICA", numcode: "388" },
   { name: "Japan", iso3: "JPN", iso: "JP", iso_name: "JAPAN", numcode: "392" },
   { name: "Jordan", iso3: "JOR", iso: "JO", iso_name: "JORDAN", numcode: "400" },
-  { name: "Belgium", iso3: "BEL", iso: "BE", iso_name: "BELGIUM", numcode: "56" },
+  { name: "Belgium", iso3: "BEL", iso: "BE", iso_name: "BELGIUM", numcode: "56", states_required: true },
   { name: "Belize", iso3: "BLZ", iso: "BZ", iso_name: "BELIZE", numcode: "84" },
   { name: "Kazakhstan", iso3: "KAZ", iso: "KZ", iso_name: "KAZAKHSTAN", numcode: "398" },
   { name: "Uganda", iso3: "UGA", iso: "UG", iso_name: "UGANDA", numcode: "800" },
@@ -36,19 +36,19 @@ Spree::Country.create!([
   { name: "Ukraine", iso3: "UKR", iso: "UA", iso_name: "UKRAINE", numcode: "804" },
   { name: "Bermuda", iso3: "BMU", iso: "BM", iso_name: "BERMUDA", numcode: "60" },
   { name: "Kiribati", iso3: "KIR", iso: "KI", iso_name: "KIRIBATI", numcode: "296" },
-  { name: "Mexico", iso3: "MEX", iso: "MX", iso_name: "MEXICO", numcode: "484" },
-  { name: "United Arab Emirates", iso3: "ARE", iso: "AE", iso_name: "UNITED ARAB EMIRATES", numcode: "784" },
+  { name: "Mexico", iso3: "MEX", iso: "MX", iso_name: "MEXICO", numcode: "484", states_required: true },
+  { name: "United Arab Emirates", iso3: "ARE", iso: "AE", iso_name: "UNITED ARAB EMIRATES", numcode: "784", states_required: true },
   { name: "Bhutan", iso3: "BTN", iso: "BT", iso_name: "BHUTAN", numcode: "64" },
   { name: "Cuba", iso3: "CUB", iso: "CU", iso_name: "CUBA", numcode: "192" },
   { name: "North Korea", iso3: "PRK", iso: "KP", iso_name: "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", numcode: "408" },
-  { name: "Micronesia, Federated States of", iso3: "FSM", iso: "FM", iso_name: "MICRONESIA, FEDERATED STATES OF", numcode: "583" },
+  { name: "Micronesia, Federated States of", iso3: "FSM", iso: "FM", iso_name: "MICRONESIA, FEDERATED STATES OF", numcode: "583", states_required: true },
   { name: "United Kingdom", iso3: "GBR", iso: "GB", iso_name: "UNITED KINGDOM", numcode: "826" },
   { name: "Bolivia", iso3: "BOL", iso: "BO", iso_name: "BOLIVIA", numcode: "68" },
   { name: "Cyprus", iso3: "CYP", iso: "CY", iso_name: "CYPRUS", numcode: "196" },
   { name: "South Korea", iso3: "KOR", iso: "KR", iso_name: "KOREA, REPUBLIC OF", numcode: "410" },
   { name: "Moldova, Republic of", iso3: "MDA", iso: "MD", iso_name: "MOLDOVA, REPUBLIC OF", numcode: "498" },
-  { name: "United States", iso3: "USA", iso: "US", iso_name: "UNITED STATES", numcode: "840" },
-  { name: "Bosnia and Herzegovina", iso3: "BIH", iso: "BA", iso_name: "BOSNIA AND HERZEGOVINA", numcode: "70" },
+  { name: "United States", iso3: "USA", iso: "US", iso_name: "UNITED STATES", numcode: "840", states_required: true },
+  { name: "Bosnia and Herzegovina", iso3: "BIH", iso: "BA", iso_name: "BOSNIA AND HERZEGOVINA", numcode: "70", states_required: true },
   { name: "Czech Republic", iso3: "CZE", iso: "CZ", iso_name: "CZECH REPUBLIC", numcode: "203" },
   { name: "Kuwait", iso3: "KWT", iso: "KW", iso_name: "KUWAIT", numcode: "414" },
   { name: "Monaco", iso3: "MCO", iso: "MC", iso_name: "MONACO", numcode: "492" },
@@ -59,7 +59,7 @@ Spree::Country.create!([
   { name: "Kyrgyzstan", iso3: "KGZ", iso: "KG", iso_name: "KYRGYZSTAN", numcode: "417" },
   { name: "Mongolia", iso3: "MNG", iso: "MN", iso_name: "MONGOLIA", numcode: "496" },
   { name: "Philippines", iso3: "PHL", iso: "PH", iso_name: "PHILIPPINES", numcode: "608" },
-  { name: "Brazil", iso3: "BRA", iso: "BR", iso_name: "BRAZIL", numcode: "76" },
+  { name: "Brazil", iso3: "BRA", iso: "BR", iso_name: "BRAZIL", numcode: "76", states_required: true },
   { name: "Djibouti", iso3: "DJI", iso: "DJ", iso_name: "DJIBOUTI", numcode: "262" },
   { name: "Guam", iso3: "GUM", iso: "GU", iso_name: "GUAM", numcode: "316" },
   { name: "Lao People's Democratic Republic", iso3: "LAO", iso: "LA", iso_name: "LAO PEOPLE'S DEMOCRATIC REPUBLIC", numcode: "418" },
@@ -75,8 +75,8 @@ Spree::Country.create!([
   { name: "Dominican Republic", iso3: "DOM", iso: "DO", iso_name: "DOMINICAN REPUBLIC", numcode: "214" },
   { name: "Mozambique", iso3: "MOZ", iso: "MZ", iso_name: "MOZAMBIQUE", numcode: "508" },
   { name: "Portugal", iso3: "PRT", iso: "PT", iso_name: "PORTUGAL", numcode: "620" },
-  { name: "Sudan", iso3: "SDN", iso: "SD", iso_name: "SUDAN", numcode: "736" },
-  { name: "Venezuela", iso3: "VEN", iso: "VE", iso_name: "VENEZUELA", numcode: "862" },
+  { name: "Sudan", iso3: "SDN", iso: "SD", iso_name: "SUDAN", numcode: "736", states_required: true },
+  { name: "Venezuela", iso3: "VEN", iso: "VE", iso_name: "VENEZUELA", numcode: "862", states_required: true },
   { name: "Ecuador", iso3: "ECU", iso: "EC", iso_name: "ECUADOR", numcode: "218" },
   { name: "Guinea", iso3: "GIN", iso: "GN", iso_name: "GUINEA", numcode: "324" },
   { name: "Myanmar", iso3: "MMR", iso: "MM", iso_name: "MYANMAR", numcode: "104" },
@@ -95,11 +95,11 @@ Spree::Country.create!([
   { name: "Romania", iso3: "ROM", iso: "RO", iso_name: "ROMANIA", numcode: "642" },
   { name: "Swaziland", iso3: "SWZ", iso: "SZ", iso_name: "SWAZILAND", numcode: "748" },
   { name: "Holy See (Vatican City State)", iso3: "VAT", iso: "VA", iso_name: "HOLY SEE (VATICAN CITY STATE)", numcode: "336" },
-  { name: "Russian Federation", iso3: "RUS", iso: "RU", iso_name: "RUSSIAN FEDERATION", numcode: "643" },
+  { name: "Russian Federation", iso3: "RUS", iso: "RU", iso_name: "RUSSIAN FEDERATION", numcode: "643", states_required: true },
   { name: "Sweden", iso3: "SWE", iso: "SE", iso_name: "SWEDEN", numcode: "752" },
   { name: "Honduras", iso3: "HND", iso: "HN", iso_name: "HONDURAS", numcode: "340" },
   { name: "Rwanda", iso3: "RWA", iso: "RW", iso_name: "RWANDA", numcode: "646" },
-  { name: "Switzerland", iso3: "CHE", iso: "CH", iso_name: "SWITZERLAND", numcode: "756" },
+  { name: "Switzerland", iso3: "CHE", iso: "CH", iso_name: "SWITZERLAND", numcode: "756", states_required: true },
   { name: "Hong Kong", iso3: "HKG", iso: "HK", iso_name: "HONG KONG", numcode: "344" },
   { name: "Syrian Arab Republic", iso3: "SYR", iso: "SY", iso_name: "SYRIAN ARAB REPUBLIC", numcode: "760" },
   { name: "Taiwan", iso3: "TWN", iso: "TW", iso_name: "TAIWAN, PROVINCE OF CHINA", numcode: "158" },
@@ -107,9 +107,9 @@ Spree::Country.create!([
   { name: "Tanzania, United Republic of", iso3: "TZA", iso: "TZ", iso_name: "TANZANIA, UNITED REPUBLIC OF", numcode: "834" },
   { name: "Armenia", iso3: "ARM", iso: "AM", iso_name: "ARMENIA", numcode: "51" },
   { name: "Aruba", iso3: "ABW", iso: "AW", iso_name: "ARUBA", numcode: "533" },
-  { name: "Australia", iso3: "AUS", iso: "AU", iso_name: "AUSTRALIA", numcode: "36" },
+  { name: "Australia", iso3: "AUS", iso: "AU", iso_name: "AUSTRALIA", numcode: "36", states_required: true },
   { name: "Thailand", iso3: "THA", iso: "TH", iso_name: "THAILAND", numcode: "764" },
-  { name: "Austria", iso3: "AUT", iso: "AT", iso_name: "AUSTRIA", numcode: "40" },
+  { name: "Austria", iso3: "AUT", iso: "AT", iso_name: "AUSTRIA", numcode: "40", states_required: true },
   { name: "Madagascar", iso3: "MDG", iso: "MG", iso_name: "MADAGASCAR", numcode: "450" },
   { name: "Togo", iso3: "TGO", iso: "TG", iso_name: "TOGO", numcode: "768" },
   { name: "Azerbaijan", iso3: "AZE", iso: "AZ", iso_name: "AZERBAIJAN", numcode: "31" },
@@ -118,14 +118,14 @@ Spree::Country.create!([
   { name: "Tokelau", iso3: "TKL", iso: "TK", iso_name: "TOKELAU", numcode: "772" },
   { name: "Bahamas", iso3: "BHS", iso: "BS", iso_name: "BAHAMAS", numcode: "44" },
   { name: "China", iso3: "CHN", iso: "CN", iso_name: "CHINA", numcode: "156" },
-  { name: "Malaysia", iso3: "MYS", iso: "MY", iso_name: "MALAYSIA", numcode: "458" },
+  { name: "Malaysia", iso3: "MYS", iso: "MY", iso_name: "MALAYSIA", numcode: "458", states_required: true },
   { name: "Tonga", iso3: "TON", iso: "TO", iso_name: "TONGA", numcode: "776" },
   { name: "Bahrain", iso3: "BHR", iso: "BH", iso_name: "BAHRAIN", numcode: "48" },
   { name: "Colombia", iso3: "COL", iso: "CO", iso_name: "COLOMBIA", numcode: "170" },
   { name: "Maldives", iso3: "MDV", iso: "MV", iso_name: "MALDIVES", numcode: "462" },
   { name: "Trinidad and Tobago", iso3: "TTO", iso: "TT", iso_name: "TRINIDAD AND TOBAGO", numcode: "780" },
   { name: "Bangladesh", iso3: "BGD", iso: "BD", iso_name: "BANGLADESH", numcode: "50" },
-  { name: "Comoros", iso3: "COM", iso: "KM", iso_name: "COMOROS", numcode: "174" },
+  { name: "Comoros", iso3: "COM", iso: "KM", iso_name: "COMOROS", numcode: "174", states_required: true },
   { name: "French Polynesia", iso3: "PYF", iso: "PF", iso_name: "FRENCH POLYNESIA", numcode: "258" },
   { name: "Mali", iso3: "MLI", iso: "ML", iso_name: "MALI", numcode: "466" },
   { name: "Norfolk Island", iso3: "NFK", iso: "NF", iso_name: "NORFOLK ISLAND", numcode: "574" },
@@ -149,11 +149,11 @@ Spree::Country.create!([
   { name: "Turks and Caicos Islands", iso3: "TCA", iso: "TC", iso_name: "TURKS AND CAICOS ISLANDS", numcode: "796" },
   { name: "Georgia", iso3: "GEO", iso: "GE", iso_name: "GEORGIA", numcode: "268" },
   { name: "Mauritania", iso3: "MRT", iso: "MR", iso_name: "MAURITANIA", numcode: "478" },
-  { name: "Pakistan", iso3: "PAK", iso: "PK", iso_name: "PAKISTAN", numcode: "586" },
+  { name: "Pakistan", iso3: "PAK", iso: "PK", iso_name: "PAKISTAN", numcode: "586", states_required: true },
   { name: "Sierra Leone", iso3: "SLE", iso: "SL", iso_name: "SIERRA LEONE", numcode: "694" },
   { name: "Tuvalu", iso3: "TUV", iso: "TV", iso_name: "TUVALU", numcode: "798" },
   { name: "Costa Rica", iso3: "CRI", iso: "CR", iso_name: "COSTA RICA", numcode: "188" },
-  { name: "Germany", iso3: "DEU", iso: "DE", iso_name: "GERMANY", numcode: "276" },
+  { name: "Germany", iso3: "DEU", iso: "DE", iso_name: "GERMANY", numcode: "276", states_required: true },
   { name: "Mauritius", iso3: "MUS", iso: "MU", iso_name: "MAURITIUS", numcode: "480" },
   { name: "Palau", iso3: "PLW", iso: "PW", iso_name: "PALAU", numcode: "585" },
   { name: "Cote D'Ivoire", iso3: "CIV", iso: "CI", iso_name: "COTE D'IVOIRE", numcode: "384" },
@@ -170,7 +170,7 @@ Spree::Country.create!([
   { name: "Peru", iso3: "PER", iso: "PE", iso_name: "PERU", numcode: "604" },
   { name: "Solomon Islands", iso3: "SLB", iso: "SB", iso_name: "SOLOMON ISLANDS", numcode: "90" },
   { name: "Greenland", iso3: "GRL", iso: "GL", iso_name: "GREENLAND", numcode: "304" },
-  { name: "Somalia", iso3: "SOM", iso: "SO", iso_name: "SOMALIA", numcode: "706" },
+  { name: "Somalia", iso3: "SOM", iso: "SO", iso_name: "SOMALIA", numcode: "706", states_required: true },
   { name: "Grenada", iso3: "GRD", iso: "GD", iso_name: "GRENADA", numcode: "308" },
   { name: "South Africa", iso3: "ZAF", iso: "ZA", iso_name: "SOUTH AFRICA", numcode: "710" },
   { name: "Spain", iso3: "ESP", iso: "ES", iso_name: "SPAIN", numcode: "724" },
@@ -198,11 +198,11 @@ Spree::Country.create!([
   { name: "Antigua and Barbuda", iso3: "ATG", iso: "AG", iso_name: "ANTIGUA AND BARBUDA", numcode: "28" },
   { name: "Cameroon", iso3: "CMR", iso: "CM", iso_name: "CAMEROON", numcode: "120" },
   { name: "Liechtenstein", iso3: "LIE", iso: "LI", iso_name: "LIECHTENSTEIN", numcode: "438" },
-  { name: "Nepal", iso3: "NPL", iso: "NP", iso_name: "NEPAL", numcode: "524" },
+  { name: "Nepal", iso3: "NPL", iso: "NP", iso_name: "NEPAL", numcode: "524", states_required: true },
   { name: "Wallis and Futuna", iso3: "WLF", iso: "WF", iso_name: "WALLIS AND FUTUNA", numcode: "876" },
   { name: "Western Sahara", iso3: "ESH", iso: "EH", iso_name: "WESTERN SAHARA", numcode: "732" },
-  { name: "Argentina", iso3: "ARG", iso: "AR", iso_name: "ARGENTINA", numcode: "32" },
-  { name: "Canada", iso3: "CAN", iso: "CA", iso_name: "CANADA", numcode: "124" },
+  { name: "Argentina", iso3: "ARG", iso: "AR", iso_name: "ARGENTINA", numcode: "32", states_required: true },
+  { name: "Canada", iso3: "CAN", iso: "CA", iso_name: "CANADA", numcode: "124", states_required: true },
   { name: "Eritrea", iso3: "ERI", iso: "ER", iso_name: "ERITREA", numcode: "232" },
   { name: "Lithuania", iso3: "LTU", iso: "LT", iso_name: "LITHUANIA", numcode: "440" },
   { name: "Netherlands", iso3: "NLD", iso: "NL", iso_name: "NETHERLANDS", numcode: "528" },
@@ -214,7 +214,7 @@ Spree::Country.create!([
   { name: "Saint Helena", iso3: "SHN", iso: "SH", iso_name: "SAINT HELENA", numcode: "654" },
   { name: "Zambia", iso3: "ZMB", iso: "ZM", iso_name: "ZAMBIA", numcode: "894" },
   { name: "Cayman Islands", iso3: "CYM", iso: "KY", iso_name: "CAYMAN ISLANDS", numcode: "136" },
-  { name: "Ethiopia", iso3: "ETH", iso: "ET", iso_name: "ETHIOPIA", numcode: "231" },
+  { name: "Ethiopia", iso3: "ETH", iso: "ET", iso_name: "ETHIOPIA", numcode: "231", states_required: true },
   { name: "Hungary", iso3: "HUN", iso: "HU", iso_name: "HUNGARY", numcode: "348" },
   { name: "Macao", iso3: "MAC", iso: "MO", iso_name: "MACAO", numcode: "446" },
   { name: "New Caledonia", iso3: "NCL", iso: "NC", iso_name: "NEW CALEDONIA", numcode: "540" },
@@ -224,7 +224,7 @@ Spree::Country.create!([
   { name: "Iceland", iso3: "ISL", iso: "IS", iso_name: "ICELAND", numcode: "352" },
   { name: "Macedonia", iso3: "MKD", iso: "MK", iso_name: "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", numcode: "807" },
   { name: "New Zealand", iso3: "NZL", iso: "NZ", iso_name: "NEW ZEALAND", numcode: "554" },
-  { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659" },
+  { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659", states_required: true },
   { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" }
 ])
 Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id