spree_address_book 0.40.0 → 0.50.0

data/README.md

@@ -4,7 +4,13 @@ SpreeAddressBook
 This extension allows users select `bill_address` and `ship_address` from addresses, which was already entered by current user.
 
 
+Installation
+============
 
+      Add `gem "spree_address_book", :git => "git://github.com/romul/spree_address_book.git"
+      Run `bundle install`
+      Run `rake spree_address_book:install`
+      Run `rake db:migrate`
 
 
 Copyright (c) 2011 Roman Smirnov, released under the New BSD License

data/Versionfile

@@ -0,0 +1,2 @@
+"0.40.x" => { :branch => "0-40-stable" }
+"0.50.x" => { :branch => "master" }

data/app/models/order_decorator.rb

@@ -1,6 +1,14 @@
 Order.class_eval do
   attr_accessible :bill_address_id, :ship_address_id
-
+  before_validation :clone_shipping_address, :if => "Spree::Config[:disable_bill_address]"
+  
+  def clone_shipping_address
+    if self.ship_address
+      self.bill_address = self.ship_address
+    end
+    true  
+  end
+  
   def clone_billing_address
     if self.bill_address
       self.ship_address = self.bill_address

data/app/views/checkout/_address.html.erb

@@ -6,11 +6,12 @@
   div#checkout #checkout_form_address #shipping .select_address label { float:none; }
 </style>
 
-<% ['billing', 'shipping'].each do |address_type| %>
-<% address_name = "#{address_type[0...4]}_address" %>
+<% ['billing', 'shipping'].each do |address_type|
+  next if address_type == 'billing' && Spree::Config[:disable_bill_address]
+  address_name = "#{address_type[0...4]}_address" %>
 <fieldset id="<%= address_type %>">
   <legend><%= t(address_type + "_address")%></legend>
-  <% if address_type == 'shipping' %>
+  <% if address_type == 'shipping' && !Spree::Config[:disable_bill_address] %>
     <p class="field checkbox">
       <label for="order_use_billing" id="use_billing">
         <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t("use_billing_address") %>

data/spree_address_book.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_address_book'
-  s.version     = '0.40.0'
+  s.version     = '0.50.0'
   s.summary     = 'Adds address book for users to Spree'
   #s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'
@@ -16,8 +16,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.has_rdoc = true
-
-  s.add_dependency('spree_core', '>= 0.40.0')
-  s.add_dependency('spree_auth', '>= 0.40.0')
+  s.add_dependency('spree_core', '>= 0.50.0')
+  s.add_dependency('spree_auth', '>= 0.50.0')
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 40
+  - 50
   - 0
-  version: 0.40.0
+  version: 0.50.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 +03:00
+date: 2011-04-28 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 40
+        - 50
         - 0
-        version: 0.40.0
+        version: 0.50.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 40
+        - 50
         - 0
-        version: 0.40.0
+        version: 0.50.0
   type: :runtime
   version_requirements: *id002
 description: 
@@ -58,6 +58,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Versionfile
 - app/controllers/addresses_controller.rb
 - app/controllers/checkout_controller_decorator.rb
 - app/models/address_decorator.rb