spree_backend 2.3.13 → 2.4.0.rc1

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 (163) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/address_states.js +1 -3
  3. data/app/assets/javascripts/spree/backend/adjustments.js.coffee +1 -2
  4. data/app/assets/javascripts/spree/backend/admin.js.erb +11 -1
  5. data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -20
  6. data/app/assets/javascripts/spree/backend/line_items.js.coffee +2 -5
  7. data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb +50 -0
  8. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +2 -4
  9. data/app/assets/javascripts/spree/backend/orders/edit_form.js +2 -3
  10. data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +5 -5
  11. data/app/assets/javascripts/spree/backend/product_picker.js +2 -4
  12. data/app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee +4 -0
  13. data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +35 -0
  14. data/app/assets/javascripts/spree/backend/shipments.js.erb +39 -52
  15. data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +1 -2
  16. data/app/assets/javascripts/spree/backend/stock_transfer.js.coffee +1 -2
  17. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +8 -6
  18. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +5 -24
  19. data/app/assets/javascripts/spree/backend/taxons.js.coffee +2 -4
  20. data/app/assets/javascripts/spree/backend/user_picker.js +2 -3
  21. data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb +2 -2
  22. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +0 -5
  23. data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +5 -2
  24. data/app/assets/stylesheets/spree/backend/sections/_adjustments_table.scss +8 -0
  25. data/app/assets/stylesheets/spree/backend/sections/_products.scss +4 -0
  26. data/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss +24 -0
  27. data/app/assets/stylesheets/spree/backend/sections/_taxons.scss +1 -7
  28. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +8 -0
  29. data/app/assets/stylesheets/spree/backend/spree_admin.scss +2 -0
  30. data/app/assets/stylesheets/spree/backend.css +1 -1
  31. data/app/controllers/spree/admin/adjustments_controller.rb +1 -7
  32. data/app/controllers/spree/admin/base_controller.rb +8 -2
  33. data/app/controllers/spree/admin/customer_returns_controller.rb +67 -0
  34. data/app/controllers/spree/admin/general_settings_controller.rb +1 -1
  35. data/app/controllers/spree/admin/images_controller.rb +1 -1
  36. data/app/controllers/spree/admin/log_entries_controller.rb +2 -2
  37. data/app/controllers/spree/admin/option_types_controller.rb +1 -1
  38. data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -2
  39. data/app/controllers/spree/admin/orders_controller.rb +21 -10
  40. data/app/controllers/spree/admin/payment_methods_controller.rb +3 -3
  41. data/app/controllers/spree/admin/payments_controller.rb +6 -12
  42. data/app/controllers/spree/admin/product_properties_controller.rb +2 -2
  43. data/app/controllers/spree/admin/products_controller.rb +1 -1
  44. data/app/controllers/spree/admin/promotion_actions_controller.rb +2 -2
  45. data/app/controllers/spree/admin/promotion_categories_controller.rb +6 -0
  46. data/app/controllers/spree/admin/promotion_rules_controller.rb +2 -2
  47. data/app/controllers/spree/admin/promotions_controller.rb +2 -1
  48. data/app/controllers/spree/admin/refund_reasons_controller.rb +6 -0
  49. data/app/controllers/spree/admin/refunds_controller.rb +31 -0
  50. data/app/controllers/spree/admin/reimbursement_types_controller.rb +6 -0
  51. data/app/controllers/spree/admin/reimbursements_controller.rb +44 -0
  52. data/app/controllers/spree/admin/resource_controller.rb +2 -2
  53. data/app/controllers/spree/admin/return_authorization_reasons_controller.rb +6 -0
  54. data/app/controllers/spree/admin/return_authorizations_controller.rb +35 -5
  55. data/app/controllers/spree/admin/return_items_controller.rb +9 -0
  56. data/app/controllers/spree/admin/search_controller.rb +1 -1
  57. data/app/controllers/spree/admin/shipping_methods_controller.rb +3 -3
  58. data/app/controllers/spree/admin/states_controller.rb +1 -1
  59. data/app/controllers/spree/admin/stock_items_controller.rb +1 -1
  60. data/app/controllers/spree/admin/stock_locations_controller.rb +1 -1
  61. data/app/controllers/spree/admin/stock_transfers_controller.rb +2 -2
  62. data/app/controllers/spree/admin/tax_rates_controller.rb +1 -1
  63. data/app/controllers/spree/admin/users_controller.rb +4 -4
  64. data/app/controllers/spree/admin/variants_controller.rb +2 -2
  65. data/app/controllers/spree/admin/zones_controller.rb +1 -1
  66. data/app/helpers/spree/admin/customer_returns_helper.rb +9 -0
  67. data/app/helpers/spree/admin/navigation_helper.rb +1 -1
  68. data/app/helpers/spree/admin/reimbursement_type_helper.rb +9 -0
  69. data/app/helpers/spree/admin/reimbursements_helper.rb +14 -0
  70. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +7 -3
  71. data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +36 -0
  72. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +50 -0
  73. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +43 -0
  74. data/app/views/spree/admin/customer_returns/edit.html.erb +65 -0
  75. data/app/views/spree/admin/customer_returns/index.html.erb +60 -0
  76. data/app/views/spree/admin/customer_returns/new.html.erb +60 -0
  77. data/app/views/spree/admin/general_settings/edit.html.erb +6 -0
  78. data/app/views/spree/admin/images/_form.html.erb +6 -6
  79. data/app/views/spree/admin/log_entries/_credit_card.html.erb +4 -0
  80. data/app/views/spree/admin/log_entries/index.html.erb +2 -5
  81. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +5 -7
  82. data/app/views/spree/admin/option_types/edit.html.erb +9 -2
  83. data/app/views/spree/admin/orders/_add_line_item.html.erb +18 -0
  84. data/app/views/spree/admin/orders/_form.html.erb +7 -7
  85. data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +40 -0
  86. data/app/views/spree/admin/orders/_shipment.html.erb +1 -1
  87. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +5 -4
  88. data/app/views/spree/admin/orders/cart.html.erb +39 -0
  89. data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
  90. data/app/views/spree/admin/orders/edit.html.erb +2 -2
  91. data/app/views/spree/admin/orders/index.html.erb +8 -14
  92. data/app/views/spree/admin/payment_methods/_form.html.erb +7 -7
  93. data/app/views/spree/admin/payments/_list.html.erb +11 -3
  94. data/app/views/spree/admin/payments/index.html.erb +13 -1
  95. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +4 -6
  96. data/app/views/spree/admin/products/_form.html.erb +20 -6
  97. data/app/views/spree/admin/products/new.html.erb +3 -3
  98. data/app/views/spree/admin/products/stock.html.erb +1 -1
  99. data/app/views/spree/admin/promotion_categories/_form.html.erb +10 -0
  100. data/app/views/spree/admin/promotion_categories/edit.html.erb +17 -0
  101. data/app/views/spree/admin/promotion_categories/index.html.erb +34 -0
  102. data/app/views/spree/admin/promotion_categories/new.html.erb +16 -0
  103. data/app/views/spree/admin/promotion_rules/create.js.erb +2 -0
  104. data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
  105. data/app/views/spree/admin/promotions/_form.html.erb +5 -0
  106. data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +7 -7
  107. data/app/views/spree/admin/promotions/index.html.erb +16 -6
  108. data/app/views/spree/admin/promotions/rules/_item_total.html.erb +4 -2
  109. data/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb +0 -0
  110. data/app/views/spree/admin/promotions/rules/_taxon.html.erb +9 -0
  111. data/app/views/spree/admin/prototypes/_form.html.erb +2 -2
  112. data/app/views/spree/admin/refund_reasons/edit.html.erb +4 -0
  113. data/app/views/spree/admin/refund_reasons/index.html.erb +5 -0
  114. data/app/views/spree/admin/refund_reasons/new.html.erb +4 -0
  115. data/app/views/spree/admin/refunds/edit.html.erb +31 -0
  116. data/app/views/spree/admin/refunds/new.html.erb +43 -0
  117. data/app/views/spree/admin/reimbursement_types/index.html.erb +33 -0
  118. data/app/views/spree/admin/reimbursements/edit.html.erb +108 -0
  119. data/app/views/spree/admin/reimbursements/index.html.erb +34 -0
  120. data/app/views/spree/admin/reimbursements/show.html.erb +94 -0
  121. data/app/views/spree/admin/return_authorization_reasons/edit.html.erb +4 -0
  122. data/app/views/spree/admin/return_authorization_reasons/index.html.erb +5 -0
  123. data/app/views/spree/admin/return_authorization_reasons/new.html.erb +4 -0
  124. data/app/views/spree/admin/return_authorizations/_form.html.erb +62 -50
  125. data/app/views/spree/admin/return_authorizations/edit.html.erb +6 -8
  126. data/app/views/spree/admin/return_authorizations/index.html.erb +3 -4
  127. data/app/views/spree/admin/return_authorizations/new.html.erb +1 -1
  128. data/app/views/spree/admin/shared/_configuration_menu.html.erb +5 -2
  129. data/app/views/spree/admin/shared/_destroy.js.erb +1 -1
  130. data/app/views/spree/admin/shared/_head.html.erb +1 -2
  131. data/app/views/spree/admin/shared/_order_submenu.html.erb +17 -3
  132. data/app/views/spree/admin/shared/_order_summary.html.erb +7 -0
  133. data/app/views/spree/admin/shared/_product_tabs.html.erb +1 -0
  134. data/app/views/spree/admin/shared/_refunds.html.erb +32 -0
  135. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +12 -12
  136. data/app/views/spree/admin/shared/_tabs.html.erb +2 -2
  137. data/app/views/spree/admin/shared/named_types/_edit.html.erb +17 -0
  138. data/app/views/spree/admin/shared/named_types/_form.html.erb +16 -0
  139. data/app/views/spree/admin/shared/named_types/_index.html.erb +52 -0
  140. data/app/views/spree/admin/shared/named_types/_new.html.erb +16 -0
  141. data/app/views/spree/admin/shipping_categories/_form.html.erb +1 -1
  142. data/app/views/spree/admin/shipping_methods/_form.html.erb +8 -0
  143. data/app/views/spree/admin/stock_locations/_form.html.erb +77 -59
  144. data/app/views/spree/admin/stock_transfers/new.html.erb +2 -2
  145. data/app/views/spree/admin/tax_categories/_form.html.erb +9 -2
  146. data/app/views/spree/admin/tax_categories/index.html.erb +4 -1
  147. data/app/views/spree/admin/taxons/index.html.erb +4 -0
  148. data/app/views/spree/admin/trackers/_form.html.erb +4 -4
  149. data/app/views/spree/admin/users/_form.html.erb +1 -1
  150. data/app/views/spree/admin/users/index.html.erb +1 -1
  151. data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb +49 -0
  152. data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +0 -1
  153. data/app/views/spree/admin/variants/_split.js.erb +1 -1
  154. data/app/views/spree/admin/zones/_form.html.erb +1 -1
  155. data/config/initializers/assets.rb +1 -1
  156. data/config/routes.rb +22 -1
  157. metadata +62 -32
  158. data/app/controllers/spree/admin/inventory_units_controller.rb +0 -6
  159. data/app/controllers/spree/admin/line_items_controller.rb +0 -49
  160. data/app/controllers/spree/admin/overview_controller.rb +0 -11
  161. data/app/views/spree/admin/inventory_units/adjust.html.erb +0 -31
  162. data/app/views/spree/test_mailer/test_email.text.erb +0 -4
  163. data/config/locales/en.yml +0 -6
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.3.13
4
+ version: 2.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: 2015-08-19 00:00:00.000000000 Z
11
+ date: 2014-10-09 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.3.13
19
+ version: 2.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: 2.3.13
26
+ version: 2.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: 2.3.13
33
+ version: 2.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: 2.3.13
40
+ version: 2.4.0.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -68,32 +68,18 @@ dependencies:
68
68
  version: 5.0.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: select2-rails
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - '='
74
- - !ruby/object:Gem::Version
75
- version: 3.5.9.1
76
- type: :runtime
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - '='
81
- - !ruby/object:Gem::Version
82
- version: 3.5.9.1
83
- - !ruby/object:Gem::Dependency
84
- name: email_spec
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
73
  - - "~>"
88
74
  - !ruby/object:Gem::Version
89
- version: 1.2.1
90
- type: :development
75
+ version: 3.5.0
76
+ type: :runtime
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
80
  - - "~>"
95
81
  - !ruby/object:Gem::Version
96
- version: 1.2.1
82
+ version: 3.5.0
97
83
  description: Required dependency for Spree
98
84
  email: sean@spreecommerce.com
99
85
  executables: []
@@ -115,6 +101,7 @@ files:
115
101
  - app/assets/javascripts/spree/backend/images/new.js.coffee
116
102
  - app/assets/javascripts/spree/backend/index.html
117
103
  - app/assets/javascripts/spree/backend/line_items.js.coffee
104
+ - app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb
118
105
  - app/assets/javascripts/spree/backend/nested-attribute.js
119
106
  - app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb
120
107
  - app/assets/javascripts/spree/backend/orders/edit.js
@@ -124,6 +111,8 @@ files:
124
111
  - app/assets/javascripts/spree/backend/product_picker.js
125
112
  - app/assets/javascripts/spree/backend/progress.coffee
126
113
  - app/assets/javascripts/spree/backend/promotions.js
114
+ - app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee
115
+ - app/assets/javascripts/spree/backend/returns/return_item_selection.js
127
116
  - app/assets/javascripts/spree/backend/select_payments.js.coffee
128
117
  - app/assets/javascripts/spree/backend/shipments.js.erb
129
118
  - app/assets/javascripts/spree/backend/spree-select2.js.erb
@@ -163,6 +152,7 @@ files:
163
152
  - app/assets/stylesheets/spree/backend/plugins/_powertip.scss
164
153
  - app/assets/stylesheets/spree/backend/plugins/_select2.scss
165
154
  - app/assets/stylesheets/spree/backend/plugins/_token-input.scss
155
+ - app/assets/stylesheets/spree/backend/sections/_adjustments_table.scss
166
156
  - app/assets/stylesheets/spree/backend/sections/_alerts.scss
167
157
  - app/assets/stylesheets/spree/backend/sections/_bulk_transfer.scss
168
158
  - app/assets/stylesheets/spree/backend/sections/_edit_checkouts.scss
@@ -172,6 +162,7 @@ files:
172
162
  - app/assets/stylesheets/spree/backend/sections/_overview.scss
173
163
  - app/assets/stylesheets/spree/backend/sections/_products.scss
174
164
  - app/assets/stylesheets/spree/backend/sections/_promotions.scss
165
+ - app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss
175
166
  - app/assets/stylesheets/spree/backend/sections/_tax_zones.scss
176
167
  - app/assets/stylesheets/spree/backend/sections/_taxons.scss
177
168
  - app/assets/stylesheets/spree/backend/sections/_users.scss
@@ -185,28 +176,33 @@ files:
185
176
  - app/controllers/spree/admin/adjustments_controller.rb
186
177
  - app/controllers/spree/admin/base_controller.rb
187
178
  - app/controllers/spree/admin/countries_controller.rb
179
+ - app/controllers/spree/admin/customer_returns_controller.rb
188
180
  - app/controllers/spree/admin/general_settings_controller.rb
189
181
  - app/controllers/spree/admin/images_controller.rb
190
- - app/controllers/spree/admin/inventory_units_controller.rb
191
- - app/controllers/spree/admin/line_items_controller.rb
192
182
  - app/controllers/spree/admin/log_entries_controller.rb
193
183
  - app/controllers/spree/admin/option_types_controller.rb
194
184
  - app/controllers/spree/admin/option_values_controller.rb
195
185
  - app/controllers/spree/admin/orders/customer_details_controller.rb
196
186
  - app/controllers/spree/admin/orders_controller.rb
197
- - app/controllers/spree/admin/overview_controller.rb
198
187
  - app/controllers/spree/admin/payment_methods_controller.rb
199
188
  - app/controllers/spree/admin/payments_controller.rb
200
189
  - app/controllers/spree/admin/product_properties_controller.rb
201
190
  - app/controllers/spree/admin/products_controller.rb
202
191
  - app/controllers/spree/admin/promotion_actions_controller.rb
192
+ - app/controllers/spree/admin/promotion_categories_controller.rb
203
193
  - app/controllers/spree/admin/promotion_rules_controller.rb
204
194
  - app/controllers/spree/admin/promotions_controller.rb
205
195
  - app/controllers/spree/admin/properties_controller.rb
206
196
  - app/controllers/spree/admin/prototypes_controller.rb
197
+ - app/controllers/spree/admin/refund_reasons_controller.rb
198
+ - app/controllers/spree/admin/refunds_controller.rb
199
+ - app/controllers/spree/admin/reimbursement_types_controller.rb
200
+ - app/controllers/spree/admin/reimbursements_controller.rb
207
201
  - app/controllers/spree/admin/reports_controller.rb
208
202
  - app/controllers/spree/admin/resource_controller.rb
203
+ - app/controllers/spree/admin/return_authorization_reasons_controller.rb
209
204
  - app/controllers/spree/admin/return_authorizations_controller.rb
205
+ - app/controllers/spree/admin/return_items_controller.rb
210
206
  - app/controllers/spree/admin/search_controller.rb
211
207
  - app/controllers/spree/admin/shipping_categories_controller.rb
212
208
  - app/controllers/spree/admin/shipping_methods_controller.rb
@@ -226,6 +222,7 @@ files:
226
222
  - app/controllers/spree/admin/zones_controller.rb
227
223
  - app/helpers/spree/admin/adjustments_helper.rb
228
224
  - app/helpers/spree/admin/base_helper.rb
225
+ - app/helpers/spree/admin/customer_returns_helper.rb
229
226
  - app/helpers/spree/admin/general_settings_helper.rb
230
227
  - app/helpers/spree/admin/images_helper.rb
231
228
  - app/helpers/spree/admin/inventory_settings_helper.rb
@@ -233,6 +230,8 @@ files:
233
230
  - app/helpers/spree/admin/orders_helper.rb
234
231
  - app/helpers/spree/admin/payments_helper.rb
235
232
  - app/helpers/spree/admin/products_helper.rb
233
+ - app/helpers/spree/admin/reimbursement_type_helper.rb
234
+ - app/helpers/spree/admin/reimbursements_helper.rb
236
235
  - app/helpers/spree/admin/stock_locations_helper.rb
237
236
  - app/helpers/spree/admin/stock_movements_helper.rb
238
237
  - app/helpers/spree/admin/tables_helper.rb
@@ -249,14 +248,20 @@ files:
249
248
  - app/views/spree/admin/countries/edit.html.erb
250
249
  - app/views/spree/admin/countries/index.html.erb
251
250
  - app/views/spree/admin/countries/new.html.erb
251
+ - app/views/spree/admin/customer_returns/_reimbursements_table.html.erb
252
+ - app/views/spree/admin/customer_returns/_return_item_decision.html.erb
253
+ - app/views/spree/admin/customer_returns/_return_item_selection.html.erb
254
+ - app/views/spree/admin/customer_returns/edit.html.erb
255
+ - app/views/spree/admin/customer_returns/index.html.erb
256
+ - app/views/spree/admin/customer_returns/new.html.erb
252
257
  - app/views/spree/admin/general_settings/edit.html.erb
253
258
  - app/views/spree/admin/images/_form.html.erb
254
259
  - app/views/spree/admin/images/edit.html.erb
255
260
  - app/views/spree/admin/images/index.html.erb
256
261
  - app/views/spree/admin/images/new.html.erb
257
- - app/views/spree/admin/inventory_units/adjust.html.erb
258
262
  - app/views/spree/admin/line_items/create.js.erb
259
263
  - app/views/spree/admin/line_items/destroy.js.erb
264
+ - app/views/spree/admin/log_entries/_credit_card.html.erb
260
265
  - app/views/spree/admin/log_entries/index.html.erb
261
266
  - app/views/spree/admin/option_types/_form.html.erb
262
267
  - app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -264,14 +269,17 @@ files:
264
269
  - app/views/spree/admin/option_types/index.html.erb
265
270
  - app/views/spree/admin/option_types/new.html.erb
266
271
  - app/views/spree/admin/option_types/new.js.erb
272
+ - app/views/spree/admin/orders/_add_line_item.html.erb
267
273
  - app/views/spree/admin/orders/_add_product.html.erb
268
274
  - app/views/spree/admin/orders/_adjustments.html.erb
269
275
  - app/views/spree/admin/orders/_form.html.erb
270
276
  - app/views/spree/admin/orders/_line_item.html.erb
271
277
  - app/views/spree/admin/orders/_line_items.html.erb
278
+ - app/views/spree/admin/orders/_line_items_edit_form.html.erb
272
279
  - app/views/spree/admin/orders/_risk_analysis.html.erb
273
280
  - app/views/spree/admin/orders/_shipment.html.erb
274
281
  - app/views/spree/admin/orders/_shipment_manifest.html.erb
282
+ - app/views/spree/admin/orders/cart.html.erb
275
283
  - app/views/spree/admin/orders/customer_details/_form.html.erb
276
284
  - app/views/spree/admin/orders/customer_details/edit.html.erb
277
285
  - app/views/spree/admin/orders/edit.html.erb
@@ -305,6 +313,10 @@ files:
305
313
  - app/views/spree/admin/products/stock.html.erb
306
314
  - app/views/spree/admin/promotion_actions/create.js.erb
307
315
  - app/views/spree/admin/promotion_actions/destroy.js.erb
316
+ - app/views/spree/admin/promotion_categories/_form.html.erb
317
+ - app/views/spree/admin/promotion_categories/edit.html.erb
318
+ - app/views/spree/admin/promotion_categories/index.html.erb
319
+ - app/views/spree/admin/promotion_categories/new.html.erb
308
320
  - app/views/spree/admin/promotion_rules/create.js.erb
309
321
  - app/views/spree/admin/promotion_rules/destroy.js.erb
310
322
  - app/views/spree/admin/promotions/_actions.html.erb
@@ -326,7 +338,9 @@ files:
326
338
  - app/views/spree/admin/promotions/rules/_first_order.html.erb
327
339
  - app/views/spree/admin/promotions/rules/_item_total.html.erb
328
340
  - app/views/spree/admin/promotions/rules/_landing_page.html.erb
341
+ - app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb
329
342
  - app/views/spree/admin/promotions/rules/_product.html.erb
343
+ - app/views/spree/admin/promotions/rules/_taxon.html.erb
330
344
  - app/views/spree/admin/promotions/rules/_user.html.erb
331
345
  - app/views/spree/admin/promotions/rules/_user_logged_in.html.erb
332
346
  - app/views/spree/admin/properties/_form.html.erb
@@ -344,8 +358,20 @@ files:
344
358
  - app/views/spree/admin/prototypes/new.js.erb
345
359
  - app/views/spree/admin/prototypes/select.js.erb
346
360
  - app/views/spree/admin/prototypes/show.html.erb
361
+ - app/views/spree/admin/refund_reasons/edit.html.erb
362
+ - app/views/spree/admin/refund_reasons/index.html.erb
363
+ - app/views/spree/admin/refund_reasons/new.html.erb
364
+ - app/views/spree/admin/refunds/edit.html.erb
365
+ - app/views/spree/admin/refunds/new.html.erb
366
+ - app/views/spree/admin/reimbursement_types/index.html.erb
367
+ - app/views/spree/admin/reimbursements/edit.html.erb
368
+ - app/views/spree/admin/reimbursements/index.html.erb
369
+ - app/views/spree/admin/reimbursements/show.html.erb
347
370
  - app/views/spree/admin/reports/index.html.erb
348
371
  - app/views/spree/admin/reports/sales_total.html.erb
372
+ - app/views/spree/admin/return_authorization_reasons/edit.html.erb
373
+ - app/views/spree/admin/return_authorization_reasons/index.html.erb
374
+ - app/views/spree/admin/return_authorization_reasons/new.html.erb
349
375
  - app/views/spree/admin/return_authorizations/_form.html.erb
350
376
  - app/views/spree/admin/return_authorizations/edit.html.erb
351
377
  - app/views/spree/admin/return_authorizations/index.html.erb
@@ -368,6 +394,7 @@ files:
368
394
  - app/views/spree/admin/shared/_order_tabs.html.erb
369
395
  - app/views/spree/admin/shared/_product_sub_menu.html.erb
370
396
  - app/views/spree/admin/shared/_product_tabs.html.erb
397
+ - app/views/spree/admin/shared/_refunds.html.erb
371
398
  - app/views/spree/admin/shared/_report_criteria.html.erb
372
399
  - app/views/spree/admin/shared/_report_order_criteria.html.erb
373
400
  - app/views/spree/admin/shared/_show_resource_links.html.erb
@@ -377,6 +404,10 @@ files:
377
404
  - app/views/spree/admin/shared/_tabs.html.erb
378
405
  - app/views/spree/admin/shared/_translations.html.erb
379
406
  - app/views/spree/admin/shared/_update_order_state.js
407
+ - app/views/spree/admin/shared/named_types/_edit.html.erb
408
+ - app/views/spree/admin/shared/named_types/_form.html.erb
409
+ - app/views/spree/admin/shared/named_types/_index.html.erb
410
+ - app/views/spree/admin/shared/named_types/_new.html.erb
380
411
  - app/views/spree/admin/shipping_categories/_form.html.erb
381
412
  - app/views/spree/admin/shipping_categories/edit.html.erb
382
413
  - app/views/spree/admin/shipping_categories/index.html.erb
@@ -441,6 +472,7 @@ files:
441
472
  - app/views/spree/admin/users/new.html.erb
442
473
  - app/views/spree/admin/users/orders.html.erb
443
474
  - app/views/spree/admin/variants/_autocomplete.js.erb
475
+ - app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb
444
476
  - app/views/spree/admin/variants/_autocomplete_stock.js.erb
445
477
  - app/views/spree/admin/variants/_form.html.erb
446
478
  - app/views/spree/admin/variants/_split.js.erb
@@ -456,10 +488,8 @@ files:
456
488
  - app/views/spree/admin/zones/index.html.erb
457
489
  - app/views/spree/admin/zones/new.html.erb
458
490
  - app/views/spree/layouts/admin.html.erb
459
- - app/views/spree/test_mailer/test_email.text.erb
460
491
  - config/initializers/assets.rb
461
492
  - config/initializers/form_builder.rb
462
- - config/locales/en.yml
463
493
  - config/routes.rb
464
494
  - lib/spree/backend.rb
465
495
  - lib/spree/backend/action_callbacks.rb
@@ -521,13 +551,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
521
551
  version: 1.9.3
522
552
  required_rubygems_version: !ruby/object:Gem::Requirement
523
553
  requirements:
524
- - - ">="
554
+ - - ">"
525
555
  - !ruby/object:Gem::Version
526
- version: '0'
556
+ version: 1.3.1
527
557
  requirements:
528
558
  - none
529
559
  rubyforge_project: spree_backend
530
- rubygems_version: 2.4.5
560
+ rubygems_version: 2.2.2
531
561
  signing_key:
532
562
  specification_version: 4
533
563
  summary: backend e-commerce functionality for the Spree project.
@@ -1,6 +0,0 @@
1
- module Spree
2
- module Admin
3
- class InventoryUnitsController < Spree::Admin::BaseController
4
- end
5
- end
6
- end
@@ -1,49 +0,0 @@
1
- module Spree
2
- module Admin
3
- class LineItemsController < Spree::Admin::BaseController
4
- layout nil, :only => [:create, :destroy, :update]
5
-
6
- before_filter :load_order
7
- before_filter :load_line_item, :only => [:destroy, :update]
8
-
9
- respond_to :html, :js
10
-
11
- def create
12
- variant = Variant.find(params[:line_item][:variant_id])
13
- @line_item = @order.contents.add(variant, params[:line_item][:quantity].to_i)
14
-
15
- if @order.save
16
- render_order_form
17
- else
18
- respond_with(@line_item) do |format|
19
- format.js { render :action => 'create', :locals => { :order => @order.reload } }
20
- end
21
- end
22
- end
23
-
24
- def destroy
25
- @line_item.destroy
26
- render_order_form
27
- end
28
-
29
- def update
30
- @line_item.update_attributes(params[:line_item])
31
- render_order_form
32
- end
33
-
34
- private
35
- def render_order_form
36
- render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload }
37
- end
38
-
39
- def load_order
40
- @order = Order.find_by_number!(params[:order_id])
41
- authorize! action, @order
42
- end
43
-
44
- def load_line_item
45
- @line_item = @order.line_items.find(params[:id])
46
- end
47
- end
48
- end
49
- end
@@ -1,11 +0,0 @@
1
- # this clas was inspired (heavily) from the mephisto admin architecture
2
- module Spree
3
- module Admin
4
- class OverviewController < Spree::Admin::BaseController
5
- def index
6
- @users = User.all
7
- end
8
-
9
- end
10
- end
11
- end
@@ -1,31 +0,0 @@
1
- <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @level } %>
2
-
3
- <%= form_tag do %>
4
- <br /><br />
5
-
6
- <h1><%= Spree.t(:inventory_adjustment) %></h1>
7
-
8
- <table class="basic-table">
9
- <thead data-hook="inventory_header">
10
- <tr>
11
- <th><%= Spree.t(:sku) %></th>
12
- <th><%= Spree.t(:product) %></th>
13
- <th><%= Spree.t(:options) %></th>
14
- <th><%= Spree.t(:adjustment) %></th>
15
- </tr>
16
- </thead>
17
- <tbody>
18
- <tr data-hook="inventory_row">
19
- <td><%= @variant.sku %></td>
20
- <td><%= @variant.product.name %></td>
21
- <td><%= variant_options @variant %></td>
22
- <td>
23
- <%= text_field :level, :adjustment, :class => 'quantity' %>
24
- </td>
25
- </tr>
26
- </tbody>
27
- </table>
28
- <%= submit_tag Spree.t('actions.update') %>
29
- <%= Spree.t(:or) %>
30
- <%= link_to Spree.t('actions.cancel'), :controller => 'overview', :action => :index %>
31
- <% end %>
@@ -1,4 +0,0 @@
1
- <%= Spree.t('test_mailer.test_email.greeting') %>
2
- ================
3
-
4
- <%= Spree.t('test_mailer.test_email.message') %>
@@ -1,6 +0,0 @@
1
- en:
2
- spree:
3
- info_product_has_multiple_skus: "This product has %{count} variants:"
4
- info_number_of_skus_not_shown:
5
- one: "and one other"
6
- other: "and %{count} others"