spree_core 2.4.0.rc2 → 2.4.0.rc3

data/app/models/spree/variant.rb

@@ -9,7 +9,7 @@ module Spree
                         :shipping_category_id, :meta_description, :meta_keywords,
                         :shipping_category
 
-    has_many :inventory_units
+    has_many :inventory_units, inverse_of: :variant
     has_many :line_items, inverse_of: :variant
     has_many :orders, through: :line_items
 
@@ -22,9 +22,8 @@ module Spree
 
     has_one :default_price,
       -> { where currency: Spree::Config[:currency] },
-      class_name: 'Spree::Price',
-      dependent: :destroy
-
+      class_name: 'Spree::Price', inverse_of: :variant
+      
     delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
 
     has_many :prices,
@@ -33,8 +32,9 @@ module Spree
       inverse_of: :variant
 
     validate :check_price
+
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates :price, numericality: { greater_than_or_equal_to: 0 }
+    validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates_uniqueness_of :sku, allow_blank: true, conditions: -> { where(deleted_at: nil) }
 
     before_validation :set_cost_currency

data/app/models/spree/zone.rb

@@ -1,10 +1,10 @@
 module Spree
   class Zone < Spree::Base
-    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember"
-    has_many :tax_rates, dependent: :destroy
+    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember", inverse_of: :zone
+    has_many :tax_rates, dependent: :destroy, inverse_of: :zone
     has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones'
 
-    validates :name, presence: true, uniqueness: true
+    validates :name, presence: true, uniqueness: { allow_blank: true }
     after_save :remove_defunct_members
     after_save :remove_previous_default
 
@@ -92,23 +92,11 @@ module Spree
     end
 
     def country_ids=(ids)
-      zone_members.destroy_all
-      ids.reject{ |id| id.blank? }.map do |id|
-        member = ZoneMember.new
-        member.zoneable_type = 'Spree::Country'
-        member.zoneable_id = id
-        members << member
-      end
+      set_zone_members(ids, 'Spree::Country')
     end
 
     def state_ids=(ids)
-      zone_members.destroy_all
-      ids.reject{ |id| id.blank? }.map do |id|
-        member = ZoneMember.new
-        member.zoneable_type = 'Spree::State'
-        member.zoneable_id = id
-        members << member
-      end
+      set_zone_members(ids, 'Spree::State')
     end
 
     # Indicates whether the specified zone falls entirely within the zone performing
@@ -136,5 +124,15 @@ module Spree
       def remove_previous_default
         Spree::Zone.where('id != ?', self.id).update_all(default_tax: false) if default_tax
       end
+
+      def set_zone_members(ids, type)
+        zone_members.destroy_all
+        ids.reject{ |id| id.blank? }.map do |id|
+          member = ZoneMember.new
+          member.zoneable_type = type
+          member.zoneable_id = id
+          members << member
+        end
+      end
   end
 end

data/app/models/spree/zone_member.rb

@@ -1,6 +1,6 @@
 module Spree
   class ZoneMember < Spree::Base
-    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true
+    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
     belongs_to :zoneable, polymorphic: true
 
     def name

data/config/initializers/user_class_extensions.rb

@@ -2,25 +2,26 @@ Spree::Core::Engine.config.to_prepare do
   if Spree.user_class
     Spree.user_class.class_eval do
 
-      include Spree::UserReporting
       include Spree::UserApiAuthentication
+      include Spree::UserReporting
+
       has_and_belongs_to_many :spree_roles,
-                              :join_table => 'spree_roles_users',
-                              :foreign_key => "user_id",
-                              :class_name => "Spree::Role"
+                              join_table: 'spree_roles_users',
+                              foreign_key: "user_id",
+                              class_name: "Spree::Role"
 
-      has_many :spree_orders, :foreign_key => "user_id", :class_name => "Spree::Order"
+      has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
 
-      belongs_to :ship_address, :class_name => 'Spree::Address'
-      belongs_to :bill_address, :class_name => 'Spree::Address'
+      belongs_to :ship_address, class_name: 'Spree::Address'
+      belongs_to :bill_address, class_name: 'Spree::Address'
 
       # has_spree_role? simply needs to return true or false whether a user has a role or not.
       def has_spree_role?(role_in_question)
-        spree_roles.where(:name => role_in_question.to_s).any?
+        spree_roles.where(name: role_in_question.to_s).any?
       end
 
       def last_incomplete_spree_order
-        spree_orders.incomplete.where(:created_by_id => self.id).order('created_at DESC').first
+        spree_orders.incomplete.where(user_id: self.id).order('created_at DESC').first
       end
     end
   end

data/config/locales/en.yml

@@ -920,6 +920,7 @@ en:
     or_over_price: ! '%{price} or over'
     order: Order
     order_adjustments: Order adjustments
+    order_already_updated: The order has already been updated.
     order_approved: Order approved
     order_canceled: Order canceled
     order_details: Order Details

data/db/default/spree/countries.rb

@@ -1,232 +1,19 @@
-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", 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" },
-  { name: "Indonesia", iso3: "IDN", iso: "ID", iso_name: "INDONESIA", numcode: "360" },
-  { 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", 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", 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" },
-  { name: "Israel", iso3: "ISR", iso: "IL", iso_name: "ISRAEL", numcode: "376" },
-  { name: "Saudi Arabia", iso3: "SAU", iso: "SA", iso_name: "SAUDI ARABIA", numcode: "682" },
-  { name: "Italy", iso3: "ITA", iso: "IT", iso_name: "ITALY", numcode: "380" },
-  { name: "Senegal", iso3: "SEN", iso: "SN", iso_name: "SENEGAL", numcode: "686" },
-  { 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: "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" },
-  { name: "Benin", iso3: "BEN", iso: "BJ", iso_name: "BENIN", numcode: "204" },
-  { name: "Kenya", iso3: "KEN", iso: "KE", iso_name: "KENYA", numcode: "404" },
-  { 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", 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", 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", states_required: true },
-  { name: "Bosnia and Herzegovina", iso3: "BIH", iso: "BA", iso_name: "BOSNIA AND HERZEGOVINA", numcode: "70" },
-  { 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" },
-  { name: "Uruguay", iso3: "URY", iso: "UY", iso_name: "URUGUAY", numcode: "858" },
-  { name: "Botswana", iso3: "BWA", iso: "BW", iso_name: "BOTSWANA", numcode: "72" },
-  { name: "Denmark", iso3: "DNK", iso: "DK", iso_name: "DENMARK", numcode: "208" },
-  { name: "Guadeloupe", iso3: "GLP", iso: "GP", iso_name: "GUADELOUPE", numcode: "312" },
-  { 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", 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" },
-  { name: "Montserrat", iso3: "MSR", iso: "MS", iso_name: "MONTSERRAT", numcode: "500" },
-  { name: "Pitcairn", iso3: "PCN", iso: "PN", iso_name: "PITCAIRN", numcode: "612" },
-  { name: "Uzbekistan", iso3: "UZB", iso: "UZ", iso_name: "UZBEKISTAN", numcode: "860" },
-  { name: "Brunei Darussalam", iso3: "BRN", iso: "BN", iso_name: "BRUNEI DARUSSALAM", numcode: "96" },
-  { name: "Dominica", iso3: "DMA", iso: "DM", iso_name: "DOMINICA", numcode: "212" },
-  { name: "Guatemala", iso3: "GTM", iso: "GT", iso_name: "GUATEMALA", numcode: "320" },
-  { name: "Morocco", iso3: "MAR", iso: "MA", iso_name: "MOROCCO", numcode: "504" },
-  { name: "Poland", iso3: "POL", iso: "PL", iso_name: "POLAND", numcode: "616" },
-  { name: "Vanuatu", iso3: "VUT", iso: "VU", iso_name: "VANUATU", numcode: "548" },
-  { 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", 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" },
-  { name: "Puerto Rico", iso3: "PRI", iso: "PR", iso_name: "PUERTO RICO", numcode: "630" },
-  { name: "Suriname", iso3: "SUR", iso: "SR", iso_name: "SURINAME", numcode: "740" },
-  { name: "Viet Nam", iso3: "VNM", iso: "VN", iso_name: "VIET NAM", numcode: "704" },
-  { name: "Egypt", iso3: "EGY", iso: "EG", iso_name: "EGYPT", numcode: "818" },
-  { name: "Guinea-Bissau", iso3: "GNB", iso: "GW", iso_name: "GUINEA-BISSAU", numcode: "624" },
-  { name: "Namibia", iso3: "NAM", iso: "NA", iso_name: "NAMIBIA", numcode: "516" },
-  { name: "Qatar", iso3: "QAT", iso: "QA", iso_name: "QATAR", numcode: "634" },
-  { name: "Svalbard and Jan Mayen", iso3: "SJM", iso: "SJ", iso_name: "SVALBARD AND JAN MAYEN", numcode: "744" },
-  { name: "El Salvador", iso3: "SLV", iso: "SV", iso_name: "EL SALVADOR", numcode: "222" },
-  { name: "Guyana", iso3: "GUY", iso: "GY", iso_name: "GUYANA", numcode: "328" },
-  { name: "Reunion", iso3: "REU", iso: "RE", iso_name: "REUNION", numcode: "638" },
-  { name: "Haiti", iso3: "HTI", iso: "HT", iso_name: "HAITI", numcode: "332" },
-  { name: "Romania", iso3: "ROU", 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", 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: "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" },
-  { name: "Tajikistan", iso3: "TJK", iso: "TJ", iso_name: "TAJIKISTAN", numcode: "762" },
-  { 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", 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: "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" },
-  { name: "Chile", iso3: "CHL", iso: "CL", iso_name: "CHILE", numcode: "152" },
-  { name: "Malawi", iso3: "MWI", iso: "MW", iso_name: "MALAWI", numcode: "454" },
-  { 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: "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", 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" },
-  { name: "Tunisia", iso3: "TUN", iso: "TN", iso_name: "TUNISIA", numcode: "788" },
-  { name: "Barbados", iso3: "BRB", iso: "BB", iso_name: "BARBADOS", numcode: "52" },
-  { name: "Congo", iso3: "COG", iso: "CG", iso_name: "CONGO", numcode: "178" },
-  { name: "Gabon", iso3: "GAB", iso: "GA", iso_name: "GABON", numcode: "266" },
-  { name: "Malta", iso3: "MLT", iso: "MT", iso_name: "MALTA", numcode: "470" },
-  { name: "Northern Mariana Islands", iso3: "MNP", iso: "MP", iso_name: "NORTHERN MARIANA ISLANDS", numcode: "580" },
-  { name: "Turkey", iso3: "TUR", iso: "TR", iso_name: "TURKEY", numcode: "792" },
-  { name: "Congo, the Democratic Republic of the", iso3: "COD", iso: "CD", iso_name: "CONGO, THE DEMOCRATIC REPUBLIC OF THE", numcode: "180" },
-  { name: "Marshall Islands", iso3: "MHL", iso: "MH", iso_name: "MARSHALL ISLANDS", numcode: "584" },
-  { name: "Norway", iso3: "NOR", iso: "NO", iso_name: "NORWAY", numcode: "578" },
-  { name: "Turkmenistan", iso3: "TKM", iso: "TM", iso_name: "TURKMENISTAN", numcode: "795" },
-  { name: "Belarus", iso3: "BLR", iso: "BY", iso_name: "BELARUS", numcode: "112" },
-  { name: "Cook Islands", iso3: "COK", iso: "CK", iso_name: "COOK ISLANDS", numcode: "184" },
-  { name: "Gambia", iso3: "GMB", iso: "GM", iso_name: "GAMBIA", numcode: "270" },
-  { name: "Martinique", iso3: "MTQ", iso: "MQ", iso_name: "MARTINIQUE", numcode: "474" },
-  { name: "Oman", iso3: "OMN", iso: "OM", iso_name: "OMAN", numcode: "512" },
-  { name: "Seychelles", iso3: "SYC", iso: "SC", iso_name: "SEYCHELLES", numcode: "690" },
-  { 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", 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: "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" },
-  { name: "Panama", iso3: "PAN", iso: "PA", iso_name: "PANAMA", numcode: "591" },
-  { name: "Singapore", iso3: "SGP", iso: "SG", iso_name: "SINGAPORE", numcode: "702" },
-  { name: "Croatia", iso3: "HRV", iso: "HR", iso_name: "CROATIA", numcode: "191" },
-  { name: "Ghana", iso3: "GHA", iso: "GH", iso_name: "GHANA", numcode: "288" },
-  { name: "Papua New Guinea", iso3: "PNG", iso: "PG", iso_name: "PAPUA NEW GUINEA", numcode: "598" },
-  { name: "Slovakia", iso3: "SVK", iso: "SK", iso_name: "SLOVAKIA", numcode: "703" },
-  { name: "Gibraltar", iso3: "GIB", iso: "GI", iso_name: "GIBRALTAR", numcode: "292" },
-  { name: "Paraguay", iso3: "PRY", iso: "PY", iso_name: "PARAGUAY", numcode: "600" },
-  { name: "Slovenia", iso3: "SVN", iso: "SI", iso_name: "SLOVENIA", numcode: "705" },
-  { name: "Greece", iso3: "GRC", iso: "GR", iso_name: "GREECE", numcode: "300" },
-  { 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", 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" },
-  { name: "Sri Lanka", iso3: "LKA", iso: "LK", iso_name: "SRI LANKA", numcode: "144" },
-  { name: "Afghanistan", iso3: "AFG", iso: "AF", iso_name: "AFGHANISTAN", numcode: "4" },
-  { name: "Albania", iso3: "ALB", iso: "AL", iso_name: "ALBANIA", numcode: "8" },
-  { name: "Algeria", iso3: "DZA", iso: "DZ", iso_name: "ALGERIA", numcode: "12" },
-  { name: "Latvia", iso3: "LVA", iso: "LV", iso_name: "LATVIA", numcode: "428" },
-  { name: "American Samoa", iso3: "ASM", iso: "AS", iso_name: "AMERICAN SAMOA", numcode: "16" },
-  { name: "Bulgaria", iso3: "BGR", iso: "BG", iso_name: "BULGARIA", numcode: "100" },
-  { name: "Lebanon", iso3: "LBN", iso: "LB", iso_name: "LEBANON", numcode: "422" },
-  { name: "Andorra", iso3: "AND", iso: "AD", iso_name: "ANDORRA", numcode: "20" },
-  { name: "Burkina Faso", iso3: "BFA", iso: "BF", iso_name: "BURKINA FASO", numcode: "854" },
-  { name: "Lesotho", iso3: "LSO", iso: "LS", iso_name: "LESOTHO", numcode: "426" },
-  { name: "Angola", iso3: "AGO", iso: "AO", iso_name: "ANGOLA", numcode: "24" },
-  { name: "Burundi", iso3: "BDI", iso: "BI", iso_name: "BURUNDI", numcode: "108" },
-  { name: "Liberia", iso3: "LBR", iso: "LR", iso_name: "LIBERIA", numcode: "430" },
-  { name: "Virgin Islands, British", iso3: "VGB", iso: "VG", iso_name: "VIRGIN ISLANDS, BRITISH", numcode: "92" },
-  { name: "Anguilla", iso3: "AIA", iso: "AI", iso_name: "ANGUILLA", numcode: "660" },
-  { name: "Cambodia", iso3: "KHM", iso: "KH", iso_name: "CAMBODIA", numcode: "116" },
-  { name: "Equatorial Guinea", iso3: "GNQ", iso: "GQ", iso_name: "EQUATORIAL GUINEA", numcode: "226" },
-  { name: "Libyan Arab Jamahiriya", iso3: "LBY", iso: "LY", iso_name: "LIBYAN ARAB JAMAHIRIYA", numcode: "434" },
-  { name: "Nauru", iso3: "NRU", iso: "NR", iso_name: "NAURU", numcode: "520" },
-  { name: "Virgin Islands, U.S.", iso3: "VIR", iso: "VI", iso_name: "VIRGIN ISLANDS, U.S.", numcode: "850" },
-  { 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", 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", 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" },
-  { name: "Yemen", iso3: "YEM", iso: "YE", iso_name: "YEMEN", numcode: "887" },
-  { name: "Cape Verde", iso3: "CPV", iso: "CV", iso_name: "CAPE VERDE", numcode: "132" },
-  { name: "Estonia", iso3: "EST", iso: "EE", iso_name: "ESTONIA", numcode: "233" },
-  { name: "Luxembourg", iso3: "LUX", iso: "LU", iso_name: "LUXEMBOURG", numcode: "442" },
-  { name: "Netherlands Antilles", iso3: "ANT", iso: "AN", iso_name: "NETHERLANDS ANTILLES", numcode: "530" },
-  { 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", 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" },
-  { name: "Zimbabwe", iso3: "ZWE", iso: "ZW", iso_name: "ZIMBABWE", numcode: "716" },
-  { name: "Central African Republic", iso3: "CAF", iso: "CF", iso_name: "CENTRAL AFRICAN REPUBLIC", numcode: "140" },
-  { name: "Falkland Islands (Malvinas)", iso3: "FLK", iso: "FK", iso_name: "FALKLAND ISLANDS (MALVINAS)", numcode: "238" },
-  { 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", states_required: true },
-  { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" },
-  { name: "Montenegro", iso3: "MNE", iso: "ME", iso_name: "MONTENEGRO", numcode: "499" },
-  { name: "Jersey", iso3: "JEY", iso: "JE", iso_name: "JERSEY", numcode: "44" }
-])
+require 'carmen'
+
+countries = []
+Carmen::Country.all.each do |country|
+  countries << {
+    name: country.name,
+    iso3: country.alpha_3_code,
+    iso: country.alpha_2_code,
+    iso_name: country.name.upcase,
+    numcode: country.numeric_code,
+    states_required: country.subregions?
+  }
+end
+
+ActiveRecord::Base.transaction do
+  Spree::Country.create!(countries)
+end
+
 Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id

data/db/default/spree/states.rb

@@ -1,76 +1,16 @@
-united_states = Spree::Country.find_by(name: 'United States')
-
-Spree::State.create!([
-  { name: 'Michigan', abbr: 'MI', country: united_states },
-  { name: 'South Dakota', abbr: 'SD', country: united_states },
-  { name: 'Washington', abbr: 'WA', country: united_states },
-  { name: 'Wisconsin', abbr: 'WI', country: united_states },
-  { name: 'Arizona', abbr: 'AZ', country: united_states },
-  { name: 'Illinois', abbr: 'IL', country: united_states },
-  { name: 'New Hampshire', abbr: 'NH', country: united_states },
-  { name: 'North Carolina', abbr: 'NC', country: united_states },
-  { name: 'Kansas', abbr: 'KS', country: united_states },
-  { name: 'Missouri', abbr: 'MO', country: united_states },
-  { name: 'Arkansas', abbr: 'AR', country: united_states },
-  { name: 'Nevada', abbr: 'NV', country: united_states },
-  { name: 'District of Columbia', abbr: 'DC', country: united_states },
-  { name: 'Idaho', abbr: 'ID', country: united_states },
-  { name: 'Nebraska', abbr: 'NE', country: united_states },
-  { name: 'Pennsylvania', abbr: 'PA', country: united_states },
-  { name: 'Hawaii', abbr: 'HI', country: united_states },
-  { name: 'Utah', abbr: 'UT', country: united_states },
-  { name: 'Vermont', abbr: 'VT', country: united_states },
-  { name: 'Delaware', abbr: 'DE', country: united_states },
-  { name: 'Rhode Island', abbr: 'RI', country: united_states },
-  { name: 'Oklahoma', abbr: 'OK', country: united_states },
-  { name: 'Louisiana', abbr: 'LA', country: united_states },
-  { name: 'Montana', abbr: 'MT', country: united_states },
-  { name: 'Tennessee', abbr: 'TN', country: united_states },
-  { name: 'Maryland', abbr: 'MD', country: united_states },
-  { name: 'Florida', abbr: 'FL', country: united_states },
-  { name: 'Virginia', abbr: 'VA', country: united_states },
-  { name: 'Minnesota', abbr: 'MN', country: united_states },
-  { name: 'New Jersey', abbr: 'NJ', country: united_states },
-  { name: 'Ohio', abbr: 'OH', country: united_states },
-  { name: 'California', abbr: 'CA', country: united_states },
-  { name: 'North Dakota', abbr: 'ND', country: united_states },
-  { name: 'Maine', abbr: 'ME', country: united_states },
-  { name: 'Indiana', abbr: 'IN', country: united_states },
-  { name: 'Texas', abbr: 'TX', country: united_states },
-  { name: 'Oregon', abbr: 'OR', country: united_states },
-  { name: 'Wyoming', abbr: 'WY', country: united_states },
-  { name: 'Alabama', abbr: 'AL', country: united_states },
-  { name: 'Iowa', abbr: 'IA', country: united_states },
-  { name: 'Mississippi', abbr: 'MS', country: united_states },
-  { name: 'Kentucky', abbr: 'KY', country: united_states },
-  { name: 'New Mexico', abbr: 'NM', country: united_states },
-  { name: 'Georgia', abbr: 'GA', country: united_states },
-  { name: 'Colorado', abbr: 'CO', country: united_states },
-  { name: 'Massachusetts', abbr: 'MA', country: united_states },
-  { name: 'Connecticut', abbr: 'CT', country: united_states },
-  { name: 'New York', abbr: 'NY', country: united_states },
-  { name: 'South Carolina', abbr: 'SC', country: united_states },
-  { name: 'Alaska', abbr: 'AK', country: united_states },
-  { name: 'West Virginia', abbr: 'WV', country: united_states },
-  { name: 'U.S. Armed Forces - Americas', abbr: 'AA', country: united_states },
-  { name: 'U.S. Armed Forces - Europe', abbr: 'AE', country: united_states },
-  { name: 'U.S. Armed Forces - Pacific', abbr: 'AP', country: united_states }
-])
-
-canada = Spree::Country.find_by(name: 'Canada')
-
-Spree::State.create!([
-  { name: "Yukon",                     abbr: "YT", country: canada },
-  { name: "Nunavut",                   abbr: "NU", country: canada },
-  { name: "British Columbia",          abbr: "BC", country: canada },
-  { name: "Alberta",                   abbr: "AB", country: canada },
-  { name: "Saskatchewan",              abbr: "SK", country: canada },
-  { name: "Manitoba",                  abbr: "MB", country: canada },
-  { name: "Ontario",                   abbr: "ON", country: canada },
-  { name: "Quebec",                    abbr: "QC", country: canada },
-  { name: "New Brunswick",             abbr: "NB", country: canada },
-  { name: "Newfoundland and Labrador", abbr: "NL", country: canada },
-  { name: "Nova Scotia",               abbr: "NS", country: canada },
-  { name: "Prince Edward Island",      abbr: "PE", country: canada },
-  { name: "Northwest Territories",     abbr: "NT", country: canada }
-])
+ActiveRecord::Base.transaction do
+  Spree::Country.all.each do |country|
+    carmen_country = Carmen::Country.named(country.name)
+    @states ||= []
+    if carmen_country.subregions?
+      carmen_country.subregions.each do |subregion|
+        @states << {
+          name: subregion.name,
+          abbr: subregion.code,
+          country: country
+        }
+      end
+    end
+  end
+  Spree::State.create!(@states)
+end

data/db/migrate/20130213191427_create_default_stock.rb

@@ -1,5 +1,9 @@
 class CreateDefaultStock < ActiveRecord::Migration
   def up
+    unless column_exists? :spree_stock_locations, :default
+      add_column :spree_stock_locations, :default, :boolean, null: false, default: false
+    end
+
     Spree::StockLocation.skip_callback(:create, :after, :create_stock_items)
     Spree::StockLocation.skip_callback(:save, :after, :ensure_one_default)
     Spree::StockItem.skip_callback(:save, :after, :process_backorders)
@@ -28,4 +32,3 @@ class CreateDefaultStock < ActiveRecord::Migration
     Spree::StockItem.delete_all
   end
 end
-

data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb

@@ -3,10 +3,8 @@ class SetShipmentTotalForUsersUpgrading < ActiveRecord::Migration
     # NOTE You might not need this at all unless you're upgrading from Spree 2.1.x
     # or below. For those upgrading this should populate the Order#shipment_total
     # for legacy orders
-    execute "UPDATE spree_orders
-             SET shipment_total = (SELECT SUM(spree_shipments.cost) AS sum_id
-                                   FROM spree_shipments
-                                   WHERE spree_shipments.order_id = spree_orders.id)
-             WHERE spree_orders.completed_at IS NOT NULL AND spree_orders.shipment_total = 0"
+    Spree::Order.complete.where('shipment_total = ?', 0).includes(:shipments).find_each do |order|
+      order.update_column(:shipment_total, order.shipments.sum(:cost))
+    end
   end
 end

data/db/migrate/20140717185932_add_default_to_spree_stock_locations.rb

@@ -1,5 +1,7 @@
 class AddDefaultToSpreeStockLocations < ActiveRecord::Migration
   def change
-    add_column :spree_stock_locations, :default, :boolean, null: false, default: false
+    unless column_exists? :spree_stock_locations, :default
+      add_column :spree_stock_locations, :default, :boolean, null: false, default: false
+    end
   end
 end

data/db/migrate/20141012083513_create_spree_taxons_prototypes.rb

@@ -0,0 +1,8 @@
+class CreateSpreeTaxonsPrototypes < ActiveRecord::Migration
+  def change
+    create_table :spree_taxons_prototypes do |t|
+      t.belongs_to :taxon, index: true
+      t.belongs_to :prototype, index: true
+    end
+  end
+end

data/db/migrate/20141021194502_add_state_lock_version_to_order.rb

@@ -0,0 +1,5 @@
+class AddStateLockVersionToOrder < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :state_lock_version, :integer, default: 0, null: false
+  end
+end

data/db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb

@@ -0,0 +1,13 @@
+class AddCounterCacheFromSpreeVariantsToSpreeStockItems < ActiveRecord::Migration
+  def up
+    add_column :spree_variants, :stock_items_count, :integer, default: 0, null: false
+
+    Spree::Variant.find_each do |variant|
+      Spree::Variant.reset_counters(variant.id, :stock_items)
+    end
+  end
+
+  def down
+    remove_column :spree_variants, :stock_items_count
+  end
+end

data/db/migrate/20141101231208_fix_adjustment_order_presence.rb

@@ -0,0 +1,13 @@
+class FixAdjustmentOrderPresence < ActiveRecord::Migration
+  def change
+    say 'Fixing adjustments without direct order reference'
+    Spree::Adjustment.where(order: nil).find_each do |adjustment|
+      adjustable = adjustment.adjustable
+      if adjustable.is_a? Spree::Order
+        adjustment.update_attributes!(order_id: adjustable.id)
+      else
+        adjustment.update_attributes!(adjustable: adjustable.order)
+      end
+    end
+  end
+end

data/db/migrate/20141105213646_update_classifications_positions.rb

@@ -0,0 +1,9 @@
+class UpdateClassificationsPositions < ActiveRecord::Migration
+  def up
+    Spree::Taxon.all.each do |taxon|
+      taxon.classifications.each_with_index do |c12n, i|
+        c12n.set_list_position(i + 1)
+      end
+    end
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -53,14 +53,10 @@ User-agent: *
 Disallow: /checkout
 Disallow: /cart
 Disallow: /orders
-Disallow: /countries
-Disallow: /line_items
-Disallow: /password_resets
-Disallow: /states
-Disallow: /user_sessions
-Disallow: /user_registrations
-Disallow: /users
+Disallow: /user
 Disallow: /account
+Disallow: /api
+Disallow: /password
       ROBOTS
     end