spree_backend 3.3.6 → 3.4.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (66) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -8
  3. data/app/assets/javascripts/spree/backend/handlebar_extensions.js +3 -0
  4. data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +1 -1
  5. data/app/assets/javascripts/spree/backend/shipments.js +8 -25
  6. data/app/assets/javascripts/spree/backend/taxons.js.coffee +1 -6
  7. data/app/assets/stylesheets/spree/backend/sections/_account.scss +8 -4
  8. data/app/controllers/spree/admin/adjustments_controller.rb +0 -2
  9. data/app/controllers/spree/admin/base_controller.rb +5 -5
  10. data/app/controllers/spree/admin/countries_controller.rb +1 -2
  11. data/app/controllers/spree/admin/customer_returns_controller.rb +4 -5
  12. data/app/controllers/spree/admin/general_settings_controller.rb +1 -0
  13. data/app/controllers/spree/admin/log_entries_controller.rb +0 -1
  14. data/app/controllers/spree/admin/option_types_controller.rb +10 -10
  15. data/app/controllers/spree/admin/orders_controller.rb +30 -21
  16. data/app/controllers/spree/admin/payment_methods_controller.rb +5 -7
  17. data/app/controllers/spree/admin/payments_controller.rb +3 -3
  18. data/app/controllers/spree/admin/product_properties_controller.rb +7 -6
  19. data/app/controllers/spree/admin/products_controller.rb +8 -9
  20. data/app/controllers/spree/admin/promotion_actions_controller.rb +4 -4
  21. data/app/controllers/spree/admin/promotion_rules_controller.rb +4 -4
  22. data/app/controllers/spree/admin/promotions_controller.rb +22 -21
  23. data/app/controllers/spree/admin/properties_controller.rb +2 -2
  24. data/app/controllers/spree/admin/prototypes_controller.rb +0 -1
  25. data/app/controllers/spree/admin/reports_controller.rb +17 -10
  26. data/app/controllers/spree/admin/resource_controller.rb +6 -15
  27. data/app/controllers/spree/admin/shipping_methods_controller.rb +5 -5
  28. data/app/controllers/spree/admin/states_controller.rb +9 -9
  29. data/app/controllers/spree/admin/stock_items_controller.rb +10 -9
  30. data/app/controllers/spree/admin/stock_movements_controller.rb +2 -2
  31. data/app/controllers/spree/admin/stock_transfers_controller.rb +20 -15
  32. data/app/controllers/spree/admin/store_credits_controller.rb +1 -1
  33. data/app/controllers/spree/admin/taxons_controller.rb +9 -18
  34. data/app/controllers/spree/admin/users_controller.rb +7 -7
  35. data/app/controllers/spree/admin/variants_controller.rb +1 -1
  36. data/app/controllers/spree/admin/variants_including_master_controller.rb +2 -3
  37. data/app/controllers/spree/admin/zones_controller.rb +11 -11
  38. data/app/helpers/spree/admin/adjustments_helper.rb +8 -10
  39. data/app/helpers/spree/admin/base_helper.rb +43 -49
  40. data/app/helpers/spree/admin/general_settings_helper.rb +1 -1
  41. data/app/helpers/spree/admin/images_helper.rb +0 -1
  42. data/app/helpers/spree/admin/navigation_helper.rb +39 -45
  43. data/app/helpers/spree/admin/orders_helper.rb +42 -43
  44. data/app/helpers/spree/admin/payments_helper.rb +1 -1
  45. data/app/helpers/spree/admin/promotion_rules_helper.rb +2 -2
  46. data/app/helpers/spree/admin/stock_locations_helper.rb +1 -1
  47. data/app/helpers/spree/admin/stock_movements_helper.rb +1 -1
  48. data/app/helpers/spree/admin/taxons_helper.rb +1 -1
  49. data/app/models/spree/admin/resource.rb +4 -4
  50. data/app/views/spree/admin/products/_autocomplete.js.erb +1 -1
  51. data/app/views/spree/admin/return_authorizations/_form.html.erb +1 -1
  52. data/app/views/spree/admin/shared/_account_nav.html.erb +59 -0
  53. data/app/views/spree/admin/shared/_header.html.erb +3 -1
  54. data/app/views/spree/admin/shared/_main_menu.html.erb +0 -6
  55. data/app/views/spree/admin/shared/_version.html.erb +5 -0
  56. data/app/views/spree/admin/stock_transfers/new.html.erb +1 -1
  57. data/app/views/spree/admin/stock_transfers/show.html.erb +1 -1
  58. data/app/views/spree/admin/users/index.html.erb +1 -1
  59. data/app/views/spree/layouts/admin.html.erb +2 -0
  60. data/config/initializers/assets.rb +1 -1
  61. data/config/initializers/form_builder.rb +2 -3
  62. data/config/routes.rb +5 -5
  63. data/lib/spree/backend/action_callbacks.rb +0 -1
  64. data/lib/spree/backend/callbacks.rb +3 -5
  65. data/lib/spree/backend/engine.rb +4 -4
  66. metadata +11 -9
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.3.6
4
+ version: 3.4.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-12 00:00:00.000000000 Z
11
+ date: 2017-09-22 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.3.6
19
+ version: 3.4.0.rc1
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.3.6
26
+ version: 3.4.0.rc1
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.3.6
33
+ version: 3.4.0.rc1
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.3.6
40
+ version: 3.4.0.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -378,6 +378,7 @@ files:
378
378
  - app/views/spree/admin/roles/edit.html.erb
379
379
  - app/views/spree/admin/roles/index.html.erb
380
380
  - app/views/spree/admin/roles/new.html.erb
381
+ - app/views/spree/admin/shared/_account_nav.html.erb
381
382
  - app/views/spree/admin/shared/_address.html.erb
382
383
  - app/views/spree/admin/shared/_address_form.html.erb
383
384
  - app/views/spree/admin/shared/_calculator_fields.html.erb
@@ -399,6 +400,7 @@ files:
399
400
  - app/views/spree/admin/shared/_table_filter.html.erb
400
401
  - app/views/spree/admin/shared/_translations.html.erb
401
402
  - app/views/spree/admin/shared/_update_order_state.js.erb
403
+ - app/views/spree/admin/shared/_version.html.erb
402
404
  - app/views/spree/admin/shared/named_types/_edit.html.erb
403
405
  - app/views/spree/admin/shared/named_types/_form.html.erb
404
406
  - app/views/spree/admin/shared/named_types/_index.html.erb
@@ -529,13 +531,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
529
531
  version: 2.2.7
530
532
  required_rubygems_version: !ruby/object:Gem::Requirement
531
533
  requirements:
532
- - - ">="
534
+ - - ">"
533
535
  - !ruby/object:Gem::Version
534
- version: '0'
536
+ version: 1.3.1
535
537
  requirements:
536
538
  - none
537
539
  rubyforge_project:
538
- rubygems_version: 2.6.14
540
+ rubygems_version: 2.6.12
539
541
  signing_key:
540
542
  specification_version: 4
541
543
  summary: backend e-commerce functionality for the Spree project.