spree_backend 2.0.0 → 2.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/javascripts/admin/checkouts/edit.js +0 -25
- data/app/assets/javascripts/admin/taxonomy.js.coffee +7 -6
- data/app/controllers/spree/admin/image_settings_controller.rb +1 -3
- data/app/views/spree/admin/orders/_shipment.html.erb +1 -1
- data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +2 -2
- metadata +28 -9
- checksums.yaml +0 -15
@@ -27,31 +27,6 @@ $(document).ready(function() {
|
|
27
27
|
dropdownCssClass: 'customer_search',
|
28
28
|
formatResult: formatCustomerResult,
|
29
29
|
formatSelection: function (customer) {
|
30
|
-
_.each(['bill_address', 'ship_address'], function(address) {
|
31
|
-
var data = customer[address];
|
32
|
-
address_parts = ['firstname', 'lastname',
|
33
|
-
'company', 'address1',
|
34
|
-
'address2', 'city',
|
35
|
-
'zipcode', 'phone']
|
36
|
-
var attribute_wrapper = '#order_' + address + '_attributes_'
|
37
|
-
if(data != undefined) {
|
38
|
-
_.each(address_parts, function(part) {
|
39
|
-
$(attribute_wrapper + part).val(data[part]);
|
40
|
-
})
|
41
|
-
|
42
|
-
$(attribute_wrapper + 'state_id').select2("val", data['state_id']);
|
43
|
-
$(attribute_wrapper + 'country_id').select2("val", data['country_id']);
|
44
|
-
}
|
45
|
-
else {
|
46
|
-
_.each(address_parts, function(part) {
|
47
|
-
$(attribute_wrapper + part).val("");
|
48
|
-
})
|
49
|
-
|
50
|
-
$(attribute_wrapper + 'state_id').select2("val", '');
|
51
|
-
$(attribute_wrapper + 'country_id').select2("val", '');
|
52
|
-
}
|
53
|
-
});
|
54
|
-
|
55
30
|
$('#order_email').val(customer.email);
|
56
31
|
$('#user_id').val(customer.id);
|
57
32
|
$('#guest_checkout_true').prop("checked", false);
|
@@ -51,8 +51,8 @@ handle_rename = (e, data) ->
|
|
51
51
|
error: handle_ajax_error
|
52
52
|
|
53
53
|
handle_delete = (e, data) ->
|
54
|
-
last_rollback = data.
|
55
|
-
node = data.rslt.
|
54
|
+
last_rollback = data.rlbk
|
55
|
+
node = data.rslt.obj
|
56
56
|
delete_url = base_url.clone()
|
57
57
|
delete_url.setPath delete_url.path() + '/' + node.attr("id")
|
58
58
|
jConfirm Spree.translations.are_you_sure_delete, Spree.translations.confirm_delete, (r) ->
|
@@ -70,11 +70,12 @@ handle_delete = (e, data) ->
|
|
70
70
|
root = exports ? this
|
71
71
|
root.setup_taxonomy_tree = (taxonomy_id) ->
|
72
72
|
if taxonomy_id != undefined
|
73
|
+
# this is defined within admin/taxonomies/edit
|
74
|
+
root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
|
75
|
+
|
73
76
|
$.ajax
|
74
|
-
url:
|
77
|
+
url: base_url.path().replace("/taxons", "/jstree"),
|
75
78
|
success: (taxonomy) ->
|
76
|
-
# this is defined within admin/taxonomies/edit
|
77
|
-
root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
|
78
79
|
last_rollback = null
|
79
80
|
|
80
81
|
conf =
|
@@ -82,7 +83,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
|
|
82
83
|
data: taxonomy,
|
83
84
|
ajax:
|
84
85
|
url: (e) ->
|
85
|
-
|
86
|
+
base_url.path() + '/' + e.attr('id') + '/jstree'
|
86
87
|
themes:
|
87
88
|
theme: "apple",
|
88
89
|
url: "/assets/jquery.jstree/themes/apple/style.css"
|
@@ -21,7 +21,6 @@ module Spree
|
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
24
|
-
|
25
24
|
private
|
26
25
|
|
27
26
|
def update_styles(params)
|
@@ -55,7 +54,7 @@ module Spree
|
|
55
54
|
Spree::Image.attachment_definitions[:attachment].delete :storage
|
56
55
|
end
|
57
56
|
|
58
|
-
Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
|
57
|
+
Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
|
59
58
|
Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
|
60
59
|
Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
|
61
60
|
Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
|
@@ -63,4 +62,3 @@ module Spree
|
|
63
62
|
end
|
64
63
|
end
|
65
64
|
end
|
66
|
-
|
@@ -70,7 +70,7 @@
|
|
70
70
|
<div class="field alpha five columns">
|
71
71
|
<%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
|
72
72
|
<%= select_tag :selected_shipping_rate_id,
|
73
|
-
options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
|
73
|
+
options_for_select(shipment.shipping_rates.backend.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
|
74
74
|
{:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
|
75
75
|
</div>
|
76
76
|
|
@@ -10,8 +10,8 @@
|
|
10
10
|
<%= f.text_field :value, :class => 'autocomplete' %>
|
11
11
|
</td>
|
12
12
|
<td class="actions">
|
13
|
-
<%
|
14
|
-
<%=
|
13
|
+
<% if f.object.persisted? %>
|
14
|
+
<%= link_to_delete f.object, :no_text => true %>
|
15
15
|
<% end %>
|
16
16
|
</td>
|
17
17
|
</tr>
|
metadata
CHANGED
@@ -1,46 +1,52 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_backend
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.1
|
5
|
+
prerelease:
|
5
6
|
platform: ruby
|
6
7
|
authors:
|
7
8
|
- Sean Schofield
|
8
9
|
autorequire:
|
9
10
|
bindir: bin
|
10
11
|
cert_chain: []
|
11
|
-
date: 2013-
|
12
|
+
date: 2013-06-04 00:00:00.000000000 Z
|
12
13
|
dependencies:
|
13
14
|
- !ruby/object:Gem::Dependency
|
14
15
|
name: spree_core
|
15
16
|
requirement: !ruby/object:Gem::Requirement
|
17
|
+
none: false
|
16
18
|
requirements:
|
17
19
|
- - '='
|
18
20
|
- !ruby/object:Gem::Version
|
19
|
-
version: 2.0.
|
21
|
+
version: 2.0.1
|
20
22
|
type: :runtime
|
21
23
|
prerelease: false
|
22
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
23
26
|
requirements:
|
24
27
|
- - '='
|
25
28
|
- !ruby/object:Gem::Version
|
26
|
-
version: 2.0.
|
29
|
+
version: 2.0.1
|
27
30
|
- !ruby/object:Gem::Dependency
|
28
31
|
name: spree_api
|
29
32
|
requirement: !ruby/object:Gem::Requirement
|
33
|
+
none: false
|
30
34
|
requirements:
|
31
35
|
- - '='
|
32
36
|
- !ruby/object:Gem::Version
|
33
|
-
version: 2.0.
|
37
|
+
version: 2.0.1
|
34
38
|
type: :runtime
|
35
39
|
prerelease: false
|
36
40
|
version_requirements: !ruby/object:Gem::Requirement
|
41
|
+
none: false
|
37
42
|
requirements:
|
38
43
|
- - '='
|
39
44
|
- !ruby/object:Gem::Version
|
40
|
-
version: 2.0.
|
45
|
+
version: 2.0.1
|
41
46
|
- !ruby/object:Gem::Dependency
|
42
47
|
name: jquery-rails
|
43
48
|
requirement: !ruby/object:Gem::Requirement
|
49
|
+
none: false
|
44
50
|
requirements:
|
45
51
|
- - ~>
|
46
52
|
- !ruby/object:Gem::Version
|
@@ -48,6 +54,7 @@ dependencies:
|
|
48
54
|
type: :runtime
|
49
55
|
prerelease: false
|
50
56
|
version_requirements: !ruby/object:Gem::Requirement
|
57
|
+
none: false
|
51
58
|
requirements:
|
52
59
|
- - ~>
|
53
60
|
- !ruby/object:Gem::Version
|
@@ -55,6 +62,7 @@ dependencies:
|
|
55
62
|
- !ruby/object:Gem::Dependency
|
56
63
|
name: select2-rails
|
57
64
|
requirement: !ruby/object:Gem::Requirement
|
65
|
+
none: false
|
58
66
|
requirements:
|
59
67
|
- - '='
|
60
68
|
- !ruby/object:Gem::Version
|
@@ -62,6 +70,7 @@ dependencies:
|
|
62
70
|
type: :runtime
|
63
71
|
prerelease: false
|
64
72
|
version_requirements: !ruby/object:Gem::Requirement
|
73
|
+
none: false
|
65
74
|
requirements:
|
66
75
|
- - '='
|
67
76
|
- !ruby/object:Gem::Version
|
@@ -69,6 +78,7 @@ dependencies:
|
|
69
78
|
- !ruby/object:Gem::Dependency
|
70
79
|
name: rails
|
71
80
|
requirement: !ruby/object:Gem::Requirement
|
81
|
+
none: false
|
72
82
|
requirements:
|
73
83
|
- - ~>
|
74
84
|
- !ruby/object:Gem::Version
|
@@ -76,6 +86,7 @@ dependencies:
|
|
76
86
|
type: :runtime
|
77
87
|
prerelease: false
|
78
88
|
version_requirements: !ruby/object:Gem::Requirement
|
89
|
+
none: false
|
79
90
|
requirements:
|
80
91
|
- - ~>
|
81
92
|
- !ruby/object:Gem::Version
|
@@ -83,6 +94,7 @@ dependencies:
|
|
83
94
|
- !ruby/object:Gem::Dependency
|
84
95
|
name: deface
|
85
96
|
requirement: !ruby/object:Gem::Requirement
|
97
|
+
none: false
|
86
98
|
requirements:
|
87
99
|
- - ! '>='
|
88
100
|
- !ruby/object:Gem::Version
|
@@ -90,6 +102,7 @@ dependencies:
|
|
90
102
|
type: :runtime
|
91
103
|
prerelease: false
|
92
104
|
version_requirements: !ruby/object:Gem::Requirement
|
105
|
+
none: false
|
93
106
|
requirements:
|
94
107
|
- - ! '>='
|
95
108
|
- !ruby/object:Gem::Version
|
@@ -97,6 +110,7 @@ dependencies:
|
|
97
110
|
- !ruby/object:Gem::Dependency
|
98
111
|
name: email_spec
|
99
112
|
requirement: !ruby/object:Gem::Requirement
|
113
|
+
none: false
|
100
114
|
requirements:
|
101
115
|
- - ~>
|
102
116
|
- !ruby/object:Gem::Version
|
@@ -104,6 +118,7 @@ dependencies:
|
|
104
118
|
type: :development
|
105
119
|
prerelease: false
|
106
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
|
+
none: false
|
107
122
|
requirements:
|
108
123
|
- - ~>
|
109
124
|
- !ruby/object:Gem::Version
|
@@ -484,26 +499,30 @@ files:
|
|
484
499
|
- vendor/assets/stylesheets/responsive-tables.css
|
485
500
|
homepage: http://spreecommerce.com
|
486
501
|
licenses: []
|
487
|
-
metadata: {}
|
488
502
|
post_install_message:
|
489
503
|
rdoc_options: []
|
490
504
|
require_paths:
|
491
505
|
- lib
|
492
506
|
required_ruby_version: !ruby/object:Gem::Requirement
|
507
|
+
none: false
|
493
508
|
requirements:
|
494
509
|
- - ! '>='
|
495
510
|
- !ruby/object:Gem::Version
|
496
511
|
version: 1.9.3
|
497
512
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
513
|
+
none: false
|
498
514
|
requirements:
|
499
515
|
- - ! '>='
|
500
516
|
- !ruby/object:Gem::Version
|
501
517
|
version: '0'
|
518
|
+
segments:
|
519
|
+
- 0
|
520
|
+
hash: 89217670578797386
|
502
521
|
requirements:
|
503
522
|
- none
|
504
523
|
rubyforge_project: spree_backend
|
505
|
-
rubygems_version:
|
524
|
+
rubygems_version: 1.8.25
|
506
525
|
signing_key:
|
507
|
-
specification_version:
|
526
|
+
specification_version: 3
|
508
527
|
summary: backend e-commerce functionality for the Spree project.
|
509
528
|
test_files: []
|
checksums.yaml
DELETED
@@ -1,15 +0,0 @@
|
|
1
|
-
---
|
2
|
-
!binary "U0hBMQ==":
|
3
|
-
metadata.gz: !binary |-
|
4
|
-
ODRlNDA4YmNiMDU0OGZiMDNlNzc5ZTBkZDdkNjk4ZWIwODQ3MDYyMg==
|
5
|
-
data.tar.gz: !binary |-
|
6
|
-
N2MwNDE2ZjQ4ZmZjZDhkYjg0MTFmMDEzM2NkMzA1MmYzYTUzZTQ3ZQ==
|
7
|
-
!binary "U0hBNTEy":
|
8
|
-
metadata.gz: !binary |-
|
9
|
-
OTg2YWYxNzVhMTgwYTM3ZjU0MjJmMzUyODFlZjczYjYwY2QwY2NhZTcxOTA1
|
10
|
-
OTdmMjdiMmNhNDgyODM1ZDZlYjI4NmM0ODNjMjc3ZWZkOTU4NzRhNDkyZDQy
|
11
|
-
YzgzOWEyMmY5OTU0OGVkY2Q3YWRkNzgwNTIwOGQ5NjY0M2ZkMWY=
|
12
|
-
data.tar.gz: !binary |-
|
13
|
-
NjAzMjZlOWIxNjhkNjkwZWI4ZjU1ZDMxYmMzYzQxYjhjZDk0NDc2NTBjY2I5
|
14
|
-
N2VhODg3ZTk3ZjFiMWZhNDU5MDY3OTBlMzdlM2VkNmUwOWZhNWZlMWQzNWUy
|
15
|
-
NzRhNTEwZjM0MzNjOThjZDBiZTY1ZGU3Y2VlNjlmMTljMWQ1ZDI=
|