spree_backend 2.4.6 → 2.4.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend/product_picker.js +2 -1
- data/app/assets/javascripts/spree/backend/taxons.js.coffee +1 -0
- data/app/controllers/spree/admin/orders_controller.rb +1 -0
- data/app/views/spree/admin/orders/index.html.erb +1 -1
- metadata +6 -7
- data/app/assets/javascripts/spree/backend/index.html +0 -15
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fcbd551866127def2ce22052598f7fcf370413aa
|
|
4
|
+
data.tar.gz: 3369fa4fd61ff70cd119fe77f8ea9a7bcfda2d8d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 19202bbc2305e285572cfb55d5bff615abc5654e00d345c33a4529833a2e53a8830a5ab04522736c91cabfa144c5dee6b3cb41493e8206fc7b89ade1eba6757f
|
|
7
|
+
data.tar.gz: 776d88e54e47aabd84fb6380a5e12de5221cbbfc15851025df7715b69d220bc1271b3166ac82960c7d845e229b30d3b031840081e90c7ac1b67d64f2668699bf
|
|
@@ -6,7 +6,8 @@ $.fn.productAutocomplete = function () {
|
|
|
6
6
|
multiple: true,
|
|
7
7
|
initSelection: function (element, callback) {
|
|
8
8
|
$.get(Spree.routes.product_search, {
|
|
9
|
-
ids: element.val().split(',')
|
|
9
|
+
ids: element.val().split(','),
|
|
10
|
+
token: Spree.api_key
|
|
10
11
|
}, function (data) {
|
|
11
12
|
callback(data.products);
|
|
12
13
|
});
|
|
@@ -11,6 +11,7 @@ module Spree
|
|
|
11
11
|
params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
|
|
12
12
|
@show_only_completed = params[:q][:completed_at_not_null] == '1'
|
|
13
13
|
params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
|
|
14
|
+
params[:q][:completed_at_not_null] = '' unless @show_only_completed
|
|
14
15
|
|
|
15
16
|
# As date params are deleted if @show_only_completed, store
|
|
16
17
|
# the original date so we can restore them into the params
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
|
|
54
54
|
<div class="field">
|
|
55
55
|
<%= label_tag :q_line_items_variant_id_in, Spree.t(:sku) %>
|
|
56
|
-
<%= f.select :line_items_variant_id_in, Spree::Variant.pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
|
|
56
|
+
<%= f.select :line_items_variant_id_in, Spree::Variant.having_orders.order(:sku).pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
|
|
57
57
|
</div>
|
|
58
58
|
</div>
|
|
59
59
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_backend
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.4.
|
|
4
|
+
version: 2.4.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Schofield
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-05-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: spree_api
|
|
@@ -16,28 +16,28 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 2.4.
|
|
19
|
+
version: 2.4.7
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - '='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 2.4.
|
|
26
|
+
version: 2.4.7
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: spree_core
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - '='
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 2.4.
|
|
33
|
+
version: 2.4.7
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - '='
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 2.4.
|
|
40
|
+
version: 2.4.7
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: jquery-rails
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -100,7 +100,6 @@ files:
|
|
|
100
100
|
- app/assets/javascripts/spree/backend/handlebar_extensions.js
|
|
101
101
|
- app/assets/javascripts/spree/backend/images/index.js.coffee
|
|
102
102
|
- app/assets/javascripts/spree/backend/images/new.js.coffee
|
|
103
|
-
- app/assets/javascripts/spree/backend/index.html
|
|
104
103
|
- app/assets/javascripts/spree/backend/line_items.js.coffee
|
|
105
104
|
- app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb
|
|
106
105
|
- app/assets/javascripts/spree/backend/nested-attribute.js
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
<!DOCTYPE html>
|
|
2
|
-
<html>
|
|
3
|
-
<head>
|
|
4
|
-
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
|
5
|
-
<style type="text/css">
|
|
6
|
-
html { height: 100% }
|
|
7
|
-
body { height: 100%; margin: 0; padding: 0 }
|
|
8
|
-
#map-canvas { height: 100% }
|
|
9
|
-
</style>
|
|
10
|
-
|
|
11
|
-
</head>
|
|
12
|
-
<body>
|
|
13
|
-
<div id="map-canvas"/>
|
|
14
|
-
</body>
|
|
15
|
-
</html>
|