spree_backend 2.2.0 → 2.2.1

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.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/admin.js.erb +3 -1
  3. data/app/assets/javascripts/spree/backend/checkouts/edit.js +0 -11
  4. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +4 -1
  5. data/app/assets/javascripts/spree/backend/payments/new.js +42 -12
  6. data/app/assets/javascripts/spree/backend/select_payments.js.coffee +7 -0
  7. data/app/assets/javascripts/spree/backend/shipments.js.erb +1 -1
  8. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +2 -2
  9. data/app/assets/stylesheets/spree/backend/sections/_users.scss +5 -0
  10. data/app/assets/stylesheets/spree/backend/spree_admin.scss +1 -0
  11. data/app/controllers/spree/admin/base_controller.rb +2 -0
  12. data/app/controllers/spree/admin/payments_controller.rb +9 -4
  13. data/app/controllers/spree/admin/promotions_controller.rb +18 -0
  14. data/app/controllers/spree/admin/resource_controller.rb +6 -37
  15. data/app/controllers/spree/admin/shipping_methods_controller.rb +1 -1
  16. data/app/controllers/spree/admin/stock_locations_controller.rb +11 -5
  17. data/app/controllers/spree/admin/users_controller.rb +159 -0
  18. data/app/views/spree/admin/orders/_risk_analysis.html.erb +1 -1
  19. data/app/views/spree/admin/orders/_shipment.html.erb +1 -1
  20. data/app/views/spree/admin/payments/_form.html.erb +11 -5
  21. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +20 -18
  22. data/app/views/spree/admin/promotions/index.html.erb +42 -0
  23. data/app/views/spree/admin/shared/_destroy.js.erb +0 -1
  24. data/app/views/spree/admin/shared/_tabs.html.erb +3 -0
  25. data/app/views/spree/admin/shared/_translations.html.erb +5 -0
  26. data/app/views/spree/admin/users/_addresses_form.html.erb +19 -0
  27. data/app/views/spree/admin/users/_form.html.erb +37 -0
  28. data/app/views/spree/admin/users/_sidebar.html.erb +36 -0
  29. data/app/views/spree/admin/users/_user_page_actions.html.erb +5 -0
  30. data/app/views/spree/admin/users/addresses.html.erb +24 -0
  31. data/app/views/spree/admin/users/edit.html.erb +55 -0
  32. data/app/views/spree/admin/users/index.html.erb +53 -0
  33. data/app/views/spree/admin/users/items.html.erb +74 -0
  34. data/app/views/spree/admin/users/new.html.erb +23 -0
  35. data/app/views/spree/admin/users/orders.html.erb +57 -0
  36. data/app/views/spree/admin/variants/_split.js.erb +3 -3
  37. data/config/routes.rb +11 -0
  38. data/lib/spree/backend/action_callbacks.rb +1 -1
  39. data/lib/spree/backend/callbacks.rb +47 -0
  40. data/lib/spree/backend/engine.rb +2 -0
  41. data/lib/spree/backend.rb +2 -0
  42. metadata +21 -7
data/lib/spree/backend/engine.rb CHANGED
@@ -21,6 +21,8 @@ module Spree
21
21
  jqPlot/excanvas.min.js
22
22
  spree/backend/images/new.js
23
23
  jquery.jstree/themes/apple/*
24
+ fontawesome-webfont*
25
+ select2_locale*
24
26
  ]
25
27
  end
26
28
  end
data/lib/spree/backend.rb CHANGED
@@ -12,4 +12,6 @@ require 'spree/core/mail_interceptor'
12
12
 
13
13
  require 'spree/responder'
14
14
 
15
+ require 'spree/backend/action_callbacks'
16
+ require 'spree/backend/callbacks'
15
17
  require 'spree/backend/engine'
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.2.0
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-26 00:00:00.000000000 Z
11
+ date: 2014-03-25 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.2.0
19
+ version: 2.2.1
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.2.0
26
+ version: 2.2.1
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.2.0
33
+ version: 2.2.1
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.2.0
40
+ version: 2.2.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -124,6 +124,7 @@ files:
124
124
  - app/assets/javascripts/spree/backend/product_picker.js
125
125
  - app/assets/javascripts/spree/backend/progress.coffee
126
126
  - app/assets/javascripts/spree/backend/promotions.js
127
+ - app/assets/javascripts/spree/backend/select_payments.js.coffee
127
128
  - app/assets/javascripts/spree/backend/shipments.js.erb
128
129
  - app/assets/javascripts/spree/backend/spree-select2.js.erb
129
130
  - app/assets/javascripts/spree/backend/spree_backend.js
@@ -174,6 +175,7 @@ files:
174
175
  - app/assets/stylesheets/spree/backend/sections/_promotions.scss
175
176
  - app/assets/stylesheets/spree/backend/sections/_tax_zones.scss
176
177
  - app/assets/stylesheets/spree/backend/sections/_taxons.scss
178
+ - app/assets/stylesheets/spree/backend/sections/_users.scss
177
179
  - app/assets/stylesheets/spree/backend/shared/_forms.scss
178
180
  - app/assets/stylesheets/spree/backend/shared/_icons.scss
179
181
  - app/assets/stylesheets/spree/backend/shared/_layout.scss
@@ -222,6 +224,7 @@ files:
222
224
  - app/controllers/spree/admin/taxonomies_controller.rb
223
225
  - app/controllers/spree/admin/taxons_controller.rb
224
226
  - app/controllers/spree/admin/trackers_controller.rb
227
+ - app/controllers/spree/admin/users_controller.rb
225
228
  - app/controllers/spree/admin/variants_controller.rb
226
229
  - app/controllers/spree/admin/variants_including_master_controller.rb
227
230
  - app/controllers/spree/admin/zones_controller.rb
@@ -433,6 +436,16 @@ files:
433
436
  - app/views/spree/admin/trackers/edit.html.erb
434
437
  - app/views/spree/admin/trackers/index.html.erb
435
438
  - app/views/spree/admin/trackers/new.html.erb
439
+ - app/views/spree/admin/users/_addresses_form.html.erb
440
+ - app/views/spree/admin/users/_form.html.erb
441
+ - app/views/spree/admin/users/_sidebar.html.erb
442
+ - app/views/spree/admin/users/_user_page_actions.html.erb
443
+ - app/views/spree/admin/users/addresses.html.erb
444
+ - app/views/spree/admin/users/edit.html.erb
445
+ - app/views/spree/admin/users/index.html.erb
446
+ - app/views/spree/admin/users/items.html.erb
447
+ - app/views/spree/admin/users/new.html.erb
448
+ - app/views/spree/admin/users/orders.html.erb
436
449
  - app/views/spree/admin/variants/_autocomplete.js.erb
437
450
  - app/views/spree/admin/variants/_autocomplete_stock.js.erb
438
451
  - app/views/spree/admin/variants/_form.html.erb
@@ -454,6 +467,7 @@ files:
454
467
  - config/routes.rb
455
468
  - lib/spree/backend.rb
456
469
  - lib/spree/backend/action_callbacks.rb
470
+ - lib/spree/backend/callbacks.rb
457
471
  - lib/spree/backend/engine.rb
458
472
  - lib/spree_backend.rb
459
473
  - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
@@ -517,7 +531,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
517
531
  requirements:
518
532
  - none
519
533
  rubyforge_project: spree_backend
520
- rubygems_version: 2.2.0
534
+ rubygems_version: 2.2.2
521
535
  signing_key:
522
536
  specification_version: 4
523
537
  summary: backend e-commerce functionality for the Spree project.