spree_address_book 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,4 +1,5 @@
1
1
  class Spree::AddressesController < Spree::BaseController
2
+ helper Spree::AddressesHelper
2
3
  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
3
4
  load_and_authorize_resource
4
5
 
@@ -1,4 +1,6 @@
1
1
  Spree::CheckoutController.class_eval do
2
+ helper Spree::AddressesHelper
3
+
2
4
  after_filter :normalize_addresses, :only => :update
3
5
  before_filter :set_addresses, :only => :update
4
6
 
@@ -20,7 +22,7 @@ Spree::CheckoutController.class_eval do
20
22
  end
21
23
 
22
24
  end
23
-
25
+
24
26
  def normalize_addresses
25
27
  return unless params[:state] == "address" && @order.bill_address_id && @order.ship_address_id
26
28
  @order.bill_address.reload
@@ -1,4 +1,4 @@
1
- Spree::CheckoutHelper.module_eval do
1
+ module Spree::AddressesHelper
2
2
  def address_field(form, method, id_prefix = "b", &handler)
3
3
  content_tag :p, :id => [id_prefix, method].join('_'), :class => "field" do
4
4
  if handler
@@ -13,21 +13,20 @@
13
13
  </label>
14
14
  </p>
15
15
  <% end %>
16
- <div class="select_address">
17
- <p class="field">
18
- <% if @addresses.present? %>
16
+ <% if @addresses.present? %>
17
+ <div class="select_address">
18
+ <p class="field">
19
19
  <% @addresses.each_with_index do |address, idx| %>
20
20
  <span id="<%= [address_type, dom_id(address)].join('_') %>">
21
21
  <label><%= form.radio_button "#{address_name}_id", address.id, :checked => (idx == 0) %> <%= address %></label> <%= link_to t(:edit), edit_address_path(address) %><br />
22
22
  </span>
23
23
  <% end %>
24
24
  <label><%= form.radio_button "#{address_name}_id", 0 %> <%= t('other_address') %></label>
25
- <% end %>
26
- </p>
27
- </div>
25
+ </p>
26
+ </div>
27
+ <% end %>
28
28
  <%= form.fields_for address_name do |address_form| %>
29
29
  <div class="inner">
30
- <p class="field">&nbsp;</p>
31
30
  <%= render :partial => 'spree/addresses/form', :locals => {
32
31
  :address_name => address_name,
33
32
  :address_form => address_form,
@@ -13,7 +13,7 @@ module Spree
13
13
 
14
14
  def self.activate
15
15
  Dir.glob(File.join(File.dirname(__FILE__), "../app/**/spree/*_decorator*.rb")) do |c|
16
- Rails.env.production? ? require(c) : load(c)
16
+ Rails.application.config.cache_classes ? require(c) : load(c)
17
17
  end
18
18
  Spree::Ability.register_ability(Spree::AddressAbility)
19
19
  end
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.platform = Gem::Platform::RUBY
3
3
  s.name = 'spree_address_book'
4
- s.version = '1.0.1'
4
+ s.version = '1.0.2'
5
5
  s.summary = 'Adds address book for users to Spree'
6
6
  #s.description = 'Add (optional) gem description here'
7
7
  s.required_ruby_version = '>= 1.8.7'
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_address_book
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 19
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 1
10
- version: 1.0.1
9
+ - 2
10
+ version: 1.0.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Roman Smirnov
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-06-16 00:00:00 Z
18
+ date: 2012-07-03 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: spree_core
@@ -128,7 +128,7 @@ files:
128
128
  - app/assets/stylesheets/store/spree_address_book.scss
129
129
  - app/controllers/spree/addresses_controller.rb
130
130
  - app/controllers/spree/checkout_controller_decorator.rb
131
- - app/helpers/spree/checkout_helper_decorator.rb
131
+ - app/helpers/spree/addresses_helper.rb
132
132
  - app/models/spree/address_ability.rb
133
133
  - app/models/spree/address_book_configuration.rb
134
134
  - app/models/spree/address_decorator.rb