spree_backend 2.1.3 → 2.1.4

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 (51) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/admin/admin.js.erb +10 -9
  3. data/app/assets/javascripts/admin/line_items.js.coffee +61 -0
  4. data/app/assets/javascripts/admin/payments/edit.js.coffee +1 -1
  5. data/app/assets/javascripts/admin/product_picker.js +2 -1
  6. data/app/assets/javascripts/admin/progress.coffee +2 -2
  7. data/app/assets/javascripts/admin/shipments.js.erb +242 -0
  8. data/app/assets/javascripts/admin/variant_autocomplete.js.erb +0 -244
  9. data/app/assets/javascripts/admin/variant_management.js.coffee +10 -0
  10. data/app/assets/stylesheets/admin/sections/_log_entries.scss +17 -0
  11. data/app/assets/stylesheets/admin/spree_admin.scss +1 -0
  12. data/app/assets/stylesheets/admin/spree_backend.css +1 -1
  13. data/app/controllers/spree/admin/images_controller.rb +1 -1
  14. data/app/controllers/spree/admin/log_entries_controller.rb +19 -0
  15. data/app/controllers/spree/admin/mail_methods_controller.rb +1 -8
  16. data/app/controllers/spree/admin/orders/customer_details_controller.rb +4 -0
  17. data/app/controllers/spree/admin/orders_controller.rb +9 -14
  18. data/app/controllers/spree/admin/payments_controller.rb +4 -0
  19. data/app/controllers/spree/admin/products_controller.rb +7 -11
  20. data/app/controllers/spree/admin/reports_controller.rb +20 -4
  21. data/app/controllers/spree/admin/resource_controller.rb +6 -3
  22. data/app/controllers/spree/admin/taxons_controller.rb +1 -2
  23. data/app/controllers/spree/admin/variants_including_master_controller.rb +15 -0
  24. data/app/helpers/spree/admin/base_helper.rb +1 -1
  25. data/app/helpers/spree/admin/navigation_helper.rb +5 -2
  26. data/app/helpers/spree/admin/orders_helper.rb +42 -0
  27. data/app/helpers/spree/admin/stock_movements_helper.rb +5 -1
  28. data/app/views/spree/admin/log_entries/_credit_card.html.erb +4 -0
  29. data/app/views/spree/admin/log_entries/index.html.erb +28 -0
  30. data/app/views/spree/admin/mail_methods/_form.html.erb +2 -2
  31. data/app/views/spree/admin/orders/_form.html.erb +9 -1
  32. data/app/views/spree/admin/orders/_line_items.html.erb +46 -0
  33. data/app/views/spree/admin/orders/_risk_analysis.html.erb +47 -0
  34. data/app/views/spree/admin/orders/_shipment.html.erb +11 -3
  35. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +7 -3
  36. data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
  37. data/app/views/spree/admin/orders/customer_details/edit.html.erb +7 -9
  38. data/app/views/spree/admin/orders/index.html.erb +11 -5
  39. data/app/views/spree/admin/payment_methods/_form.html.erb +0 -2
  40. data/app/views/spree/admin/payments/_list.html.erb +2 -2
  41. data/app/views/spree/admin/payments/show.html.erb +2 -1
  42. data/app/views/spree/admin/products/_add_stock_form.html.erb +1 -1
  43. data/app/views/spree/admin/products/_form.html.erb +0 -1
  44. data/app/views/spree/admin/products/stock.html.erb +10 -1
  45. data/app/views/spree/admin/shared/_destroy.js.erb +5 -14
  46. data/app/views/spree/admin/shared/_head.html.erb +6 -2
  47. data/app/views/spree/admin/shared/_order_tabs.html.erb +4 -4
  48. data/app/views/spree/admin/variants/update.js.erb +1 -0
  49. data/config/routes.rb +3 -0
  50. data/vendor/assets/javascripts/spin.js +356 -296
  51. metadata +29 -19
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.1.3
4
+ version: 2.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-20 00:00:00.000000000 Z
11
+ date: 2014-01-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,82 +16,82 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.1.3
19
+ version: 2.1.4
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.1.3
26
+ version: 2.1.4
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.1.3
33
+ version: 2.1.4
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.1.3
40
+ version: 2.1.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: 3.0.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: 3.0.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: jquery-ui-rails
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: 4.0.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: 4.0.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: select2-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: 3.4.7
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 3.4.7
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: email_spec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: 1.2.1
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 1.2.1
97
97
  description: Required dependency for Spree
@@ -100,11 +100,11 @@ executables: []
100
100
  extensions: []
101
101
  extra_rdoc_files: []
102
102
  files:
103
+ - app/assets/fonts/FontAwesome.otf
103
104
  - app/assets/fonts/fontawesome-webfont.eot
104
105
  - app/assets/fonts/fontawesome-webfont.svg
105
106
  - app/assets/fonts/fontawesome-webfont.ttf
106
107
  - app/assets/fonts/fontawesome-webfont.woff
107
- - app/assets/fonts/FontAwesome.otf
108
108
  - app/assets/images/admin/payment_banner.png
109
109
  - app/assets/images/admin/progress.gif
110
110
  - app/assets/images/credit_cards/credit_card.gif
@@ -116,6 +116,7 @@ files:
116
116
  - app/assets/javascripts/admin/image_settings.js.erb
117
117
  - app/assets/javascripts/admin/images/index.js.coffee
118
118
  - app/assets/javascripts/admin/images/new.js.coffee
119
+ - app/assets/javascripts/admin/line_items.js.coffee
119
120
  - app/assets/javascripts/admin/nested-attribute.js
120
121
  - app/assets/javascripts/admin/option_type_autocomplete.js.erb
121
122
  - app/assets/javascripts/admin/orders/edit.js
@@ -138,6 +139,7 @@ files:
138
139
  - app/assets/javascripts/admin/underscore-min.js
139
140
  - app/assets/javascripts/admin/user_picker.js
140
141
  - app/assets/javascripts/admin/variant_autocomplete.js.erb
142
+ - app/assets/javascripts/admin/variant_management.js.coffee
141
143
  - app/assets/javascripts/admin/zone.js.coffee
142
144
  - app/assets/javascripts/store/backend.js
143
145
  - app/assets/stylesheets/admin/components/_actions.scss
@@ -166,6 +168,7 @@ files:
166
168
  - app/assets/stylesheets/admin/sections/_bulk_transfer.scss
167
169
  - app/assets/stylesheets/admin/sections/_edit_checkouts.scss
168
170
  - app/assets/stylesheets/admin/sections/_image_settings.scss
171
+ - app/assets/stylesheets/admin/sections/_log_entries.scss
169
172
  - app/assets/stylesheets/admin/sections/_orders.scss
170
173
  - app/assets/stylesheets/admin/sections/_overview.scss
171
174
  - app/assets/stylesheets/admin/sections/_products.scss
@@ -187,6 +190,7 @@ files:
187
190
  - app/controllers/spree/admin/images_controller.rb
188
191
  - app/controllers/spree/admin/inventory_units_controller.rb
189
192
  - app/controllers/spree/admin/line_items_controller.rb
193
+ - app/controllers/spree/admin/log_entries_controller.rb
190
194
  - app/controllers/spree/admin/mail_methods_controller.rb
191
195
  - app/controllers/spree/admin/option_types_controller.rb
192
196
  - app/controllers/spree/admin/option_values_controller.rb
@@ -220,6 +224,7 @@ files:
220
224
  - app/controllers/spree/admin/taxons_controller.rb
221
225
  - app/controllers/spree/admin/trackers_controller.rb
222
226
  - app/controllers/spree/admin/variants_controller.rb
227
+ - app/controllers/spree/admin/variants_including_master_controller.rb
223
228
  - app/controllers/spree/admin/zones_controller.rb
224
229
  - app/helpers/spree/admin/base_helper.rb
225
230
  - app/helpers/spree/admin/general_settings_helper.rb
@@ -252,6 +257,8 @@ files:
252
257
  - app/views/spree/admin/inventory_units/adjust.html.erb
253
258
  - app/views/spree/admin/line_items/create.js.erb
254
259
  - app/views/spree/admin/line_items/destroy.js.erb
260
+ - app/views/spree/admin/log_entries/_credit_card.html.erb
261
+ - app/views/spree/admin/log_entries/index.html.erb
255
262
  - app/views/spree/admin/mail_methods/_form.html.erb
256
263
  - app/views/spree/admin/mail_methods/edit.html.erb
257
264
  - app/views/spree/admin/option_types/_form.html.erb
@@ -263,6 +270,8 @@ files:
263
270
  - app/views/spree/admin/orders/_add_product.html.erb
264
271
  - app/views/spree/admin/orders/_form.html.erb
265
272
  - app/views/spree/admin/orders/_line_item.html.erb
273
+ - app/views/spree/admin/orders/_line_items.html.erb
274
+ - app/views/spree/admin/orders/_risk_analysis.html.erb
266
275
  - app/views/spree/admin/orders/_shipment.html.erb
267
276
  - app/views/spree/admin/orders/_shipment_manifest.html.erb
268
277
  - app/views/spree/admin/orders/customer_details/_form.html.erb
@@ -423,6 +432,7 @@ files:
423
432
  - app/views/spree/admin/variants/index.html.erb
424
433
  - app/views/spree/admin/variants/new.html.erb
425
434
  - app/views/spree/admin/variants/new.js.erb
435
+ - app/views/spree/admin/variants/update.js.erb
426
436
  - app/views/spree/admin/zones/_country_members.html.erb
427
437
  - app/views/spree/admin/zones/_form.html.erb
428
438
  - app/views/spree/admin/zones/_state_members.html.erb
@@ -433,9 +443,9 @@ files:
433
443
  - app/views/spree/test_mailer/test_email.text.erb
434
444
  - config/initializers/form_builder.rb
435
445
  - config/routes.rb
446
+ - lib/spree/backend.rb
436
447
  - lib/spree/backend/action_callbacks.rb
437
448
  - lib/spree/backend/engine.rb
438
- - lib/spree/backend.rb
439
449
  - lib/spree_backend.rb
440
450
  - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
441
451
  - vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png
@@ -487,18 +497,18 @@ require_paths:
487
497
  - lib
488
498
  required_ruby_version: !ruby/object:Gem::Requirement
489
499
  requirements:
490
- - - '>='
500
+ - - ">="
491
501
  - !ruby/object:Gem::Version
492
502
  version: 1.9.3
493
503
  required_rubygems_version: !ruby/object:Gem::Requirement
494
504
  requirements:
495
- - - '>='
505
+ - - ">="
496
506
  - !ruby/object:Gem::Version
497
507
  version: '0'
498
508
  requirements:
499
509
  - none
500
510
  rubyforge_project: spree_backend
501
- rubygems_version: 2.1.0
511
+ rubygems_version: 2.2.0
502
512
  signing_key:
503
513
  specification_version: 4
504
514
  summary: backend e-commerce functionality for the Spree project.