spree_counties 3.0.1 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf4050d9bc0bdc13816724a74131104f7b0158a
-  data.tar.gz: 557a52a8af1d88e4683ebd1c1f3ad5247cfb6fd7
+  metadata.gz: bf5a39f6e609a2a1690d28637ad712e89830d092
+  data.tar.gz: a4526e64c8460d0d9acd74ac0b35f499e8a66a69
 SHA512:
-  metadata.gz: 9e4346678663c5c03330d04338f3c69b46853e1187ed44b9c5f94975cf5d91ea195b689425e1f7ca507972d14ded516d29c77c5e9314da2c9addb9296fa644a1
-  data.tar.gz: 430f211168dffbe87702fbf79fb99b1d3dd434092e3bec5301b167286f92a6b7eef5e390d9679be24f74a4260ab49484b866dd8a3e19d23b65bacba077f6d2bc
+  metadata.gz: c99386874d6bb93be2cef1d37d23cb57147e7f252c93a25245fe105a03b1fcb5851e02284b68287070c6220ed058af3432c41fbcc4cf16a702edb580864419a4
+  data.tar.gz: 860119620644d0559493e169edd76260b32454652ec8031e6de3c78eaa8eecca3fb448348fcb469f0e1d164456a40b2501f21f5c49437bb0b153780af828e6cf

data/.ruby-gemset

@@ -0,0 +1 @@
+spree_counties

data/.ruby-version

@@ -0,0 +1 @@
+2.2.1

data/Gemfile

@@ -1,7 +1,15 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', branch: '2-3-stable'
+gem 'spree', github: 'spree/spree', branch: '3-0-stable'
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-3-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable'
 
 gemspec
+
+group :development do
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'pry'
+
+  gem 'spreadsheet'
+end

data/README.md

@@ -23,6 +23,11 @@ bundle
 bundle exec rails g spree_counties:install
 ```
 
+Documentation
+-------------
+
+Pay atention to Spree::Address#require_county? method if you want validation in county fields
+
 Testing
 -------
 

data/app/assets/javascripts/spree/frontend/spree_counties.js.coffee

@@ -1,58 +1,84 @@
 Spree.ready ($) ->
-  ($ '#bstate select').change ->
-    updateCounty 'b'
-
-  ($ '#sstate select').change ->
-    updateCounty 's'
-
-  updateCounty = (region) ->
-    stateId = getStateId(region)
-    if stateId?
-      $.get '/api/counties', {state_id: stateId}, (data) ->
-        Spree.Checkout[stateId] =
-          counties: data.counties
-        fillCounties(Spree.Checkout[stateId], region)
-
-  getStateId = (region) ->
-      $('#' + region + 'state select').val()
-
-  fillCounties = (data, region) ->
-    countiesRequired = true
-    counties = data.counties
-
-    countyPara = ($ '#' + region + 'county')
-    countySelect = countyPara.find('select')
-    countyInput = countyPara.find('input')
-    countySpanRequired = countyPara.find('county-required')
-    if counties.length > 0
-      selected = parseInt countySelect.val()
-      countySelect.html ''
-      countyWithBlank = [{ name: '', id: ''}].concat(counties)
-      $.each countyWithBlank, (idx, county) ->
-        opt = ($ document.createElement('option')).attr('value', county.id).html(county.name)
-        opt.prop 'selected', true if selected is county.id
-        countySelect.append opt
-
-      countySelect.prop('disabled', false).show()
-      countyInput.hide().prop 'disabled', true
-      countyPara.show()
-      countySpanRequired.show()
-      countySelect.addClass('required') if countiesRequired
-      countySelect.removeClass('hidden')
-      countyInput.removeClass('required')
-    else
-      countySelect.hide().prop 'disabled', true
-      countyInput.show()
-      if countiesRequired
-        countySpanRequired.show()
-        countyInput.addClass('required')
+  if ($ '#checkout_form_address').is('*')
+    getStateId = (region) ->
+      $('#' + region + 'state select:visible').val()
+
+    Spree.updateCounty = (region) ->
+      stateId = getStateId(region)
+      if stateId? and stateId
+        unless Spree.Checkout[stateId]?
+          $.get '/api/counties', {state_id: stateId}, (data) ->
+            Spree.Checkout[stateId] =
+              counties: data.counties
+              counties_required: false #data.counties_required
+            Spree.fillCounties(Spree.Checkout[stateId], region)
+        else
+          Spree.fillCounties(Spree.Checkout[stateId], region)
+
       else
-        countyInput.val ''
-        countySpanRequired.hide()
+        countyPara = ($ '#' + region + 'county')
+        countySelect = countyPara.find('select')
+        countyInput = countyPara.find('input')
+
+        countyPara.hide()
+        countySelect.hide().prop('disabled', true).val('')
+        countyInput.hide().prop('disabled', true).val('')
+
+    Spree.fillCounties = (data, region) ->
+      countiesRequired = data.counties_required
+      counties = data.counties
+
+      countyPara = ($ '#' + region + 'county')
+      countySelect = countyPara.find('select')
+      countyInput = countyPara.find('input')
+      countySpanRequired = countyPara.find('[id$="county-required"]')
+      if counties.length > 0
+        selected = parseInt countySelect.val()
+        countySelect.html ''
+        countyWithBlank = [{ name: '', id: ''}].concat(counties)
+        $.each countyWithBlank, (idx, county) ->
+          opt = ($ document.createElement('option')).attr('value', county.id).html(county.name)
+          opt.prop 'selected', true if selected is county.id
+          countySelect.append opt
+
+        countySelect.prop('disabled', false).show()
+        countyInput.hide().prop('disabled', true).val('')
+        countyPara.show()
+        countySpanRequired.show()
+        countySelect.addClass('required') if countiesRequired
+        countySelect.removeClass('hidden')
         countyInput.removeClass('required')
-      countyPara.toggle(!!countiesRequired)
-      countyInput.prop('disabled', !countiesRequired)
-      countyInput.removeClass('hidden')
-      countySelect.removeClass('required')
+      else
+        countySelect.hide().prop('disabled', true).val('')
+        countyInput.show()
+        if countiesRequired
+          countySpanRequired.show()
+          countyInput.addClass('required')
+        else
+          countyInput.val ''
+          countySpanRequired.hide()
+          countyInput.removeClass('required')
+        countyPara.toggle(!!countiesRequired)
+        countyInput.prop('disabled', !countiesRequired)
+        countyInput.removeClass('hidden')
+        countySelect.removeClass('required')
+
+    $(document).on 'change', '#bstate select', ->
+      Spree.updateCounty 'b'
+
+    $(document).on 'change', '#sstate select', ->
+      Spree.updateCounty 's'
+
+    $(document).on 'change', '#bcountry select', ->
+      Spree.updateCounty 'b'
+
+    $(document).on 'change', '#scountry select', ->
+      Spree.updateCounty 's'
+
+    Spree.updateCounty 'b'
+
 
-  updateCounty 'b'
+    window.fillStatesOld = Spree.fillStates
+    Spree.fillStates = (data, region) ->
+      fillStatesOld(data, region)
+      Spree.updateCounty(region)

data/app/models/spree/address_decorator.rb

@@ -1,7 +1,67 @@
 module Spree
   Address.class_eval do
-    belongs_to :county, class_name: "Spree::County"
     Spree::PermittedAttributes.address_attributes << :county_id
     Spree::PermittedAttributes.address_attributes << :county_name
+
+    before_validation :ensure_state_country_dependency
+    before_validation :ensure_county_state_dependency
+
+    belongs_to :county, class_name: "Spree::County"
+    validate :county_validate
+
+    def require_county?
+      false
+    end
+
+    private
+      def county_validate
+        # Skip state validation without state
+        return if state.blank?
+        return if !require_county?
+
+        # ensure associated county belongs to state
+        if county.present?
+          if county.state == state
+            self.county_name = nil #not required as we have a valid county and state combo
+          else
+            if county_name.present?
+              self.county = nil
+            else
+              errors.add(:county, :invalid)
+            end
+          end
+        end
+
+        # ensure county_name belongs to state without counties, or that it matches a predefined state name
+        if county_name.present?
+          if state.counties.present?
+            counties = state.counties.find_all_by_name(county_name)
+
+            if counties.size == 1
+              self.county = counties.first
+              self.county_name = nil
+            else
+              errors.add(:state, :invalid)
+            end
+          end
+        end
+
+        # ensure at least one county field is populated
+        errors.add :county, :blank if county.blank? && county_name.blank?
+      end
+
+      # ensure associated state belongs to country
+      def ensure_state_country_dependency
+        unless Spree::State.where(country_id: self.country_id).exists?(id: self.state_id)
+          self.state_id = nil
+        end
+      end
+
+      # ensure associated county belongs to state
+      def ensure_county_state_dependency
+        unless Spree::County.where(state_id: self.state_id).exists?(id: self.county_id)
+          self.county_id = nil
+        end
+      end
   end
-end
+end

data/app/models/spree/county.rb

@@ -1,6 +1,7 @@
 class Spree::County < ActiveRecord::Base
   belongs_to :state
   has_many :addresses, dependent: :nullify
+  validates :name, presence: true
   Spree::Ability.register_ability(CountyAbility)
 
   def <=>(other)

data/app/overrides/spree/address/_form/add_county.html.erb.deface

@@ -0,0 +1,53 @@
+<!-- replace_contents "erb[silent]:contains('Spree::Config[:address_requires_state]')" closing_selector "erb[silent]:contains('end')" -->
+<p class="form-group" id=<%="#{address_id}state" %>>
+  <% have_states = !address.country.states.empty? %>
+  <%= form.label :state do %>
+    <%= Spree.t(:state) %><abbr class='required' title="required" id=<%="#{address_id}state-required"%>>*</abbr>
+  <% end %>
+
+  <% state_elements = [
+      form.collection_select(:state_id, address.country.states,
+                             :id, :name,
+                             {:include_blank => true},
+                             {:class => have_states ? 'form-control required' : 'form-control hidden',
+                             :disabled => !have_states}) +
+      form.text_field(:state_name,
+                      :class => !have_states ? 'form-control required' : 'form-control hidden',
+                      :disabled => have_states)
+    ].join.gsub('"', "'").gsub("\n", "")
+  %>
+  <%= javascript_tag do %>
+    $('#<%="#{address_id}state" %>').append("<%== state_elements %>");
+  <% end %>
+</p>
+<noscript>
+  <%= form.text_field :state_name, :class => 'form-control required' %>
+</noscript>
+
+<p class="field" id=<%="#{address_id}county" %>>
+  <% have_counties = address.state and !address.state.counties.empty? %>
+  <%= form.label :county do %>
+    <%= Spree.t(:county) %>
+    <% if address.require_county? %>
+      <abbr class="required" id=<%="#{address_id}county-required"%>>*</abbr>
+    <% end %>
+  <% end %>
+
+  <% county_elements = [
+      form.collection_select(:county_id, address.state ? address.state.counties : {},
+                             :id, :name,
+                             {:include_blank => true},
+                             {:class => (have_counties || address.require_county?) ? "form-control required" : "form-control",
+                             :disabled => !have_counties}) +
+      form.text_field(:county_name,
+                      :class => (!have_counties || address.require_county?) ? 'form-control required' : 'form-control hidden',
+                      :disabled => have_counties)
+    ].join.gsub('"', "'").gsub("\n", "")
+  %>
+  <%= javascript_tag do %>
+    $('#<%="#{address_id}county" %>').append("<%== county_elements %>");
+  <% end %>
+</p>
+<noscript>
+  <%= form.text_field :county_name, :class => 'form-control required' %>
+</noscript>

data/app/overrides/spree/admin/shared/_address_form/add_county_to_form.html.erb.deface

@@ -0,0 +1,10 @@
+<!-- insert_bottom "div[data-hook=address_fields]" -->
+<div class="field <%= "#{type}-row" %>">
+  <%= f.label :county_id, Spree.t(:county) %>
+  <span id="<%= s_or_b %>county">
+    <%= f.text_field :county_name,
+          :style => "display: #{f.object.state.counties.empty? ? 'block' : 'none' };",
+         :disabled => !f.object.state.counties.empty?, :class => 'fullwidth county_name' %>
+    <%= f.collection_select :county_id, f.object.state.counties.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.state.counties.empty? ? 'none' : 'block' };", :disabled => f.object.state.counties.empty?} %>
+  </span>
+</div>

data/config/locales/en.yml

@@ -12,4 +12,5 @@ en:
         other: Counties
   spree:
     counties: "Counties"
+    county: "County"
     new_county: "New county"

data/config/locales/es.yml

@@ -12,4 +12,5 @@ es:
         other: Comunas
   spree:
     counties: "Comunas"
+    county: "Comuna"
     new_county: "Nueva comuna"

data/config/routes.rb

@@ -6,7 +6,7 @@ Spree::Core::Engine.routes.draw do
 
   namespace :admin do
     resources :counties
-    resource :states do 
+    resources :states do
       resources :counties
     end
   end

data/spec/controllers/spree/admin/counties_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Spree::Admin::CountiesController do
+  describe 'GET #index' do
+    it { should use_before_action(:load_data) }
+  end
+end

data/spec/models/spree/county_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Spree::County do
+  ##############
+  # attributes #
+  ##############
+  it { expect(subject).to respond_to :name }
+  it { expect(subject).to respond_to :state_id }
+
+  ##############
+  # association #
+  ##############
+  it { should belong_to(:state) }
+
+  ##############
+  # validations #
+  ##############
+  it { should validate_presence_of(:name) }
+end

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 require 'database_cleaner'
 require 'ffaker'
+require 'shoulda/matchers'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -26,8 +27,10 @@ Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 # Requires factories and other useful helpers defined in spree_core.
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
-require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/factories'
+require 'spree/testing_support/preferences'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/flash'
 require 'spree/testing_support/url_helpers'
 
 # Requires factories defined in lib/spree_counties/factories.rb
@@ -35,7 +38,9 @@ require 'spree_counties/factories'
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-
+  config.include Spree::TestingSupport::ControllerRequests, :type => :controller
+  config.include Devise::TestHelpers, :type => :controller
+  
   # Infer an example group's spec type from the file location.
   config.infer_spec_type_from_file_location!
 

data/spree_counties.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_counties'
-  s.version     = '3.0.1'
+  s.version     = '3.0.4'
   s.summary     = 'Lets your users pick counties from states list in address\'s step'
   s.description = 'Add county model to address'
   s.required_ruby_version = '>= 1.9.3'
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency('spree_core', '~> 3.0')
+  s.add_dependency('spree_backend', '~> 3.0')
 
   s.add_development_dependency 'capybara', '~> 2.4'
   s.add_development_dependency 'coffee-rails'
@@ -27,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails',  '~> 3.1'
   s.add_development_dependency 'sass-rails', '~> 4.0.2'
   s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'shoulda-matchers'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_counties
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.4
 platform: ruby
 authors:
 - Gonzalo Moreno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: spree_backend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +201,8 @@ files:
 - ".bundle/config"
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -187,14 +217,14 @@ files:
 - app/models/spree/address_decorator.rb
 - app/models/spree/county.rb
 - app/models/spree/state_decorator.rb
+- app/overrides/spree/address/_form/add_county.html.erb.deface
+- app/overrides/spree/admin/shared/_address_form/add_county_to_form.html.erb.deface
 - app/overrides/spree/admin/states/index.rb
-- app/views/spree/address/_form.html.erb
 - app/views/spree/admin/counties/_county_list.html.erb
 - app/views/spree/admin/counties/_form.html.erb
 - app/views/spree/admin/counties/edit.html.erb
 - app/views/spree/admin/counties/index.html.erb
 - app/views/spree/admin/counties/new.html.erb
-- app/views/spree/admin/shared/_address_form.html.erb
 - app/views/spree/api/counties/index.v1.rabl
 - app/views/spree/api/counties/show.v1.rabl
 - bin/rails
@@ -212,6 +242,8 @@ files:
 - lib/spree_counties/engine.rb
 - lib/spree_counties/factories.rb
 - lib/spree_counties/version.rb
+- spec/controllers/spree/admin/counties_controller_spec.rb
+- spec/models/spree/county_spec.rb
 - spec/spec_helper.rb
 - spree_counties.gemspec
 homepage: http://www.acid.cl
@@ -235,10 +267,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Lets your users pick counties from states list in address's step
 test_files:
+- spec/controllers/spree/admin/counties_controller_spec.rb
+- spec/models/spree/county_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/app/views/spree/address/_form.html.erb

@@ -1,86 +0,0 @@
-<% address_id = address_type.chars.first %>
-<div class="inner" data-hook=<%="#{address_type}_inner" %>>
-  <p class="field" id=<%="#{address_id}firstname" %>>
-    <%= form.label :firstname, Spree.t(:first_name) %><span class="required">*</span><br />
-    <%= form.text_field :firstname, :class => 'required' %>
-  </p>
-  <p class="field" id=<%="#{address_id}lastname" %>>
-    <%= form.label :lastname, Spree.t(:last_name) %><span class="required">*</span><br />
-    <%= form.text_field :lastname, :class => 'required' %>
-  </p>
-  <% if Spree::Config[:company] %>
-    <p class="field" id=<%="#{address_id}company" %>>
-      <%= form.label :company, Spree.t(:company) %><br />
-      <%= form.text_field :company %>
-    </p>
-  <% end %>
-  <p class="field" id=<%="#{address_id}address1" %>>
-    <%= form.label :address1, Spree.t(:street_address) %><span class="required">*</span><br />
-    <%= form.text_field :address1, :class => 'required' %>
-  </p>
-  <p class="field" id=<%="#{address_id}address2" %>>
-    <%= form.label :address2, Spree.t(:street_address_2) %><br />
-    <%= form.text_field :address2 %>
-  </p>
-  <p class="field" id=<%="#{address_id}city" %>>
-    <%= form.label :city, Spree.t(:city) %><span class="required">*</span><br />
-    <%= form.text_field :city, :class => 'required' %>
-  </p>
-  <p class="field" id=<%="#{address_id}country" %>>
-    <%= form.label :country_id, Spree.t(:country) %><span class="required">*</span><br />
-    <span id=<%="#{address_id}country-selection" %>>
-      <%= form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
-    </span>
-  </p>
-
-  <% if Spree::Config[:address_requires_state] %>
-    <p class="field" id=<%="#{address_id}state" %>>
-      <% have_states = !address.country.states.empty? %>
-      <%= form.label :state, Spree.t(:state) %><span class='required' id=<%="#{address_id}state-required"%>>*</span><br/>
-
-      <% state_elements = [
-         form.collection_select(:state_id, address.country.states,
-                            :id, :name,
-                            {:include_blank => true},
-                            {:class => have_states ? 'required' : 'hidden',
-                            :disabled => !have_states}) +
-         form.text_field(:state_name,
-                            :class => !have_states ? 'required' : 'hidden',
-                            :disabled => have_states)
-         ].join.gsub('"', "'").gsub("\n", "")
-      %>
-      <%= javascript_tag do -%>
-        $('#<%="#{address_id}state" %>').append("<%== state_elements %>");
-      <% end %>
-    </p>
-      <noscript>
-        <%= form.text_field :state_name, :class => 'required' %>
-      </noscript>
-
-    <p class="field" id=<%="#{address_id}county" %>>
-      <%= form.label :county do %>
-        <%= Spree.t(:county) %>
-        <span class="required" id=<%="#{address_id}county-required"%>>*</span>
-      <% end %>
-      <%= form.collection_select(:county_id, [],
-                              :id, :name,
-                              {:include_blank => true},
-                              {:class => "form-control required",}) %>
-    </p>
-  <% end %>
-
-  <p class="field" id=<%="#{address_id}zipcode" %>>
-    <%= form.label :zipcode, Spree.t(:zip) %><% if address.require_zipcode? %><span class="required">*</span><br /><% end %>
-    <%= form.text_field :zipcode, :class => "#{'required' if address.require_zipcode?}" %>
-  </p>
-  <p class="field" id=<%="#{address_id}phone" %>>
-    <%= form.label :phone, Spree.t(:phone) %><% if address.require_phone? %><span class="required">*</span><br /><% end %>
-    <%= form.phone_field :phone, :class => "#{'required' if address.require_phone?}" %>
-  </p>
-  <% if Spree::Config[:alternative_shipping_phone] %>
-    <p class="field" id=<%="#{address_id}altphone" %>>
-      <%= form.label :alternative_phone, Spree.t(:alternative_phone) %><br />
-      <%= form.phone_field :alternative_phone %>
-    </p>
-  <% end %>
-</div>

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -1,81 +0,0 @@
-<% s_or_b = type.chars.first %>
-
-<div id="<%= type %>" data-hook="address_fields">
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :firstname, Spree.t(:first_name) %>
-    <%= f.text_field :firstname, :class => 'fullwidth' %>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :lastname, Spree.t(:last_name) %>
-    <%= f.text_field :lastname, :class => 'fullwidth' %>
-  </div>
-
-  <% if Spree::Config[:company] %>
-    <div class="field <%= "#{type}-row" %>">
-      <%= f.label :company, Spree.t(:company) %>
-      <%= f.text_field :company, :class => 'fullwidth' %>
-    </div>
-  <% end %>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :address1, Spree.t(:street_address) %>
-    <%= f.text_field :address1, :class => 'fullwidth' %>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :address2, Spree.t(:street_address_2) %>
-    <%= f.text_field :address2, :class => 'fullwidth' %>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :city, Spree.t(:city) %>
-    <%= f.text_field :city, :class => 'fullwidth' %>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :zipcode, Spree.t(:zip) %>
-    <%= f.text_field :zipcode, :class => 'fullwidth' %>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :country_id, Spree.t(:country) %>
-    <span id="<%= s_or_b %>country">
-      <%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %>
-    </span>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :state_id, Spree.t(:state) %>
-    <span id="<%= s_or_b %>state">
-      <%= f.text_field :state_name,
-            :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
-           :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
-      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
-    </span>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :county_id, Spree.t(:county) %>
-    <span id="<%= s_or_b %>county">
-      <%= f.text_field :county_name,
-            :style => "display: #{f.object.state.counties.empty? ? 'block' : 'none' };",
-           :disabled => !f.object.state.counties.empty?, :class => 'fullwidth county_name' %>
-      <%= f.collection_select :county_id, f.object.state.counties.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.state.counties.empty? ? 'none' : 'block' };", :disabled => f.object.state.counties.empty?} %>
-    </span>
-  </div>
-
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :phone, Spree.t(:phone) %>
-    <%= f.phone_field :phone, :class => 'fullwidth' %>
-  </div>
-</div>
-
-<% content_for :head do %>
-  <%= javascript_tag do -%>
-    $(document).ready(function(){
-      $('span#<%= s_or_b %>country .select2').on('change', function() { update_state('<%= s_or_b %>'); });
-      $('span#<%= s_or_b %>state .select2').on('change', function() { update_county('<%= s_or_b %>'); });
-    });
-  <% end -%>
-<% end %>