spree_zoned 0.5.33 → 0.5.34

data/app/models/spree/address_decorator.rb

@@ -0,0 +1,41 @@
+module Spree
+  Address.class_eval do
+
+    def state_validate
+      # Skip state validation without country (also required)
+      # or when disabled by preference
+      return if country.blank? || !Spree::Config[:address_requires_state] || country.id != 214
+
+      # ensure associated state belongs to country
+      if state.present?
+        if state.country == country
+          self.state_name = nil #not required as we have a valid state and country combo
+        else
+          if state_name.present?
+            self.state = nil
+          else
+            errors.add(:state, :invalid)
+          end
+        end
+      end
+
+      # ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
+      if state_name.present?
+        if country.states.present?
+          states = country.states.find_all_by_name_or_abbr(state_name)
+
+          if states.size == 1
+            self.state = states.first
+            self.state_name = nil
+          else
+            errors.add(:state, :invalid)
+          end
+        end
+      end
+
+      # ensure at least one state field is populated
+      errors.add :state, :blank if state.blank? && state_name.blank?
+    end
+
+  end
+end

data/config/initializers/zoned_init.rb

@@ -41,3 +41,4 @@ Rails.configuration.availableLanguages = Hash[ZONED_COMMON_LOCALES.map { |c, lgs
 
 Spree::Config.searcher_class = Spree::Zoned::Search::Base
 Spree::Config.admin_products_per_page = 64
+Spree::PrintInvoice::Config[:print_invoice_logo_path] = "admin/bg/hau-to-logo-claim.png"

data/spree_zoned.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zoned'
-  s.version     = '0.5.33'
+  s.version     = '0.5.34'
   s.summary     = 'A Spree extension to make your store zoned'
   s.description = "Everything you need for a zoned Spree store: zoned pricing, zoned products, zoned product ordering, zoned locales, ...\nProbalbly essential to you if you operate outside of the US."
   s.required_ruby_version = '>= 1.9.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_zoned
 version: !ruby/object:Gem::Version
-  version: 0.5.33
+  version: 0.5.34
   prerelease: 
 platform: ruby
 authors:
@@ -139,6 +139,7 @@ files:
 - app/helpers/spree/admin/products_helper_decorator.rb
 - app/helpers/spree/base_helper_decorator.rb
 - app/helpers/spree/products_helper_decorator.rb
+- app/models/spree/address_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/zoned/product.rb