remove the special street number

Author: Stefan Hartmann

README.md

@@ -1,11 +1,11 @@
 SpreeGermanMarket
 =================
 
-Extends the spreecommerce for being more german market ready. Assumes a german country.
+Configure and extend spreecommerce for being more german market ready. Assumes a german country.
 
 - Alters the address fields
-- Change the final save and continue button caption 
-- Adds some declarations and translations. 
+- Change the final save and continue button caption
+- Adds some declarations and translations.
 - Adds a german zone, german tax categories/rates and a default flat german shipping method.
 - Remove germany from all other zones.
 - Set germany as default checkout zone and default country id.
@@ -18,7 +18,7 @@ Installation
 Add spree_german_market to your Gemfile:
 
 ```ruby
-gem 'spree_german_market', :git => 'git://github.com/hefan/spree_german_market.git' 
+gem 'spree_german_market', :git => 'git://github.com/hefan/spree_german_market.git'
 ```
 
 For a specific version use the appropriate branch, for example
@@ -65,5 +65,3 @@ Simply add this require statement to your spec_helper:
 ```ruby
 require 'spree_german_market/factories'
 ```
-
-

app/models/spree/address_decorator.rb

@@ -1,3 +1,18 @@
+Skip to content
+ This repository
+Explore
+Gist
+Blog
+Help
+stefan hefan
+
+338  Watch
+  Star 5,699
+ Fork 2,647spree/spree
+ branch: 2-4-stable spree / frontend / app / views / spree / address / _form.html.erb
+Matthew FenelonMattFenelon on Mar 30 Allowed for client side validation of phone number and zip code to be…
+2 contributors Ryan BiggMatthew Fenelon
+76 lines (72 sloc)  3.505 kb RawBlameHistory
 <% address_id = address_type.chars.first %>
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
   <p class="field" id=<%="#{address_id}firstname" %>>
@@ -14,17 +29,13 @@
       <%= form.text_field :company %>
     </p>
   <% end %>
-  <p class="field" id="<%="#{address_id}address1" %>">
+  <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}street_number" %>">
-    <%= form.label :street_number, Spree.t(:street_number) %><span class="required">*</span><br />
-    <%= form.text_field :street_number, :class => 'required' %>
-  </p>
   <p class="field" id=<%="#{address_id}zipcode" %>>
-    <%= form.label :zipcode, Spree.t(:zip) %><span class="required">*</span><br />
-    <%= form.text_field :zipcode, :class => 'required' %>
+    <%= 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}city" %>>
     <%= form.label :city, Spree.t(:city) %><span class="required">*</span><br />
@@ -63,8 +74,8 @@
   <% end %>
 
   <p class="field" id=<%="#{address_id}phone" %>>
-    <%= form.label :phone, Spree.t(:phone) %><span class="required">*</span><br />
-    <%= form.phone_field :phone, :class => 'required' %>
+    <%= 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" %>>
@@ -73,4 +84,5 @@
     </p>
   <% end %>
 </div>
-
+Status API Training Shop Blog About
+© 2014 GitHub, Inc. Terms Privacy Security Contact

app/overrides/address_vcart_street_number.rb

@@ -4,6 +4,3 @@
 de:
   buy: "Jetzt kaufen"
   buy_declaration: "Mit Betätigungs des 'Jetzt Kaufen'-Knopfes bestätigen Sie unsere Allgemeinen Geschäftsbedingungen (AGB) und Datenschutzbestimmungen."
-
-  spree:
-    street_number: "Hausnr"

app/overrides/admin_address_display_street_number.rb

@@ -4,6 +4,3 @@
 en:
   buy: "Buy"
   buy_declaration: "By Clicking the 'Buy'-Button you accept our general terms and conditions and data protection regulations."
-
-  spree:
-    street_number: "Street Number"  

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

@@ -17,8 +17,6 @@ def self.activate
       end
     end
 
-    Spree::PermittedAttributes.address_attributes << :street_number
-
     config.to_prepare &method(:activate).to_proc
   end
 end

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

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_german_market'
-  s.version     = '2.3.0'
+  s.version     = '2.4.0'
   s.summary     = 'Spree Extension for german market'
   s.description = 'change checkout and add default date for german market'
   s.required_ruby_version = '>= 1.9.3'
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.3'
+  s.add_dependency 'spree_core', '~> 2.4'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'