spree_backend 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/fonts/FontAwesome.otf +0 -0
  3. data/app/assets/fonts/fontawesome-webfont.eot +0 -0
  4. data/app/assets/fonts/fontawesome-webfont.svg +399 -0
  5. data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
  6. data/app/assets/fonts/fontawesome-webfont.woff +0 -0
  7. data/app/assets/images/credit_cards/credit_card.gif +0 -0
  8. data/app/assets/javascripts/admin/admin.js.erb +6 -5
  9. data/app/assets/javascripts/admin/option_type_autocomplete.js.erb +1 -2
  10. data/app/assets/javascripts/admin/shipments.js.erb +3 -3
  11. data/app/assets/javascripts/admin/spree_backend.js +2 -2
  12. data/app/assets/javascripts/admin/stock_transfer.js.coffee +3 -3
  13. data/app/assets/javascripts/admin/variant_autocomplete.js.erb +9 -9
  14. data/app/assets/javascripts/admin/zone.js.coffee +8 -4
  15. data/app/assets/stylesheets/admin/components/_date-picker.scss +1 -1
  16. data/app/assets/stylesheets/admin/components/_navigation.scss +12 -8
  17. data/app/assets/stylesheets/admin/components/_sidebar.scss +2 -0
  18. data/app/assets/stylesheets/admin/globals/_variables.scss +53 -47
  19. data/app/assets/stylesheets/admin/globals/_variables_override.scss +2 -2
  20. data/app/assets/stylesheets/admin/plugins/_font-awesome.scss +1475 -0
  21. data/app/assets/stylesheets/admin/plugins/_jstree.scss +0 -1
  22. data/app/assets/stylesheets/admin/plugins/_select2.scss +40 -31
  23. data/app/assets/stylesheets/admin/shared/_forms.scss +7 -2
  24. data/app/assets/stylesheets/admin/shared/_icons.scss +7 -6
  25. data/app/assets/stylesheets/admin/shared/_layout.scss +2 -3
  26. data/app/assets/stylesheets/admin/shared/_tables.scss +7 -0
  27. data/app/assets/stylesheets/admin/spree_backend.css +1 -1
  28. data/app/controllers/spree/admin/orders/customer_details_controller.rb +3 -0
  29. data/app/controllers/spree/admin/orders_controller.rb +8 -0
  30. data/app/controllers/spree/admin/payments_controller.rb +2 -1
  31. data/app/controllers/spree/admin/products_controller.rb +9 -3
  32. data/app/controllers/spree/admin/stock_items_controller.rb +29 -6
  33. data/app/controllers/spree/admin/stock_locations_controller.rb +12 -0
  34. data/app/controllers/spree/admin/stock_movements_controller.rb +4 -31
  35. data/app/controllers/spree/admin/stock_transfers_controller.rb +1 -1
  36. data/app/controllers/spree/admin/tax_categories_controller.rb +1 -1
  37. data/app/controllers/spree/admin/variants_controller.rb +1 -2
  38. data/app/helpers/spree/admin/orders_helper.rb +4 -0
  39. data/app/views/spree/admin/mail_methods/_form.html.erb +3 -7
  40. data/app/views/spree/admin/orders/_shipment.html.erb +96 -126
  41. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +33 -0
  42. data/app/views/spree/admin/orders/edit.html.erb +10 -4
  43. data/app/views/spree/admin/orders/index.html.erb +1 -1
  44. data/app/views/spree/admin/payments/_form.html.erb +3 -1
  45. data/app/views/spree/admin/product_properties/index.html.erb +1 -1
  46. data/app/views/spree/admin/products/_add_stock_form.html.erb +31 -2
  47. data/app/views/spree/admin/products/_form.html.erb +2 -2
  48. data/app/views/spree/admin/products/edit.html.erb +5 -3
  49. data/app/views/spree/admin/products/index.html.erb +4 -4
  50. data/app/views/spree/admin/products/new.html.erb +10 -0
  51. data/app/views/spree/admin/products/stock.html.erb +17 -17
  52. data/app/views/spree/admin/promotions/_promotion_action.html.erb +2 -1
  53. data/app/views/spree/admin/promotions/_promotion_rule.html.erb +1 -0
  54. data/app/views/spree/admin/prototypes/index.html.erb +1 -1
  55. data/app/views/spree/admin/shared/_product_tabs.html.erb +10 -9
  56. data/app/views/spree/admin/shared/_routes.html.erb +4 -0
  57. data/app/views/spree/admin/shared/_tabs.html.erb +1 -1
  58. data/app/views/spree/admin/shared/_translations.html.erb +27 -25
  59. data/app/views/spree/admin/shipping_methods/_form.html.erb +9 -4
  60. data/app/views/spree/admin/states/index.html.erb +1 -1
  61. data/app/views/spree/admin/stock_items/destroy.js.erb +1 -0
  62. data/app/views/spree/admin/stock_locations/_form.html.erb +8 -0
  63. data/app/views/spree/admin/stock_locations/index.html.erb +35 -31
  64. data/app/views/spree/admin/stock_locations/new.html.erb +2 -2
  65. data/app/views/spree/admin/stock_movements/index.html.erb +3 -6
  66. data/app/views/spree/admin/stock_transfers/index.html.erb +1 -1
  67. data/app/views/spree/admin/stock_transfers/new.html.erb +1 -1
  68. data/app/views/spree/admin/stock_transfers/show.html.erb +1 -2
  69. data/app/views/spree/admin/taxonomies/edit.erb +1 -1
  70. data/app/views/spree/admin/variants/_autocomplete.js.erb +1 -1
  71. data/app/views/spree/admin/zones/_member_type.html.erb +3 -3
  72. data/app/views/spree/layouts/admin.html.erb +9 -15
  73. data/config/routes.rb +2 -2
  74. data/lib/spree/backend.rb +1 -0
  75. data/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js +2 -2
  76. data/vendor/assets/javascripts/jquery.jstree/themes/apple/style.css +2 -2
  77. data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb +5 -5
  78. metadata +35 -21
  79. data/app/assets/images/admin/bg/spree_50.png +0 -0
  80. data/app/assets/stylesheets/admin/plugins/font-awesome.scss +0 -303
  81. data/app/views/spree/admin/shared/_stock_movement_form.html.erb +0 -30
  82. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  83. data/vendor/assets/fonts/fontawesome-webfont.svg +0 -255
  84. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  85. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  86. data/vendor/assets/stylesheets/font-awesome-ie7.css +0 -645
  87. data/vendor/assets/stylesheets/font-awesome.css.erb +0 -303
data/app/views/spree/admin/stock_transfers/new.html.erb CHANGED
@@ -6,7 +6,7 @@
6
6
 
7
7
  <% content_for :page_actions do %>
8
8
  <li>
9
- <%= button_link_to Spree.t('stock_transfers'), admin_stock_transfers_url, { :icon => 'icon-resize-full' } %>
9
+ <%= button_link_to Spree.t('back_to_stock_transfers_list'), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
10
10
  </li>
11
11
  <% end %>
12
12
 
data/app/views/spree/admin/stock_transfers/show.html.erb CHANGED
@@ -6,8 +6,7 @@
6
6
 
7
7
  <% content_for :page_actions do %>
8
8
  <li>
9
- <%= button_link_to Spree.t('back_to_stock_transfers_list'),
10
- admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
9
+ <%= button_link_to Spree.t('back_to_stock_transfers_list'), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
11
10
  </li>
12
11
  <li>
13
12
  <%= button_link_to Spree.t('new_stock_transfer'), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
data/app/views/spree/admin/taxonomies/edit.erb CHANGED
@@ -26,7 +26,7 @@
26
26
  <div id="taxonomy_tree" class="tree"></div>
27
27
  </div>
28
28
  <div id="progress" style="display:none;">
29
- <%= image_tag 'spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= Spree.t(:updating) %>..
29
+ <%= image_tag 'select2-spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= Spree.t(:updating) %>..
30
30
  </div>
31
31
 
32
32
  <div class="info"><%= Spree.t(:taxonomy_tree_instruction) %></div>
data/app/views/spree/admin/variants/_autocomplete.js.erb CHANGED
@@ -4,7 +4,7 @@
4
4
  {{#if variant.image }}
5
5
  <img src='{{variant.image}}' />
6
6
  {{ else }}
7
- <img src='/assets/noimage/mini.png' />
7
+ <img src='<%= image_path("noimage/mini.png") %>' />
8
8
  {{/if}}
9
9
  </figure>
10
10
 
data/app/views/spree/admin/zones/_member_type.html.erb CHANGED
@@ -5,15 +5,15 @@
5
5
  <fieldset class="no-border-bottom">
6
6
  <legend align="center"><%= Spree.t(type) %></legend>
7
7
 
8
- <ul id="ul-nested-<%= type %>" class="member-list fields">
9
- <% members_of_type = zone_form.object.zone_members.select { |member| member.zoneable_type && member.zoneable_type == "Spree::#{type.capitalize}" } %>
8
+ <ul id="ul-nested-<%= type.dasherize %>" class="member-list fields">
9
+ <% members_of_type = zone_form.object.zone_members.select { |member| member.zoneable_type && member.zoneable_type == "Spree::#{type.camelize}" } %>
10
10
  <%= zone_form.fields_for :zone_members, members_of_type do |member_form| %>
11
11
  <%= render :partial => "#{type}_member", :locals => { :f => member_form } %>
12
12
  <% end %>
13
13
  </ul>
14
14
 
15
15
  <div data-hook="buttons" class="field align-center">
16
- <%= button_link_to Spree.t("add_#{type}"), "##{type}_member", { :icon => 'icon-plus', :id => "nested-#{type}" } %>
16
+ <%= button_link_to Spree.t("add_#{type}"), "##{type}_member", { :icon => 'icon-plus', :id => "nested-#{type.dasherize}" } %>
17
17
  </div>
18
18
  </fieldset>
19
19
  </div>
data/app/views/spree/layouts/admin.html.erb CHANGED
@@ -7,7 +7,7 @@
7
7
  <head data-hook="admin_inside_head">
8
8
  <%= render :partial => 'spree/admin/shared/head' %>
9
9
  </head>
10
-
10
+
11
11
  <body class='admin'>
12
12
  <div id='wrapper' data-hook>
13
13
 
@@ -39,7 +39,7 @@
39
39
 
40
40
  <nav data-hook="admin_login_navigation_bar" class="columns eleven"></nav>
41
41
  </div>
42
-
42
+
43
43
  </header>
44
44
 
45
45
  <nav id="admin-menu" data-hook>
@@ -55,11 +55,11 @@
55
55
  <% if content_for?(:sub_menu) %>
56
56
  <nav id="sub-menu" data-hook>
57
57
  <div class="container">
58
-
58
+
59
59
  <div class="sixteen columns">
60
60
  <%= yield :sub_menu %>
61
61
  </div>
62
-
62
+
63
63
  </div>
64
64
  </nav>
65
65
  <% end %>
@@ -67,7 +67,7 @@
67
67
  <% if content_for?(:page_title) || content_for?(:page_actions) %>
68
68
  <div id="content-header" data-hook>
69
69
  <div class="container">
70
-
70
+
71
71
  <div class="sixteen columns">
72
72
  <div class="block-table">
73
73
  <% if content_for?(:page_title) %>
@@ -84,7 +84,7 @@
84
84
  <% end %>
85
85
  </div>
86
86
  </div>
87
-
87
+
88
88
  </div>
89
89
  </div>
90
90
  <% end %>
@@ -92,7 +92,6 @@
92
92
  <div class="container">
93
93
  <div class="row">
94
94
  <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
95
-
96
95
  <% if content_for?(:table_filter) %>
97
96
  <div id="table-filter" data-hook class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
98
97
  <fieldset>
@@ -106,7 +105,6 @@
106
105
  <%= yield %>
107
106
  </div>
108
107
 
109
-
110
108
  <% if content_for?(:sidebar) %>
111
109
  <aside id="sidebar" data-hook class="four columns">
112
110
 
@@ -117,19 +115,15 @@
117
115
  <%= yield :sidebar %>
118
116
  </aside>
119
117
  <% end %>
120
-
121
118
  </div>
122
119
  </div>
123
-
124
120
  </div>
125
-
126
121
  </div>
127
122
 
128
123
  <div data-hook="admin_footer_scripts"></div>
129
124
 
130
-
131
- <script>
132
- Spree.api_key = <%= raw(try_spree_current_user.try(:spree_api_key).to_s.inspect) %>;
133
- </script>
125
+ <script>
126
+ Spree.api_key = <%= raw(try_spree_current_user.try(:spree_api_key).to_s.inspect) %>;
127
+ </script>
134
128
  </body>
135
129
  </html>
data/config/routes.rb CHANGED
@@ -137,14 +137,14 @@ Spree::Core::Engine.routes.draw do
137
137
  resources :shipping_categories
138
138
  resources :stock_transfers, :only => [:index, :show, :new, :create]
139
139
  resources :stock_locations do
140
- resources :stock_movements
140
+ resources :stock_movements, :except => [:edit, :update, :destroy]
141
141
  collection do
142
142
  post :transfer_stock
143
143
  end
144
144
  end
145
145
 
146
146
  resources :stock_movements
147
- resources :stock_items, :only => :update
147
+ resources :stock_items, :only => [:create, :update, :destroy]
148
148
  resources :tax_rates
149
149
  resource :tax_settings
150
150
 
data/lib/spree/backend.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'rails/all'
2
2
  require 'rails/generators'
3
3
  require 'jquery-rails'
4
+ require 'jquery-ui-rails'
4
5
  require 'deface'
5
6
  require 'select2-rails'
6
7
 
data/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js CHANGED
@@ -2686,14 +2686,14 @@
2686
2686
  $(function() {
2687
2687
  var css_string = '' +
2688
2688
  '#vakata-dragged ins { display:block; text-decoration:none; width:16px; height:16px; margin:0 0 0 0; padding:0; position:absolute; top:4px; left:4px; ' +
2689
- ' -moz-border-radius:4px; border-radius:4px; -webkit-border-radius:4px; ' +
2689
+ ' border-radius:4px; -webkit-border-radius:4px; ' +
2690
2690
  '} ' +
2691
2691
  '#vakata-dragged .jstree-ok { background:green; } ' +
2692
2692
  '#vakata-dragged .jstree-invalid { background:red; } ' +
2693
2693
  '#jstree-marker { padding:0; margin:0; font-size:12px; overflow:hidden; height:12px; width:8px; position:absolute; top:-30px; z-index:10001; background-repeat:no-repeat; display:none; background-color:transparent; text-shadow:1px 1px 1px white; color:black; line-height:10px; } ' +
2694
2694
  '#jstree-marker-line { padding:0; margin:0; line-height:0%; font-size:1px; overflow:hidden; height:1px; width:100px; position:absolute; top:-30px; z-index:10000; background-repeat:no-repeat; display:none; background-color:#456c43; ' +
2695
2695
  ' cursor:pointer; border:1px solid #eeeeee; border-left:0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; ' +
2696
- ' -moz-border-radius:1px; border-radius:1px; -webkit-border-radius:1px; ' +
2696
+ ' border-radius:1px; -webkit-border-radius:1px; ' +
2697
2697
  '}' +
2698
2698
  '';
2699
2699
  $.vakata.css.add_sheet({ str : css_string, title : "jstree" });
data/vendor/assets/javascripts/jquery.jstree/themes/apple/style.css CHANGED
@@ -13,7 +13,7 @@
13
13
  .jstree-apple .jstree-closed > ins { background-position:-54px 0; }
14
14
  .jstree-apple .jstree-leaf > ins { background-position:-36px 0; }
15
15
 
16
- .jstree-apple a { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }
16
+ .jstree-apple a { border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }
17
17
  .jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }
18
18
  .jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }
19
19
  .jstree-apple a .jstree-icon { background-position:-56px -20px; }
@@ -52,7 +52,7 @@
52
52
  #vakata-contextmenu.jstree-apple-context li { }
53
53
  #vakata-contextmenu.jstree-apple-context a { color:black; }
54
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; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
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
56
  #vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a,
57
57
  #vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
58
58
  #vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb CHANGED
@@ -280,14 +280,14 @@
280
280
  ----------------------------------*/
281
281
 
282
282
  /* Corner radius */
283
- .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -khtml-border-top-left-radius: 2px; border-top-left-radius: 2px; }
284
- .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; -khtml-border-top-right-radius: 2px; border-top-right-radius: 2px; }
285
- .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 2px; -webkit-border-bottom-left-radius: 2px; -khtml-border-bottom-left-radius: 2px; border-bottom-left-radius: 2px; }
286
- .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 2px; -webkit-border-bottom-right-radius: 2px; -khtml-border-bottom-right-radius: 2px; border-bottom-right-radius: 2px; }
283
+ .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -webkit-border-top-left-radius: 2px; -khtml-border-top-left-radius: 2px; border-top-left-radius: 2px; }
284
+ .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -webkit-border-top-right-radius: 2px; -khtml-border-top-right-radius: 2px; border-top-right-radius: 2px; }
285
+ .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -webkit-border-bottom-left-radius: 2px; -khtml-border-bottom-left-radius: 2px; border-bottom-left-radius: 2px; }
286
+ .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -webkit-border-bottom-right-radius: 2px; -khtml-border-bottom-right-radius: 2px; border-bottom-right-radius: 2px; }
287
287
 
288
288
  /* Overlays */
289
289
  .ui-widget-overlay { background: #eeeeee url(<%= asset_path("jquery-ui/ui-bg_flat_0_eeeeee_40x100.png") %>) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
290
- .ui-widget-shadow { margin: -4px 0 0 -4px; padding: 4px; background: #aaaaaa url(<%= asset_path("jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png") %>) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 0px; -khtml-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; }/*
290
+ .ui-widget-shadow { margin: -4px 0 0 -4px; padding: 4px; background: #aaaaaa url(<%= asset_path("jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png") %>) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -khtml-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; }/*
291
291
  * jQuery UI Datepicker 1.8.14
292
292
  *
293
293
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
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.0.3
4
+ version: 2.0.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-06-13 00:00:00.000000000 Z
11
+ date: 2013-08-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_core
@@ -16,56 +16,70 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.0.3
19
+ version: 2.0.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.0.3
26
+ version: 2.0.4
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_api
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 2.0.3
33
+ version: 2.0.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.0.3
40
+ version: 2.0.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
- version: '2.0'
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
- version: '2.0'
54
+ version: 3.0.0
55
+ - !ruby/object:Gem::Dependency
56
+ name: jquery-ui-rails
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: 4.0.0
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ~>
67
+ - !ruby/object:Gem::Version
68
+ version: 4.0.0
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: select2-rails
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
- - - '='
73
+ - - ~>
60
74
  - !ruby/object:Gem::Version
61
- version: 3.2.1
75
+ version: 3.4.7
62
76
  type: :runtime
63
77
  prerelease: false
64
78
  version_requirements: !ruby/object:Gem::Requirement
65
79
  requirements:
66
- - - '='
80
+ - - ~>
67
81
  - !ruby/object:Gem::Version
68
- version: 3.2.1
82
+ version: 3.4.7
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: rails
71
85
  requirement: !ruby/object:Gem::Requirement
@@ -114,9 +128,14 @@ executables: []
114
128
  extensions: []
115
129
  extra_rdoc_files: []
116
130
  files:
117
- - app/assets/images/admin/bg/spree_50.png
131
+ - app/assets/fonts/fontawesome-webfont.eot
132
+ - app/assets/fonts/fontawesome-webfont.svg
133
+ - app/assets/fonts/fontawesome-webfont.ttf
134
+ - app/assets/fonts/fontawesome-webfont.woff
135
+ - app/assets/fonts/FontAwesome.otf
118
136
  - app/assets/images/admin/payment_banner.png
119
137
  - app/assets/images/admin/progress.gif
138
+ - app/assets/images/credit_cards/credit_card.gif
120
139
  - app/assets/javascripts/admin/address_states.js
121
140
  - app/assets/javascripts/admin/admin.js.erb
122
141
  - app/assets/javascripts/admin/calculator.js
@@ -164,11 +183,11 @@ files:
164
183
  - app/assets/stylesheets/admin/hacks/_ie.scss
165
184
  - app/assets/stylesheets/admin/hacks/_mozilla.scss
166
185
  - app/assets/stylesheets/admin/hacks/_opera.scss
186
+ - app/assets/stylesheets/admin/plugins/_font-awesome.scss
167
187
  - app/assets/stylesheets/admin/plugins/_jstree.scss
168
188
  - app/assets/stylesheets/admin/plugins/_powertip.scss
169
189
  - app/assets/stylesheets/admin/plugins/_select2.scss
170
190
  - app/assets/stylesheets/admin/plugins/_token-input.scss
171
- - app/assets/stylesheets/admin/plugins/font-awesome.scss
172
191
  - app/assets/stylesheets/admin/sections/_bulk_transfer.scss
173
192
  - app/assets/stylesheets/admin/sections/_edit_checkouts.scss
174
193
  - app/assets/stylesheets/admin/sections/_image_settings.scss
@@ -269,6 +288,7 @@ files:
269
288
  - app/views/spree/admin/orders/_form.html.erb
270
289
  - app/views/spree/admin/orders/_line_item.html.erb
271
290
  - app/views/spree/admin/orders/_shipment.html.erb
291
+ - app/views/spree/admin/orders/_shipment_manifest.html.erb
272
292
  - app/views/spree/admin/orders/customer_details/_form.html.erb
273
293
  - app/views/spree/admin/orders/customer_details/edit.html.erb
274
294
  - app/views/spree/admin/orders/edit.html.erb
@@ -357,7 +377,6 @@ files:
357
377
  - app/views/spree/admin/shared/_report_criteria.html.erb
358
378
  - app/views/spree/admin/shared/_routes.html.erb
359
379
  - app/views/spree/admin/shared/_show_resource_links.html.erb
360
- - app/views/spree/admin/shared/_stock_movement_form.html.erb
361
380
  - app/views/spree/admin/shared/_tabs.html.erb
362
381
  - app/views/spree/admin/shared/_translations.html.erb
363
382
  - app/views/spree/admin/shared/_update_order_state.js
@@ -375,6 +394,7 @@ files:
375
394
  - app/views/spree/admin/states/index.html.erb
376
395
  - app/views/spree/admin/states/new.html.erb
377
396
  - app/views/spree/admin/states/new.js.erb
397
+ - app/views/spree/admin/stock_items/destroy.js.erb
378
398
  - app/views/spree/admin/stock_locations/_form.html.erb
379
399
  - app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb
380
400
  - app/views/spree/admin/stock_locations/edit.html.erb
@@ -435,10 +455,6 @@ files:
435
455
  - lib/spree/backend/engine.rb
436
456
  - lib/spree/backend.rb
437
457
  - lib/spree_backend.rb
438
- - vendor/assets/fonts/fontawesome-webfont.eot
439
- - vendor/assets/fonts/fontawesome-webfont.svg
440
- - vendor/assets/fonts/fontawesome-webfont.ttf
441
- - vendor/assets/fonts/fontawesome-webfont.woff
442
458
  - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
443
459
  - vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png
444
460
  - vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png
@@ -476,8 +492,6 @@ files:
476
492
  - vendor/assets/javascripts/responsive-tables.js
477
493
  - vendor/assets/javascripts/spin.js
478
494
  - vendor/assets/javascripts/trunk8.js
479
- - vendor/assets/stylesheets/font-awesome-ie7.css
480
- - vendor/assets/stylesheets/font-awesome.css.erb
481
495
  - vendor/assets/stylesheets/jquery-ui.datepicker.css.erb
482
496
  - vendor/assets/stylesheets/jquery.alerts/jquery.alerts.css.erb
483
497
  - vendor/assets/stylesheets/jquery.alerts/jquery.alerts.spree.css
data/app/assets/stylesheets/admin/plugins/font-awesome.scss DELETED
@@ -1,303 +0,0 @@
1
- /* Font Awesome
2
- the iconic font designed for use with Twitter Bootstrap
3
- -------------------------------------------------------
4
- The full suite of pictographic icons, examples, and documentation
5
- can be found at: http://fortawesome.github.com/Font-Awesome/
6
-
7
- License
8
- -------------------------------------------------------
9
- The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
10
- http://creativecommons.org/licenses/by/3.0/ A mention of
11
- 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
12
- source code is considered acceptable attribution (most common on the web).
13
- If human readable source code is not available to the end user, a mention in
14
- an 'About' or 'Credits' screen is considered acceptable (most common in desktop
15
- or mobile software).
16
-
17
- Contact
18
- -------------------------------------------------------
19
- Email: dave@davegandy.com
20
- Twitter: http://twitter.com/fortaweso_me
21
- Work: http://lemonwi.se co-founder
22
-
23
- */
24
- @font-face {
25
- font-family: "FontAwesome";
26
- src: url('/assets/fontawesome-webfont.eot');
27
- src: url('/assets/fontawesome-webfont.eot?#iefix') format('eot'), url('/assets/fontawesome-webfont.woff') format('woff'), url('/assets/fontawesome-webfont.ttf') format('truetype'), url('/assets/fontawesome-webfont.svg#FontAwesome') format('svg');
28
- font-weight: normal;
29
- font-style: normal;
30
- }
31
-
32
- /* Font Awesome styles
33
- ------------------------------------------------------- */
34
- [class^="icon-"]:before, [class*=" icon-"]:before {
35
- font-family: FontAwesome;
36
- font-weight: normal;
37
- font-style: normal;
38
- display: inline-block;
39
- text-decoration: inherit;
40
- }
41
- a [class^="icon-"], a [class*=" icon-"] {
42
- display: inline-block;
43
- text-decoration: inherit;
44
- }
45
- /* makes the font 33% larger relative to the icon container */
46
- .icon-large:before {
47
- vertical-align: top;
48
- font-size: 1.3333333333333333em;
49
- }
50
- .btn [class^="icon-"], .btn [class*=" icon-"] {
51
- /* keeps button heights with and without icons the same */
52
-
53
- line-height: .9em;
54
- }
55
- li [class^="icon-"], li [class*=" icon-"] {
56
- display: inline-block;
57
- width: 1.25em;
58
- text-align: center;
59
- }
60
- li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] {
61
- /* 1.5 increased font size for icon-large * 1.25 width */
62
-
63
- width: 1.875em;
64
- }
65
- li[class^="icon-"], li[class*=" icon-"] {
66
- margin-left: 0;
67
- list-style-type: none;
68
- }
69
- li[class^="icon-"]:before, li[class*=" icon-"]:before {
70
- text-indent: -2em;
71
- text-align: center;
72
- }
73
- li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
74
- text-indent: -1.3333333333333333em;
75
- }
76
- /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
77
- readers do not read off random characters that represent icons */
78
- .icon-glass:before { content: "\f000"; }
79
- .icon-music:before { content: "\f001"; }
80
- .icon-search:before { content: "\f002"; }
81
- .icon-envelope:before { content: "\f003"; }
82
- .icon-heart:before { content: "\f004"; }
83
- .icon-star:before { content: "\f005"; }
84
- .icon-star-empty:before { content: "\f006"; }
85
- .icon-user:before { content: "\f007"; }
86
- .icon-film:before { content: "\f008"; }
87
- .icon-th-large:before { content: "\f009"; }
88
- .icon-th:before { content: "\f00a"; }
89
- .icon-th-list:before { content: "\f00b"; }
90
- .icon-ok:before { content: "\f00c"; }
91
- .icon-remove:before { content: "\f00d"; }
92
- .icon-zoom-in:before { content: "\f00e"; }
93
-
94
- .icon-zoom-out:before { content: "\f010"; }
95
- .icon-off:before { content: "\f011"; }
96
- .icon-signal:before { content: "\f012"; }
97
- .icon-cog:before { content: "\f013"; }
98
- .icon-trash:before { content: "\f014"; }
99
- .icon-home:before { content: "\f015"; }
100
- .icon-file:before { content: "\f016"; }
101
- .icon-time:before { content: "\f017"; }
102
- .icon-road:before { content: "\f018"; }
103
- .icon-download-alt:before { content: "\f019"; }
104
- .icon-download:before { content: "\f01a"; }
105
- .icon-upload:before { content: "\f01b"; }
106
- .icon-inbox:before { content: "\f01c"; }
107
- .icon-play-circle:before { content: "\f01d"; }
108
- .icon-repeat:before { content: "\f01e"; }
109
-
110
- /* \f020 doesn't work in Safari. all shifted one down */
111
- .icon-refresh:before { content: "\f021"; }
112
- .icon-list-alt:before { content: "\f022"; }
113
- .icon-lock:before { content: "\f023"; }
114
- .icon-flag:before { content: "\f024"; }
115
- .icon-headphones:before { content: "\f025"; }
116
- .icon-volume-off:before { content: "\f026"; }
117
- .icon-volume-down:before { content: "\f027"; }
118
- .icon-volume-up:before { content: "\f028"; }
119
- .icon-qrcode:before { content: "\f029"; }
120
- .icon-barcode:before { content: "\f02a"; }
121
- .icon-tag:before { content: "\f02b"; }
122
- .icon-tags:before { content: "\f02c"; }
123
- .icon-book:before { content: "\f02d"; }
124
- .icon-bookmark:before { content: "\f02e"; }
125
- .icon-print:before { content: "\f02f"; }
126
-
127
- .icon-camera:before { content: "\f030"; }
128
- .icon-font:before { content: "\f031"; }
129
- .icon-bold:before { content: "\f032"; }
130
- .icon-italic:before { content: "\f033"; }
131
- .icon-text-height:before { content: "\f034"; }
132
- .icon-text-width:before { content: "\f035"; }
133
- .icon-align-left:before { content: "\f036"; }
134
- .icon-align-center:before { content: "\f037"; }
135
- .icon-align-right:before { content: "\f038"; }
136
- .icon-align-justify:before { content: "\f039"; }
137
- .icon-list:before { content: "\f03a"; }
138
- .icon-indent-left:before { content: "\f03b"; }
139
- .icon-indent-right:before { content: "\f03c"; }
140
- .icon-facetime-video:before { content: "\f03d"; }
141
- .icon-picture:before { content: "\f03e"; }
142
-
143
- .icon-pencil:before { content: "\f040"; }
144
- .icon-map-marker:before { content: "\f041"; }
145
- .icon-adjust:before { content: "\f042"; }
146
- .icon-tint:before { content: "\f043"; }
147
- .icon-edit:before { content: "\f044"; }
148
- .icon-share:before { content: "\f045"; }
149
- .icon-check:before { content: "\f046"; }
150
- .icon-move:before { content: "\f047"; }
151
- .icon-step-backward:before { content: "\f048"; }
152
- .icon-fast-backward:before { content: "\f049"; }
153
- .icon-backward:before { content: "\f04a"; }
154
- .icon-play:before { content: "\f04b"; }
155
- .icon-pause:before { content: "\f04c"; }
156
- .icon-stop:before { content: "\f04d"; }
157
- .icon-forward:before { content: "\f04e"; }
158
-
159
- .icon-fast-forward:before { content: "\f050"; }
160
- .icon-step-forward:before { content: "\f051"; }
161
- .icon-eject:before { content: "\f052"; }
162
- .icon-chevron-left:before { content: "\f053"; }
163
- .icon-chevron-right:before { content: "\f054"; }
164
- .icon-plus-sign:before { content: "\f055"; }
165
- .icon-minus-sign:before { content: "\f056"; }
166
- .icon-remove-sign:before { content: "\f057"; }
167
- .icon-ok-sign:before { content: "\f058"; }
168
- .icon-question-sign:before { content: "\f059"; }
169
- .icon-info-sign:before { content: "\f05a"; }
170
- .icon-screenshot:before { content: "\f05b"; }
171
- .icon-remove-circle:before { content: "\f05c"; }
172
- .icon-ok-circle:before { content: "\f05d"; }
173
- .icon-ban-circle:before { content: "\f05e"; }
174
-
175
- .icon-arrow-left:before { content: "\f060"; }
176
- .icon-arrow-right:before { content: "\f061"; }
177
- .icon-arrow-up:before { content: "\f062"; }
178
- .icon-arrow-down:before { content: "\f063"; }
179
- .icon-share-alt:before { content: "\f064"; }
180
- .icon-resize-full:before { content: "\f065"; }
181
- .icon-resize-small:before { content: "\f066"; }
182
- .icon-plus:before { content: "\f067"; }
183
- .icon-minus:before { content: "\f068"; }
184
- .icon-asterisk:before { content: "\f069"; }
185
- .icon-exclamation-sign:before { content: "\f06a"; }
186
- .icon-gift:before { content: "\f06b"; }
187
- .icon-leaf:before { content: "\f06c"; }
188
- .icon-fire:before { content: "\f06d"; }
189
- .icon-eye-open:before { content: "\f06e"; }
190
-
191
- .icon-eye-close:before { content: "\f070"; }
192
- .icon-warning-sign:before { content: "\f071"; }
193
- .icon-plane:before { content: "\f072"; }
194
- .icon-calendar:before { content: "\f073"; }
195
- .icon-random:before { content: "\f074"; }
196
- .icon-comment:before { content: "\f075"; }
197
- .icon-magnet:before { content: "\f076"; }
198
- .icon-chevron-up:before { content: "\f077"; }
199
- .icon-chevron-down:before { content: "\f078"; }
200
- .icon-retweet:before { content: "\f079"; }
201
- .icon-shopping-cart:before { content: "\f07a"; }
202
- .icon-folder-close:before { content: "\f07b"; }
203
- .icon-folder-open:before { content: "\f07c"; }
204
- .icon-resize-vertical:before { content: "\f07d"; }
205
- .icon-resize-horizontal:before { content: "\f07e"; }
206
-
207
- .icon-bar-chart:before { content: "\f080"; }
208
- .icon-twitter-sign:before { content: "\f081"; }
209
- .icon-facebook-sign:before { content: "\f082"; }
210
- .icon-camera-retro:before { content: "\f083"; }
211
- .icon-key:before { content: "\f084"; }
212
- .icon-cogs:before { content: "\f085"; }
213
- .icon-comments:before { content: "\f086"; }
214
- .icon-thumbs-up:before { content: "\f087"; }
215
- .icon-thumbs-down:before { content: "\f088"; }
216
- .icon-star-half:before { content: "\f089"; }
217
- .icon-heart-empty:before { content: "\f08a"; }
218
- .icon-signout:before { content: "\f08b"; }
219
- .icon-linkedin-sign:before { content: "\f08c"; }
220
- .icon-pushpin:before { content: "\f08d"; }
221
- .icon-external-link:before { content: "\f08e"; }
222
-
223
- .icon-signin:before { content: "\f090"; }
224
- .icon-trophy:before { content: "\f091"; }
225
- .icon-github-sign:before { content: "\f092"; }
226
- .icon-upload-alt:before { content: "\f093"; }
227
- .icon-lemon:before { content: "\f094"; }
228
- .icon-phone:before { content: "\f095"; }
229
- .icon-check-empty:before { content: "\f096"; }
230
- .icon-bookmark-empty:before { content: "\f097"; }
231
- .icon-phone-sign:before { content: "\f098"; }
232
- .icon-twitter:before { content: "\f099"; }
233
- .icon-facebook:before { content: "\f09a"; }
234
- .icon-github:before { content: "\f09b"; }
235
- .icon-unlock:before { content: "\f09c"; }
236
- .icon-credit-card:before { content: "\f09d"; }
237
- .icon-rss:before { content: "\f09e"; }
238
-
239
- .icon-hdd:before { content: "\f0a0"; }
240
- .icon-bullhorn:before { content: "\f0a1"; }
241
- .icon-bell:before { content: "\f0a2"; }
242
- .icon-certificate:before { content: "\f0a3"; }
243
- .icon-hand-right:before { content: "\f0a4"; }
244
- .icon-hand-left:before { content: "\f0a5"; }
245
- .icon-hand-up:before { content: "\f0a6"; }
246
- .icon-hand-down:before { content: "\f0a7"; }
247
- .icon-circle-arrow-left:before { content: "\f0a8"; }
248
- .icon-circle-arrow-right:before { content: "\f0a9"; }
249
- .icon-circle-arrow-up:before { content: "\f0aa"; }
250
- .icon-circle-arrow-down:before { content: "\f0ab"; }
251
- .icon-globe:before { content: "\f0ac"; }
252
- .icon-wrench:before { content: "\f0ad"; }
253
- .icon-tasks:before { content: "\f0ae"; }
254
-
255
- .icon-filter:before { content: "\f0b0"; }
256
- .icon-briefcase:before { content: "\f0b1"; }
257
- .icon-fullscreen:before { content: "\f0b2"; }
258
-
259
- .icon-group:before { content: "\f0c0"; }
260
- .icon-link:before { content: "\f0c1"; }
261
- .icon-cloud:before { content: "\f0c2"; }
262
- .icon-beaker:before { content: "\f0c3"; }
263
- .icon-cut:before { content: "\f0c4"; }
264
- .icon-copy:before { content: "\f0c5"; }
265
- .icon-paper-clip:before { content: "\f0c6"; }
266
- .icon-save:before { content: "\f0c7"; }
267
- .icon-sign-blank:before { content: "\f0c8"; }
268
- .icon-reorder:before { content: "\f0c9"; }
269
- .icon-list-ul:before { content: "\f0ca"; }
270
- .icon-list-ol:before { content: "\f0cb"; }
271
- .icon-strikethrough:before { content: "\f0cc"; }
272
- .icon-underline:before { content: "\f0cd"; }
273
- .icon-table:before { content: "\f0ce"; }
274
-
275
- .icon-magic:before { content: "\f0d0"; }
276
- .icon-truck:before { content: "\f0d1"; }
277
- .icon-pinterest:before { content: "\f0d2"; }
278
- .icon-pinterest-sign:before { content: "\f0d3"; }
279
- .icon-google-plus-sign:before { content: "\f0d4"; }
280
- .icon-google-plus:before { content: "\f0d5"; }
281
- .icon-money:before { content: "\f0d6"; }
282
- .icon-caret-down:before { content: "\f0d7"; }
283
- .icon-caret-up:before { content: "\f0d8"; }
284
- .icon-caret-left:before { content: "\f0d9"; }
285
- .icon-caret-right:before { content: "\f0da"; }
286
- .icon-columns:before { content: "\f0db"; }
287
- .icon-sort:before { content: "\f0dc"; }
288
- .icon-sort-down:before { content: "\f0dd"; }
289
- .icon-sort-up:before { content: "\f0de"; }
290
-
291
- .icon-envelope-alt:before { content: "\f0e0"; }
292
- .icon-linkedin:before { content: "\f0e1"; }
293
- .icon-undo:before { content: "\f0e2"; }
294
- .icon-legal:before { content: "\f0e3"; }
295
- .icon-dashboard:before { content: "\f0e4"; }
296
- .icon-comment-alt:before { content: "\f0e5"; }
297
- .icon-comments-alt:before { content: "\f0e6"; }
298
- .icon-bolt:before { content: "\f0e7"; }
299
- .icon-sitemap:before { content: "\f0e8"; }
300
- .icon-umbrella:before { content: "\f0e9"; }
301
- .icon-paste:before { content: "\f0ea"; }
302
-
303
- .icon-user-md:before { content: "\f200"; }