spree_address_book 0.50.2 → 0.60.0
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/addresses_controller.rb +1 -0
- data/app/controllers/checkout_controller_decorator.rb +5 -0
- data/app/helpers/{checkout_helper_decorator.rb → addresses_helper.rb} +1 -1
- data/app/views/addresses/edit.html.erb +1 -1
- data/app/views/checkout/_address.html.erb +7 -8
- data/spree_address_book.gemspec +1 -1
- metadata +16 -9
@@ -1,4 +1,6 @@
|
|
1
1
|
CheckoutController.class_eval do
|
2
|
+
helper AddressesHelper
|
3
|
+
|
2
4
|
after_filter :normalize_addresses, :only => :update
|
3
5
|
before_filter :set_addresses, :only => :update
|
4
6
|
|
@@ -24,6 +26,9 @@ CheckoutController.class_eval do
|
|
24
26
|
return unless params[:state] == "address" && @order.bill_address_id && @order.ship_address_id
|
25
27
|
@order.bill_address.reload
|
26
28
|
@order.ship_address.reload
|
29
|
+
# ensure that there is no validation errors and addresses was saved
|
30
|
+
return unless @order.bill_address && @order.ship_address
|
31
|
+
|
27
32
|
if @order.bill_address_id != @order.ship_address_id && @order.bill_address.same_as?(@order.ship_address)
|
28
33
|
@order.bill_address.destroy
|
29
34
|
@order.update_attribute(:bill_address_id, @order.ship_address.id)
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<style>
|
2
2
|
form p.field input[type=text], form p.field select { width: 80%; float: none; }
|
3
3
|
.hidden { display: none; }
|
4
|
-
div.inner label { width:
|
4
|
+
div.inner label { width: auto; padding-right: 5px; display: inline-block; }
|
5
5
|
form p.field span.req { float: none; }
|
6
6
|
</style>
|
7
7
|
<%= form_for @address do |f| %>
|
@@ -20,18 +20,17 @@
|
|
20
20
|
</label>
|
21
21
|
</p>
|
22
22
|
<% end %>
|
23
|
-
<div class="select_address"
|
24
|
-
<
|
23
|
+
<div class="select_address">
|
24
|
+
<p class="field">
|
25
25
|
<% if @addresses.present? %>
|
26
26
|
<% @addresses.each_with_index do |address, idx| %>
|
27
|
-
|
28
|
-
|
29
|
-
|
27
|
+
<span id="<%= [address_type, dom_id(address)].join('_') %>">
|
28
|
+
<label><%= form.radio_button "#{address_name}_id", address.id, :checked => (idx == 0) %> <%= address %></label> <%= link_to t(:edit), edit_address_path(address) %><br />
|
29
|
+
</span>
|
30
30
|
<% end %>
|
31
|
-
|
32
|
-
<%= form.label ["#{address_name}_id", 0], t('other_address') %>
|
31
|
+
<label><%= form.radio_button "#{address_name}_id", 0 %> <%= t('other_address') %></label>
|
33
32
|
<% end %>
|
34
|
-
</
|
33
|
+
</p>
|
35
34
|
</div>
|
36
35
|
<%= form.fields_for address_name do |address_form| %>
|
37
36
|
<div class="inner">
|
data/spree_address_book.gemspec
CHANGED
@@ -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 = '0.
|
4
|
+
s.version = '0.60.0'
|
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,12 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_address_book
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
4
|
+
hash: 239
|
5
|
+
prerelease:
|
5
6
|
segments:
|
6
7
|
- 0
|
7
|
-
-
|
8
|
-
-
|
9
|
-
version: 0.
|
8
|
+
- 60
|
9
|
+
- 0
|
10
|
+
version: 0.60.0
|
10
11
|
platform: ruby
|
11
12
|
authors:
|
12
13
|
- Roman Smirnov
|
@@ -14,16 +15,17 @@ autorequire:
|
|
14
15
|
bindir: bin
|
15
16
|
cert_chain: []
|
16
17
|
|
17
|
-
date:
|
18
|
-
default_executable:
|
18
|
+
date: 2012-07-03 00:00:00 Z
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|
21
21
|
name: spree_core
|
22
22
|
prerelease: false
|
23
23
|
requirement: &id001 !ruby/object:Gem::Requirement
|
24
|
+
none: false
|
24
25
|
requirements:
|
25
26
|
- - ">="
|
26
27
|
- !ruby/object:Gem::Version
|
28
|
+
hash: 215
|
27
29
|
segments:
|
28
30
|
- 0
|
29
31
|
- 50
|
@@ -35,9 +37,11 @@ dependencies:
|
|
35
37
|
name: spree_auth
|
36
38
|
prerelease: false
|
37
39
|
requirement: &id002 !ruby/object:Gem::Requirement
|
40
|
+
none: false
|
38
41
|
requirements:
|
39
42
|
- - ">="
|
40
43
|
- !ruby/object:Gem::Version
|
44
|
+
hash: 215
|
41
45
|
segments:
|
42
46
|
- 0
|
43
47
|
- 50
|
@@ -61,7 +65,7 @@ files:
|
|
61
65
|
- Versionfile
|
62
66
|
- app/controllers/addresses_controller.rb
|
63
67
|
- app/controllers/checkout_controller_decorator.rb
|
64
|
-
- app/helpers/
|
68
|
+
- app/helpers/addresses_helper.rb
|
65
69
|
- app/models/address_decorator.rb
|
66
70
|
- app/models/order_decorator.rb
|
67
71
|
- app/models/user_decorator.rb
|
@@ -88,7 +92,6 @@ files:
|
|
88
92
|
- spec/models/address_spec.rb
|
89
93
|
- spec/spec_helper.rb
|
90
94
|
- spree_address_book.gemspec
|
91
|
-
has_rdoc: true
|
92
95
|
homepage: http://github.com/romul/spree_address_book
|
93
96
|
licenses: []
|
94
97
|
|
@@ -98,25 +101,29 @@ rdoc_options: []
|
|
98
101
|
require_paths:
|
99
102
|
- lib
|
100
103
|
required_ruby_version: !ruby/object:Gem::Requirement
|
104
|
+
none: false
|
101
105
|
requirements:
|
102
106
|
- - ">="
|
103
107
|
- !ruby/object:Gem::Version
|
108
|
+
hash: 57
|
104
109
|
segments:
|
105
110
|
- 1
|
106
111
|
- 8
|
107
112
|
- 7
|
108
113
|
version: 1.8.7
|
109
114
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
115
|
+
none: false
|
110
116
|
requirements:
|
111
117
|
- - ">="
|
112
118
|
- !ruby/object:Gem::Version
|
119
|
+
hash: 3
|
113
120
|
segments:
|
114
121
|
- 0
|
115
122
|
version: "0"
|
116
123
|
requirements:
|
117
124
|
- none
|
118
125
|
rubyforge_project:
|
119
|
-
rubygems_version: 1.
|
126
|
+
rubygems_version: 1.8.24
|
120
127
|
signing_key:
|
121
128
|
specification_version: 3
|
122
129
|
summary: Adds address book for users to Spree
|