spree_backend 3.0.1 → 3.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +4 -4
- data/app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee +4 -4
- data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +6 -4
- data/app/assets/javascripts/spree/backend/taxons.js.coffee +12 -6
- data/app/assets/stylesheets/spree/backend/components/_main.scss +2 -1
- data/app/controllers/spree/admin/customer_returns_controller.rb +1 -1
- data/app/controllers/spree/admin/orders_controller.rb +1 -1
- data/app/controllers/spree/admin/products_controller.rb +6 -3
- data/app/controllers/spree/admin/search_controller.rb +3 -1
- data/app/controllers/spree/admin/taxonomies_controller.rb +0 -6
- data/app/helpers/spree/admin/base_helper.rb +2 -2
- data/app/views/spree/admin/adjustments/edit.html.erb +1 -1
- data/app/views/spree/admin/adjustments/index.html.erb +3 -3
- data/app/views/spree/admin/adjustments/new.html.erb +5 -5
- data/app/views/spree/admin/customer_returns/edit.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/index.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/new.html.erb +4 -16
- data/app/views/spree/admin/images/edit.html.erb +5 -5
- data/app/views/spree/admin/images/index.html.erb +1 -1
- data/app/views/spree/admin/log_entries/index.html.erb +2 -2
- data/app/views/spree/admin/option_types/edit.html.erb +2 -2
- data/app/views/spree/admin/orders/_add_line_item.html.erb +1 -1
- data/app/views/spree/admin/orders/_add_product.html.erb +1 -1
- data/app/views/spree/admin/orders/cart.html.erb +5 -5
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/edit.html.erb +1 -1
- data/app/views/spree/admin/payments/credit.html.erb +1 -1
- data/app/views/spree/admin/payments/index.html.erb +1 -1
- data/app/views/spree/admin/payments/new.html.erb +4 -4
- data/app/views/spree/admin/payments/show.html.erb +6 -6
- data/app/views/spree/admin/product_properties/index.html.erb +6 -6
- data/app/views/spree/admin/products/_add_stock_form.html.erb +0 -2
- data/app/views/spree/admin/products/_form.html.erb +30 -21
- data/app/views/spree/admin/products/edit.html.erb +6 -6
- data/app/views/spree/admin/products/stock.html.erb +2 -2
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +1 -1
- data/app/views/spree/admin/refunds/edit.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +2 -2
- data/app/views/spree/admin/reimbursements/edit.html.erb +3 -3
- data/app/views/spree/admin/reimbursements/index.html.erb +2 -2
- data/app/views/spree/admin/reimbursements/show.html.erb +2 -2
- data/app/views/spree/admin/return_authorizations/_form.html.erb +2 -2
- data/app/views/spree/admin/return_authorizations/edit.html.erb +5 -5
- data/app/views/spree/admin/return_authorizations/index.html.erb +4 -4
- data/app/views/spree/admin/return_authorizations/new.html.erb +4 -4
- data/app/views/spree/admin/shared/_order_tabs.html.erb +9 -9
- data/app/views/spree/admin/shared/_product_tabs.html.erb +5 -5
- data/app/views/spree/admin/shared/_table_filter.html.erb +1 -1
- data/app/views/spree/admin/shared/_translations.html.erb +2 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +17 -13
- data/app/views/spree/admin/state_changes/index.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/edit.erb +8 -4
- data/app/views/spree/admin/taxons/edit.html.erb +2 -2
- data/app/views/spree/admin/users/addresses.html.erb +5 -5
- data/app/views/spree/admin/users/edit.html.erb +14 -14
- data/app/views/spree/admin/users/items.html.erb +7 -7
- data/app/views/spree/admin/users/orders.html.erb +6 -6
- data/app/views/spree/admin/variants/_autocomplete.js.erb +5 -7
- data/app/views/spree/admin/variants/edit.html.erb +4 -4
- data/app/views/spree/admin/variants/index.html.erb +5 -5
- data/config/routes.rb +1 -4
- data/lib/spree/backend/engine.rb +1 -1
- data/vendor/assets/stylesheets/jquery.jstree/themes/spree/style.scss +216 -0
- data/vendor/assets/{javascripts/jquery.jstree/themes/apple → stylesheets/jquery.jstree/themes/spree}/throbber.gif +0 -0
- metadata +8 -13
- data/app/assets/javascripts/spree/backend/select_payments.js.coffee +0 -7
- data/app/views/spree/admin/shared/_report_criteria.html.erb +0 -17
- data/vendor/assets/javascripts/jquery.jstree/themes/apple/bg.jpg +0 -0
- data/vendor/assets/javascripts/jquery.jstree/themes/apple/d.png +0 -0
- data/vendor/assets/javascripts/jquery.jstree/themes/apple/dot_for_ie.gif +0 -0
- data/vendor/assets/javascripts/jquery.jstree/themes/apple/style.scss +0 -61
|
File without changes
|
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: 3.0.
|
|
4
|
+
version: 3.0.2
|
|
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-07-20 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: 3.0.
|
|
19
|
+
version: 3.0.2
|
|
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: 3.0.
|
|
26
|
+
version: 3.0.2
|
|
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: 3.0.
|
|
33
|
+
version: 3.0.2
|
|
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: 3.0.
|
|
40
|
+
version: 3.0.2
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: bootstrap-sass
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -140,7 +140,6 @@ files:
|
|
|
140
140
|
- app/assets/javascripts/spree/backend/promotions.js
|
|
141
141
|
- app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee
|
|
142
142
|
- app/assets/javascripts/spree/backend/returns/return_item_selection.js
|
|
143
|
-
- app/assets/javascripts/spree/backend/select_payments.js.coffee
|
|
144
143
|
- app/assets/javascripts/spree/backend/shipments.js.erb
|
|
145
144
|
- app/assets/javascripts/spree/backend/spree-select2.js
|
|
146
145
|
- app/assets/javascripts/spree/backend/states.js
|
|
@@ -405,7 +404,6 @@ files:
|
|
|
405
404
|
- app/views/spree/admin/shared/_order_tabs.html.erb
|
|
406
405
|
- app/views/spree/admin/shared/_product_tabs.html.erb
|
|
407
406
|
- app/views/spree/admin/shared/_refunds.html.erb
|
|
408
|
-
- app/views/spree/admin/shared/_report_criteria.html.erb
|
|
409
407
|
- app/views/spree/admin/shared/_report_order_criteria.html.erb
|
|
410
408
|
- app/views/spree/admin/shared/_sidebar.html.erb
|
|
411
409
|
- app/views/spree/admin/shared/_table_filter.html.erb
|
|
@@ -522,17 +520,14 @@ files:
|
|
|
522
520
|
- vendor/assets/javascripts/handlebars.js
|
|
523
521
|
- vendor/assets/javascripts/jquery.cookie.js
|
|
524
522
|
- vendor/assets/javascripts/jquery.jstree/jquery.jstree.js
|
|
525
|
-
- vendor/assets/javascripts/jquery.jstree/themes/apple/bg.jpg
|
|
526
|
-
- vendor/assets/javascripts/jquery.jstree/themes/apple/d.png
|
|
527
|
-
- vendor/assets/javascripts/jquery.jstree/themes/apple/dot_for_ie.gif
|
|
528
|
-
- vendor/assets/javascripts/jquery.jstree/themes/apple/style.scss
|
|
529
|
-
- vendor/assets/javascripts/jquery.jstree/themes/apple/throbber.gif
|
|
530
523
|
- vendor/assets/javascripts/modernizr.js
|
|
531
524
|
- vendor/assets/javascripts/underscore-min.js
|
|
532
525
|
- vendor/assets/javascripts/underscore-min.map
|
|
533
526
|
- vendor/assets/javascripts/velocity.js
|
|
534
527
|
- vendor/assets/stylesheets/animate.css
|
|
535
528
|
- vendor/assets/stylesheets/jquery-ui.datepicker.css.erb
|
|
529
|
+
- vendor/assets/stylesheets/jquery.jstree/themes/spree/style.scss
|
|
530
|
+
- vendor/assets/stylesheets/jquery.jstree/themes/spree/throbber.gif
|
|
536
531
|
homepage: https://spreecommerce.com
|
|
537
532
|
licenses:
|
|
538
533
|
- BSD-3
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
$ ->
|
|
2
|
-
if $('.new_payment').is('*')
|
|
3
|
-
$('.payment-method-settings fieldset').addClass('hidden').first().removeClass('hidden')
|
|
4
|
-
$('input[name="payment[payment_method_id]"]').click ()->
|
|
5
|
-
$('.payment-method-settings fieldset').addClass('hidden')
|
|
6
|
-
id = $(this).parents('div.radio').data('id')
|
|
7
|
-
$("fieldset[data-id='#{id}']").removeClass('hidden')
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
<%= search_form_for @search, :url => spree.sales_total_admin_reports_path do |s| %>
|
|
2
|
-
<div class="date-range-filter field ">
|
|
3
|
-
<%= label_tag nil, Spree.t(:start), :class => 'inline' %>
|
|
4
|
-
<%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
|
|
5
|
-
|
|
6
|
-
<span class="range-divider">
|
|
7
|
-
/
|
|
8
|
-
</span>
|
|
9
|
-
|
|
10
|
-
<%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
|
|
11
|
-
<%= label_tag nil, Spree.t(:end), :class => 'inline' %>
|
|
12
|
-
</div>
|
|
13
|
-
|
|
14
|
-
<div class="form-actions">
|
|
15
|
-
<%= button Spree.t(:search), 'search' %>
|
|
16
|
-
</div>
|
|
17
|
-
<% end %>
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* jsTree apple theme 1.0
|
|
3
|
-
* Supported features: dots/no-dots, icons/no-icons, focused, loading
|
|
4
|
-
* Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
|
|
5
|
-
*/
|
|
6
|
-
|
|
7
|
-
.jstree-apple > ul { background:image-url("jquery.jstree/themes/apple/bg.jpg") left top repeat; }
|
|
8
|
-
.jstree-apple li,
|
|
9
|
-
.jstree-apple ins { background-image:image-url("jquery.jstree/themes/apple/d.png"); background-repeat:no-repeat; background-color:transparent; }
|
|
10
|
-
.jstree-apple li { background-position:-90px 0; background-repeat:repeat-y; }
|
|
11
|
-
.jstree-apple li.jstree-last { background:transparent; }
|
|
12
|
-
.jstree-apple .jstree-open > ins { background-position:-72px 0; }
|
|
13
|
-
.jstree-apple .jstree-closed > ins { background-position:-54px 0; }
|
|
14
|
-
.jstree-apple .jstree-leaf > ins { background-position:-36px 0; }
|
|
15
|
-
|
|
16
|
-
.jstree-apple a { border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }
|
|
17
|
-
.jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }
|
|
18
|
-
.jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }
|
|
19
|
-
.jstree-apple a .jstree-icon { background-position:-56px -20px; }
|
|
20
|
-
.jstree-apple a.jstree-loading .jstree-icon { background:image-url("jquery.jstree/themes/apple/throbber.gif") center center no-repeat !important; }
|
|
21
|
-
|
|
22
|
-
.jstree-apple.jstree-focused { background:white; }
|
|
23
|
-
|
|
24
|
-
.jstree-apple .jstree-no-dots li,
|
|
25
|
-
.jstree-apple .jstree-no-dots .jstree-leaf > ins { background:transparent; }
|
|
26
|
-
.jstree-apple .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
|
|
27
|
-
.jstree-apple .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
|
|
28
|
-
|
|
29
|
-
.jstree-apple .jstree-no-icons a .jstree-icon { display:none; }
|
|
30
|
-
|
|
31
|
-
.jstree-apple .jstree-search { font-style:italic; }
|
|
32
|
-
|
|
33
|
-
.jstree-apple .jstree-no-icons .jstree-checkbox { display:inline-block; }
|
|
34
|
-
.jstree-apple .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
|
|
35
|
-
.jstree-apple .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
|
|
36
|
-
.jstree-apple .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
|
|
37
|
-
.jstree-apple .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
|
|
38
|
-
.jstree-apple .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
|
|
39
|
-
.jstree-apple .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
|
|
40
|
-
.jstree-apple .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
|
|
41
|
-
|
|
42
|
-
#vakata-dragged.jstree-apple ins { background:transparent !important; }
|
|
43
|
-
/*#vakata-dragged.jstree-apple .jstree-ok { background:image-url("jquery.jstree/themes/apple/d.png") -2px -53px no-repeat !important; }*/
|
|
44
|
-
/*#vakata-dragged.jstree-apple .jstree-invalid { background:image-url("jquery.jstree/themes/apple/d.png") -18px -53px no-repeat !important; }*/
|
|
45
|
-
/*#jstree-marker.jstree-apple { background:image-url("jquery.jstree/themes/apple/d.png") -41px -57px no-repeat !important; text-indent:-100px; }*/
|
|
46
|
-
|
|
47
|
-
.jstree-apple a.jstree-search { color:aqua; }
|
|
48
|
-
.jstree-apple .jstree-locked a { color:silver; cursor:default; }
|
|
49
|
-
|
|
50
|
-
#vakata-contextmenu.jstree-apple-context,
|
|
51
|
-
#vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
|
|
52
|
-
#vakata-contextmenu.jstree-apple-context li { }
|
|
53
|
-
#vakata-contextmenu.jstree-apple-context a { color:black; }
|
|
54
|
-
#vakata-contextmenu.jstree-apple-context a:hover,
|
|
55
|
-
#vakata-contextmenu.jstree-apple-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -webkit-border-radius:2px; border-radius:2px; }
|
|
56
|
-
#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a,
|
|
57
|
-
#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
|
|
58
|
-
#vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
|
|
59
|
-
#vakata-contextmenu.jstree-apple-context li ul { margin-left:-4px; }
|
|
60
|
-
|
|
61
|
-
/* TODO: IE6 support - the `>` selectors */
|