solidus_backend 2.10.3 → 2.11.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of solidus_backend might be problematic. Click here for more details.

Files changed (233) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend.js +4 -1
  3. data/app/assets/javascripts/spree/backend/adjustments.js +1 -1
  4. data/app/assets/javascripts/spree/backend/admin.js +18 -29
  5. data/app/assets/javascripts/spree/backend/collections/states.js +1 -1
  6. data/app/assets/javascripts/spree/backend/components/selectable_table.js +5 -0
  7. data/app/assets/javascripts/spree/backend/components/selectable_table/return_items.js +5 -0
  8. data/app/assets/javascripts/spree/backend/components/selectable_table/summary.js +7 -0
  9. data/app/assets/javascripts/spree/backend/components/sortable_table.js +31 -25
  10. data/app/assets/javascripts/spree/backend/models/order.js +3 -3
  11. data/app/assets/javascripts/spree/backend/models/payment.js +1 -1
  12. data/app/assets/javascripts/spree/backend/models/shipment.js +1 -1
  13. data/app/assets/javascripts/spree/backend/models/stock_item.js +1 -1
  14. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +2 -2
  15. data/app/assets/javascripts/spree/backend/option_value_picker.js +2 -2
  16. data/app/assets/javascripts/spree/backend/product_picker.js +2 -2
  17. data/app/assets/javascripts/spree/backend/routes.js +40 -21
  18. data/app/assets/javascripts/spree/backend/shipments.js +5 -5
  19. data/app/assets/javascripts/spree/backend/shipping_methods/stock_locations_picker.js +18 -0
  20. data/app/assets/javascripts/spree/backend/stock_management.js +4 -2
  21. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +2 -2
  22. data/app/assets/javascripts/spree/backend/taxons.js +3 -3
  23. data/app/assets/javascripts/spree/backend/templates/index.js +2 -0
  24. data/app/assets/javascripts/spree/backend/templates/orders/customer_details/autocomplete.hbs +2 -2
  25. data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +5 -1
  26. data/app/assets/javascripts/spree/backend/templates/tables/return_item_sum_amount.hbs +7 -0
  27. data/app/assets/javascripts/spree/backend/templates/tables/selectable_label.hbs +6 -0
  28. data/app/assets/javascripts/spree/backend/user_picker.js +3 -4
  29. data/app/assets/javascripts/spree/backend/variant_autocomplete.js +2 -2
  30. data/app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js +2 -2
  31. data/app/assets/javascripts/spree/backend/views/index.js +4 -0
  32. data/app/assets/javascripts/spree/backend/views/order/address.js +1 -1
  33. data/app/assets/javascripts/spree/backend/views/order/customer_select.js +2 -3
  34. data/app/assets/javascripts/spree/backend/views/order/details_adjustments.js +4 -1
  35. data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js +4 -0
  36. data/app/assets/javascripts/spree/backend/views/tables/return_items.js +9 -0
  37. data/app/assets/javascripts/spree/backend/views/tables/selectable_table.js +70 -0
  38. data/app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js +32 -0
  39. data/app/assets/javascripts/spree/backend/views/tables/selectable_table/summary.js +45 -0
  40. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +4 -5
  41. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +5 -1
  42. data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +4 -0
  43. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +1 -0
  44. data/app/controllers/spree/admin/base_controller.rb +6 -0
  45. data/app/controllers/spree/admin/cancellations_controller.rb +2 -0
  46. data/app/controllers/spree/admin/customer_returns_controller.rb +4 -4
  47. data/app/controllers/spree/admin/images_controller.rb +2 -1
  48. data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -0
  49. data/app/controllers/spree/admin/orders_controller.rb +7 -2
  50. data/app/controllers/spree/admin/payments_controller.rb +3 -1
  51. data/app/controllers/spree/admin/product_properties_controller.rb +1 -1
  52. data/app/controllers/spree/admin/products_controller.rb +18 -24
  53. data/app/controllers/spree/admin/promotion_codes_controller.rb +9 -4
  54. data/app/controllers/spree/admin/refunds_controller.rb +19 -0
  55. data/app/controllers/spree/admin/resource_controller.rb +27 -7
  56. data/app/controllers/spree/admin/return_authorizations_controller.rb +1 -1
  57. data/app/controllers/spree/admin/root_controller.rb +1 -1
  58. data/app/controllers/spree/admin/search_controller.rb +1 -2
  59. data/app/controllers/spree/admin/stock_items_controller.rb +6 -5
  60. data/app/controllers/spree/admin/stock_locations_controller.rb +4 -0
  61. data/app/controllers/spree/admin/stock_movements_controller.rb +7 -0
  62. data/app/controllers/spree/admin/taxons_controller.rb +12 -1
  63. data/app/controllers/spree/admin/users/api_key_controller.rb +29 -0
  64. data/app/controllers/spree/admin/users_controller.rb +37 -20
  65. data/app/controllers/spree/admin/variants_controller.rb +4 -2
  66. data/app/controllers/spree/admin/zones_controller.rb +1 -1
  67. data/app/helpers/spree/admin/base_helper.rb +4 -0
  68. data/app/helpers/spree/admin/customer_returns_helper.rb +1 -1
  69. data/app/helpers/spree/admin/navigation_helper.rb +1 -1
  70. data/app/helpers/spree/admin/orders_helper.rb +8 -4
  71. data/app/helpers/spree/admin/stock_movements_helper.rb +8 -4
  72. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +2 -3
  73. data/app/views/spree/admin/images/index.html.erb +25 -21
  74. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +8 -1
  75. data/app/views/spree/admin/option_types/edit.html.erb +3 -1
  76. data/app/views/spree/admin/orders/customer_details/_form.html.erb +13 -13
  77. data/app/views/spree/admin/orders/index.html.erb +23 -13
  78. data/app/views/spree/admin/payment_methods/_form.html.erb +7 -2
  79. data/app/views/spree/admin/payments/index.html.erb +3 -1
  80. data/app/views/spree/admin/prices/_master_variant_table.html.erb +3 -3
  81. data/app/views/spree/admin/prices/_table.html.erb +3 -3
  82. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +7 -2
  83. data/app/views/spree/admin/product_properties/index.html.erb +14 -2
  84. data/app/views/spree/admin/products/_form.html.erb +13 -2
  85. data/app/views/spree/admin/products/index.html.erb +1 -1
  86. data/app/views/spree/admin/promotion_codes/index.html.erb +1 -1
  87. data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
  88. data/app/views/spree/admin/promotions/_activations_new.html.erb +1 -1
  89. data/app/views/spree/admin/promotions/_rules.html.erb +1 -1
  90. data/app/views/spree/admin/promotions/edit.html.erb +2 -2
  91. data/app/views/spree/admin/promotions/index.html.erb +12 -5
  92. data/app/views/spree/admin/return_authorizations/_form.html.erb +3 -10
  93. data/app/views/spree/admin/return_authorizations/index.html.erb +1 -1
  94. data/app/views/spree/admin/search/users.json.jbuilder +15 -1
  95. data/app/views/spree/admin/shared/_address.html.erb +6 -6
  96. data/app/views/spree/admin/shared/_address_form.html.erb +15 -8
  97. data/app/views/spree/admin/shared/_order_submenu.html.erb +4 -4
  98. data/app/views/spree/admin/shared/_payments_tabs.html.erb +1 -1
  99. data/app/views/spree/admin/shared/_settings_checkout_tabs.html.erb +5 -5
  100. data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +6 -6
  101. data/app/views/spree/admin/shared/_shipping_tabs.html.erb +3 -3
  102. data/app/views/spree/admin/shared/_taxes_tabs.html.erb +2 -2
  103. data/app/views/spree/admin/shared/preference_fields/_encrypted_string.html.erb +12 -0
  104. data/app/views/spree/admin/shipping_methods/_form.html.erb +18 -0
  105. data/app/views/spree/admin/stock_items/_stock_management.html.erb +1 -1
  106. data/app/views/spree/admin/stock_locations/edit.html.erb +1 -1
  107. data/app/views/spree/admin/stock_locations/index.html.erb +3 -1
  108. data/app/views/spree/admin/stock_movements/index.html.erb +30 -1
  109. data/app/views/spree/admin/stores/_form.html.erb +6 -0
  110. data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb +27 -3
  111. data/app/views/spree/admin/tax_categories/_form.html.erb +1 -0
  112. data/app/views/spree/admin/users/_form.html.erb +2 -2
  113. data/app/views/spree/admin/users/_tabs.html.erb +1 -1
  114. data/app/views/spree/admin/users/edit.html.erb +4 -4
  115. data/app/views/spree/admin/users/items.html.erb +5 -3
  116. data/app/views/spree/admin/users/orders.html.erb +5 -3
  117. data/app/views/spree/admin/variants/_table_filter.html.erb +1 -1
  118. data/app/views/spree/admin/variants/index.html.erb +2 -2
  119. data/config/initializers/form_builder.rb +2 -2
  120. data/lib/spree/backend/engine.rb +0 -2
  121. data/lib/spree/backend_configuration.rb +14 -1
  122. data/solidus_backend.gemspec +4 -4
  123. metadata +21 -120
  124. data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +0 -35
  125. data/script/rails +0 -10
  126. data/spec/controllers/spree/admin/base_controller_spec.rb +0 -26
  127. data/spec/controllers/spree/admin/cancellations_controller_spec.rb +0 -83
  128. data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +0 -235
  129. data/spec/controllers/spree/admin/locale_controller_spec.rb +0 -45
  130. data/spec/controllers/spree/admin/missing_products_controller_spec.rb +0 -18
  131. data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +0 -128
  132. data/spec/controllers/spree/admin/orders_controller_spec.rb +0 -408
  133. data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +0 -95
  134. data/spec/controllers/spree/admin/payments_controller_spec.rb +0 -194
  135. data/spec/controllers/spree/admin/prices_controller_spec.rb +0 -45
  136. data/spec/controllers/spree/admin/product_properties_controller_spec.rb +0 -71
  137. data/spec/controllers/spree/admin/products_controller_spec.rb +0 -270
  138. data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +0 -23
  139. data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +0 -32
  140. data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +0 -36
  141. data/spec/controllers/spree/admin/promotions_controller_spec.rb +0 -122
  142. data/spec/controllers/spree/admin/refunds_controller_spec.rb +0 -35
  143. data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +0 -137
  144. data/spec/controllers/spree/admin/resource_controller_spec.rb +0 -201
  145. data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +0 -291
  146. data/spec/controllers/spree/admin/return_items_controller_spec.rb +0 -29
  147. data/spec/controllers/spree/admin/root_controller_spec.rb +0 -43
  148. data/spec/controllers/spree/admin/search_controller_spec.rb +0 -106
  149. data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +0 -16
  150. data/spec/controllers/spree/admin/stock_items_controller_spec.rb +0 -52
  151. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +0 -44
  152. data/spec/controllers/spree/admin/store_credits_controller_spec.rb +0 -311
  153. data/spec/controllers/spree/admin/users_controller_spec.rb +0 -287
  154. data/spec/controllers/spree/admin/variants_controller_spec.rb +0 -71
  155. data/spec/features/admin/configuration/payment_methods_spec.rb +0 -176
  156. data/spec/features/admin/configuration/shipping_methods_spec.rb +0 -126
  157. data/spec/features/admin/configuration/stock_locations_spec.rb +0 -54
  158. data/spec/features/admin/configuration/store_spec.rb +0 -62
  159. data/spec/features/admin/configuration/tax_categories_spec.rb +0 -58
  160. data/spec/features/admin/configuration/tax_rates_spec.rb +0 -31
  161. data/spec/features/admin/configuration/taxonomies_spec.rb +0 -61
  162. data/spec/features/admin/configuration/zones_spec.rb +0 -41
  163. data/spec/features/admin/homepage_spec.rb +0 -86
  164. data/spec/features/admin/javascript_format_money_spec.rb +0 -22
  165. data/spec/features/admin/locale_spec.rb +0 -34
  166. data/spec/features/admin/orders/adjustments_promotions_spec.rb +0 -55
  167. data/spec/features/admin/orders/adjustments_spec.rb +0 -130
  168. data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +0 -45
  169. data/spec/features/admin/orders/cancelling_inventory_spec.rb +0 -50
  170. data/spec/features/admin/orders/customer_details_spec.rb +0 -203
  171. data/spec/features/admin/orders/customer_returns_spec.rb +0 -41
  172. data/spec/features/admin/orders/line_items_spec.rb +0 -52
  173. data/spec/features/admin/orders/listing_spec.rb +0 -186
  174. data/spec/features/admin/orders/log_entries_spec.rb +0 -56
  175. data/spec/features/admin/orders/new_order_spec.rb +0 -379
  176. data/spec/features/admin/orders/new_refund_spec.rb +0 -35
  177. data/spec/features/admin/orders/order_details_spec.rb +0 -591
  178. data/spec/features/admin/orders/payments_spec.rb +0 -330
  179. data/spec/features/admin/orders/return_authorizations_spec.rb +0 -56
  180. data/spec/features/admin/orders/return_payment_state_spec.rb +0 -65
  181. data/spec/features/admin/orders/risk_analysis_spec.rb +0 -49
  182. data/spec/features/admin/orders/shipments_spec.rb +0 -145
  183. data/spec/features/admin/payments/store_credits_spec.rb +0 -23
  184. data/spec/features/admin/products/edit/images_spec.rb +0 -76
  185. data/spec/features/admin/products/edit/products_spec.rb +0 -92
  186. data/spec/features/admin/products/edit/taxons_spec.rb +0 -57
  187. data/spec/features/admin/products/edit/variants_spec.rb +0 -63
  188. data/spec/features/admin/products/option_types_spec.rb +0 -116
  189. data/spec/features/admin/products/pricing_spec.rb +0 -127
  190. data/spec/features/admin/products/products_spec.rb +0 -348
  191. data/spec/features/admin/products/properties_spec.rb +0 -141
  192. data/spec/features/admin/products/stock_management_spec.rb +0 -101
  193. data/spec/features/admin/products/variant_spec.rb +0 -89
  194. data/spec/features/admin/promotion_adjustments_spec.rb +0 -286
  195. data/spec/features/admin/promotions/option_value_rule_spec.rb +0 -90
  196. data/spec/features/admin/promotions/product_rule_spec.rb +0 -35
  197. data/spec/features/admin/promotions/promotion_categories_spec.rb +0 -83
  198. data/spec/features/admin/promotions/promotion_code_batches_spec.rb +0 -37
  199. data/spec/features/admin/promotions/promotion_code_spec.rb +0 -31
  200. data/spec/features/admin/promotions/promotion_spec.rb +0 -52
  201. data/spec/features/admin/promotions/tiered_calculator_spec.rb +0 -76
  202. data/spec/features/admin/promotions/user_rule_spec.rb +0 -42
  203. data/spec/features/admin/reimbursements_spec.rb +0 -18
  204. data/spec/features/admin/store_credits_spec.rb +0 -132
  205. data/spec/features/admin/stores_spec.rb +0 -37
  206. data/spec/features/admin/style_guide_spec.rb +0 -14
  207. data/spec/features/admin/taxons_spec.rb +0 -90
  208. data/spec/features/admin/users_spec.rb +0 -412
  209. data/spec/fixtures/files/ror_ringer.jpeg +0 -0
  210. data/spec/helpers/admin/base_helper_spec.rb +0 -49
  211. data/spec/helpers/admin/navigation_helper_spec.rb +0 -139
  212. data/spec/helpers/admin/stock_movements_helper_spec.rb +0 -29
  213. data/spec/helpers/admin/store_credit_events_helper_spec.rb +0 -97
  214. data/spec/helpers/promotion_rules_helper_spec.rb +0 -14
  215. data/spec/javascripts/fixtures/_boot.html.erb +0 -8
  216. data/spec/javascripts/fixtures/number_with_currency/with_currency_select.html.erb +0 -3
  217. data/spec/javascripts/fixtures/number_with_currency/without_select.html.erb +0 -3
  218. data/spec/javascripts/format_money_spec.js +0 -48
  219. data/spec/javascripts/spec_helper.js +0 -13
  220. data/spec/javascripts/support/show_errors.js +0 -8
  221. data/spec/javascripts/support/with_translations.js +0 -11
  222. data/spec/javascripts/translation_spec.js +0 -58
  223. data/spec/javascripts/views/number_with_currency_spec.js +0 -72
  224. data/spec/lib/spree/backend_configuration/menu_item_spec.rb +0 -17
  225. data/spec/lib/spree/backend_configuration_spec.rb +0 -22
  226. data/spec/spec_helper.rb +0 -123
  227. data/spec/support/appear_before_matcher.rb +0 -10
  228. data/spec/support/feature/base_feature_helper.rb +0 -17
  229. data/spec/support/feature/order_feature_helper.rb +0 -27
  230. data/spec/teaspoon_env.rb +0 -51
  231. data/spec/test_views/spree/admin/widgets/edit.html.erb +0 -1
  232. data/spec/test_views/spree/admin/widgets/new.html.erb +0 -1
  233. data/spec/views/spree/admin/shared/navigation_footer_spec.rb +0 -67
@@ -7,11 +7,13 @@ Spree.ready(function() {
7
7
  new Spree.Views.Stock.EditStockItemRow({
8
8
  el: $el,
9
9
  stockLocationName: $el.data('stock-location-name'),
10
+ stockLocationId: $el.data("stock-item").stock_location_id,
11
+ variantSku: $el.data("variant-sku"),
10
12
  model: model
11
13
  });
12
14
 
13
15
  if (trackInventory === false) {
14
- $('.js-edit-stock-item input').attr({
16
+ $el.find('input').attr({
15
17
  disabled: true,
16
18
  class: 'with-tip',
17
19
  title: '"Track inventory" option disabled for this variant'
@@ -19,7 +21,7 @@ Spree.ready(function() {
19
21
  }
20
22
 
21
23
  if (canEdit == false) {
22
- $('.js-edit-stock-item input').attr({
24
+ $el.find('input').attr({
23
25
  disabled: true,
24
26
  class: 'with-tip',
25
27
  title: 'You do not have permission to manage stock'
@@ -10,7 +10,7 @@ $.fn.taxonAutocomplete = function () {
10
10
 
11
11
  Spree.ajax({
12
12
  type: "GET",
13
- url: Spree.routes.taxons_search,
13
+ url: Spree.pathFor('api/taxons'),
14
14
  data: {
15
15
  ids: ids,
16
16
  per_page: count,
@@ -22,7 +22,7 @@ $.fn.taxonAutocomplete = function () {
22
22
  });
23
23
  },
24
24
  ajax: {
25
- url: Spree.routes.taxons_search,
25
+ url: Spree.pathFor('api/taxons'),
26
26
  datatype: 'json',
27
27
  data: function (term, page) {
28
28
  return {
@@ -9,7 +9,7 @@ Spree.ready(function() {
9
9
  var saveSort = function(e) {
10
10
  var item = e.item;
11
11
  Spree.ajax({
12
- url: Spree.routes.classifications_api,
12
+ url: Spree.pathFor('api/classifications'),
13
13
  method: 'PUT',
14
14
  data: {
15
15
  product_id: item.getAttribute('data-product-id'),
@@ -27,7 +27,7 @@ Spree.ready(function() {
27
27
  dropdownCssClass: "taxon_select_box",
28
28
  placeholder: Spree.translations.find_a_taxon,
29
29
  ajax: {
30
- url: Spree.routes.taxons_search,
30
+ url: Spree.pathFor('api/taxons'),
31
31
  params: {
32
32
  "headers": {
33
33
  'Authorization': 'Bearer ' + Spree.api_key
@@ -55,7 +55,7 @@ Spree.ready(function() {
55
55
 
56
56
  $('#taxon_id').on("change", function(e) {
57
57
  Spree.ajax({
58
- url: Spree.routes.taxon_products_api,
58
+ url: Spree.pathFor('api/taxons/products'),
59
59
  data: {
60
60
  id: e.val,
61
61
  simple: 1
@@ -1,4 +1,6 @@
1
1
  //= require spree/backend/templates/_image
2
+ //= require spree/backend/templates/tables/selectable_label
3
+ //= require spree/backend/templates/tables/return_item_sum_amount
2
4
  //= require spree/backend/templates/orders/customer_details/autocomplete
3
5
  //= require spree/backend/templates/orders/details_adjustment_row
4
6
  //= require spree/backend/templates/orders/line_item
@@ -1,9 +1,9 @@
1
1
  <div class='customer-autocomplete-item'>
2
2
  <div class='customer-details'>
3
3
  <span class="customer-email">{{customer.email}}</span>
4
- {{#if bill_address.firstname }}
4
+ {{#if bill_address.name }}
5
5
  <strong>{{t 'bill_address' }}</strong>
6
- {{bill_address.firstname}} {{bill_address.lastname}}<br>
6
+ {{bill_address.name}}<br>
7
7
  {{bill_address.address1}}, {{bill_address.address2}}<br>
8
8
  {{bill_address.city}}<br>
9
9
  {{#if bill_address.state_id }}
@@ -1,4 +1,8 @@
1
- <td class="stock-location-name">{{stockLocationName}}</td>
1
+ <td class="stock-location-name">
2
+ <a href="/admin/stock_locations/{{stockLocationId}}/stock_movements?q%5Bvariant_sku_eq%5D={{variantSku}}">
3
+ {{stockLocationName}}
4
+ </a>
5
+ </td>
2
6
  <td class="align-center">
3
7
  <input id="backorderable-{{id}}"
4
8
  name="backorderable"
@@ -0,0 +1,7 @@
1
+ <tr class="selectable-header">
2
+ <th class="selectable-table-summary" colspan="2">
3
+ </th>
4
+ <td colspan="7" class="text-right">
5
+ {{total_pre_tax_refund}} <span id="total_pre_tax_refund">{{total_selected_item_amount}}</span>
6
+ </td>
7
+ </tr>
@@ -0,0 +1,6 @@
1
+ <th>
2
+ <input type="checkbox" {{#if all_items_selected}}checked="checked"{{/if}} name="select-all" class="selectAll" id="select-all" value="1">
3
+ </th>
4
+ <th colspan="{{colspan}}">
5
+ {{item_selected_label}}
6
+ </th>
@@ -10,7 +10,7 @@ $.fn.userAutocomplete = function () {
10
10
  multiple: true,
11
11
  initSelection: function (element, callback) {
12
12
  Spree.ajax({
13
- url: Spree.routes.users_api,
13
+ url: Spree.pathFor('api/users'),
14
14
  data: {
15
15
  ids: element.val()
16
16
  },
@@ -20,7 +20,7 @@ $.fn.userAutocomplete = function () {
20
20
  });
21
21
  },
22
22
  ajax: {
23
- url: Spree.routes.users_api,
23
+ url: Spree.pathFor('api/users'),
24
24
  datatype: 'json',
25
25
  params: { "headers": { 'Authorization': 'Bearer ' + Spree.api_key } },
26
26
  data: function (term) {
@@ -28,8 +28,7 @@ $.fn.userAutocomplete = function () {
28
28
  q: {
29
29
  m: 'or',
30
30
  email_start: term,
31
- addresses_firstname_start: term,
32
- addresses_lastname_start: term
31
+ firstname_or_lastname_start: term
33
32
  }
34
33
  };
35
34
  },
@@ -16,12 +16,12 @@
16
16
  minimumInputLength: 3,
17
17
  initSelection: function(element, callback) {
18
18
  Spree.ajax({
19
- url: Spree.routes.variants_api + "/" + element.val(),
19
+ url: Spree.pathFor('api/variants/' + element.val()),
20
20
  success: callback
21
21
  });
22
22
  },
23
23
  ajax: {
24
- url: Spree.routes.variants_api,
24
+ url: Spree.pathFor('api/variants'),
25
25
  datatype: "json",
26
26
  quietMillis: 500,
27
27
  params: {
@@ -15,10 +15,10 @@ Spree.Views.Cart.EmptyCartButton = Backbone.View.extend({
15
15
  }
16
16
 
17
17
  this.model.empty({
18
- success: () => {
18
+ success: function () {
19
19
  this.collection.reset()
20
20
  this.collection.push({})
21
- }
21
+ }.bind(this)
22
22
  })
23
23
  },
24
24
 
@@ -24,3 +24,7 @@
24
24
  //= require 'spree/backend/views/promotions/option_values_rule'
25
25
  //= require 'spree/backend/views/tables/editable_table'
26
26
  //= require 'spree/backend/views/tables/editable_table_row'
27
+ //= require 'spree/backend/views/tables/return_items'
28
+ //= require 'spree/backend/views/tables/selectable_table'
29
+ //= require 'spree/backend/views/tables/selectable_table/summary'
30
+ //= require 'spree/backend/views/tables/selectable_table/sum_return_item_amount'
@@ -23,7 +23,7 @@ Spree.Views.Order.Address = Backbone.View.extend({
23
23
 
24
24
  eachField: function(callback){
25
25
  var view = this;
26
- var fields = ["firstname", "lastname", "company", "address1", "address2",
26
+ var fields = ["name", "company", "address1", "address2",
27
27
  "city", "zipcode", "phone", "country_id", "state_name"];
28
28
  _.each(fields, function(field) {
29
29
  var el = view.$('[name$="[' + field + ']"]');
@@ -26,7 +26,7 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
26
26
  this.$el.select2({
27
27
  placeholder: Spree.translations.choose_a_customer,
28
28
  ajax: {
29
- url: Spree.routes.users_api,
29
+ url: Spree.pathFor('api/users'),
30
30
  params: { "headers": { 'Authorization': 'Bearer ' + Spree.api_key } },
31
31
  datatype: 'json',
32
32
  data: function(term, page) {
@@ -34,8 +34,7 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
34
34
  q: {
35
35
  m: 'or',
36
36
  email_start: term,
37
- addresses_firstname_start: term,
38
- addresses_lastname_start: term
37
+ firstname_or_lastname_start: term
39
38
  }
40
39
  }
41
40
  },
@@ -8,7 +8,10 @@ Spree.Views.Order.DetailsAdjustments = Backbone.View.extend({
8
8
  var totals = {};
9
9
  var collection = this.collection ? this.collection.chain() : _.chain([this.model]);
10
10
  collection
11
- .map(function(item){ return item.get("adjustments") || [] })
11
+ .map(function(item) {
12
+ return (item.get("adjustments") || [])
13
+ .filter(function(adjustment) { return (adjustment.eligible === true); });
14
+ })
12
15
  .flatten(true)
13
16
  .each(function(adjustment){
14
17
  var label = adjustment.label;
@@ -3,6 +3,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
3
3
 
4
4
  initialize: function(options) {
5
5
  this.stockLocationName = options.stockLocationName;
6
+ this.stockLocationId = options.stockLocationId;
7
+ this.variantSku = options.variantSku;
6
8
  this.negative = this.model.attributes.count_on_hand < 0;
7
9
  this.previousAttributes = _.clone(this.model.attributes);
8
10
  this.listenTo(this.model, 'sync', this.onSuccess);
@@ -22,6 +24,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
22
24
  render: function() {
23
25
  var renderAttr = {
24
26
  stockLocationName: this.stockLocationName,
27
+ stockLocationId: this.stockLocationId,
28
+ variantSku: this.variantSku,
25
29
  editing: this.editing,
26
30
  negative: this.negative
27
31
  };
@@ -0,0 +1,9 @@
1
+ Spree.Views.Tables.ReturnItems = Backbone.View.extend({
2
+ initialize: function() {
3
+ if(this.$el.hasClass('return-items-table')) {
4
+ var tfoot = document.createElement('tfoot')
5
+ new Spree.Views.Tables.SelectableTable.SumReturnItemAmount({el: tfoot, model: this.model});
6
+ this.$el.append(tfoot);
7
+ }
8
+ },
9
+ })
@@ -0,0 +1,70 @@
1
+ Spree.Views.Tables.SelectableTable = Backbone.View.extend({
2
+ events: {
3
+ 'change .selectable': 'onSelectedItem',
4
+ },
5
+
6
+ initialize: function() {
7
+ this.model = new Backbone.Model({
8
+ allSelected: false,
9
+ selectedItems: []
10
+ });
11
+
12
+ this.listenTo(this.model, 'change', this.detectChanges)
13
+
14
+ this.render();
15
+ Backbone.trigger("selectableTable:init", this)
16
+ },
17
+
18
+ onSelectedItem: function(event) {
19
+ var item = event.currentTarget;
20
+ if(item.checked) {
21
+ this.addItem(item)
22
+ }else{
23
+ this.$el.find('input[name="select-all"]').prop('checked', false);
24
+ this.removeItem(item)
25
+ }
26
+ },
27
+
28
+ addItem: function(item) {
29
+ var items = _(this.model.get('selectedItems')).clone();
30
+ if(items.indexOf(item) === -1) {
31
+ items.push(item);
32
+ this.model.set('selectedItems', items);
33
+ }
34
+ },
35
+
36
+ removeItem: function(item) {
37
+ var items = _(this.model.get('selectedItems')).clone();
38
+ items.splice(items.indexOf(item), 1);
39
+ this.model.set('selectedItems', items);
40
+ this.model.set('allSelected', false);
41
+ },
42
+
43
+ maxColumns: function() {
44
+ var max = 0;
45
+ this.$el.find('tr').each(function(){
46
+ var inTr = 0;
47
+ $('td,th', this).each(function() { inTr += parseInt($(this).attr('colspan')) || 1 });
48
+ max = Math.max(max,inTr);
49
+ });
50
+
51
+ return max;
52
+ },
53
+
54
+ detectChanges: function(model) {
55
+ var selectableTable = this;
56
+ if(model.changed.allSelected == true) {
57
+ $('.selectable').each(function(_, item) { selectableTable.addItem(item) })
58
+ }
59
+
60
+ this.render();
61
+ },
62
+
63
+ render: function(){
64
+ var model = this.model;
65
+
66
+ this.$el.find('.selectable').each(function(_i, checkbox){
67
+ checkbox.checked = model.get('allSelected') || model.get('selectedItems').includes(checkbox);
68
+ })
69
+ }
70
+ });
@@ -0,0 +1,32 @@
1
+ Spree.Views.Tables.SelectableTable.SumReturnItemAmount = Backbone.View.extend({
2
+ initialize: function(options) {
3
+ this.listenTo(this.model, 'change', this.render);
4
+
5
+ this.render();
6
+ },
7
+
8
+ render: function() {
9
+ var html = HandlebarsTemplates['tables/return_item_sum_amount']({
10
+ total_pre_tax_refund: Spree.t("total_pre_tax_refund"),
11
+ total_selected_item_amount: this.totalSelectedReturnItemAmount()
12
+ });
13
+
14
+ this.$el.html(html);
15
+ },
16
+
17
+ totalSelectedReturnItemAmount: function () {
18
+ var totalAmount = 0.00;
19
+ var selectedItems = [];
20
+
21
+ if(this.model.get('allSelected')) {
22
+ selectedItems = $('.selectable');
23
+ } else {
24
+ selectedItems = $(this.model.attributes.selectedItems);
25
+ }
26
+ selectedItems.each(function(_, selectedItem){
27
+ totalAmount += $(selectedItem).data('price');
28
+ })
29
+
30
+ return totalAmount;
31
+ },
32
+ });
@@ -0,0 +1,45 @@
1
+ Spree.Views.Tables.SelectableTable.Summary = Backbone.View.extend({
2
+ events: {
3
+ 'click input[name="select-all"]': 'onSelectedAll'
4
+ },
5
+
6
+ onSelectedAll: function(event) {
7
+ this.model.set('allSelected', event.currentTarget.checked);
8
+ if(event.currentTarget.checked == false) {
9
+ this.model.set('selectedItems', []);
10
+ }
11
+ },
12
+
13
+ initialize: function(options) {
14
+ this.listenTo(this.model, 'change', this.render)
15
+
16
+ this.colspan = options.columns - 1;
17
+
18
+ this.render();
19
+ },
20
+
21
+ render: function() {
22
+ var selectedItemLength = this.model.get('selectedItems').length;
23
+ var all_items_selected = this.model.get('allSelected');
24
+
25
+ var html = HandlebarsTemplates['tables/selectable_label']({
26
+ colspan: this.colspan,
27
+ item_selected_label: this.selectedItemLabel(all_items_selected, selectedItemLength),
28
+ all_items_selected: all_items_selected
29
+ });
30
+
31
+ this.$el.html(html);
32
+ },
33
+
34
+ selectedItemLabel: function(all_selected, selected_item_length) {
35
+ if(all_selected) {
36
+ return Spree.t('items_selected.all');
37
+ } else if(selected_item_length == 0) {
38
+ return Spree.t('items_selected.none');
39
+ } else if(selected_item_length == 1) {
40
+ return Spree.t('items_selected.one');
41
+ } else {
42
+ return selected_item_length + " " + Spree.t('items_selected.custom');
43
+ }
44
+ }
45
+ });
@@ -64,10 +64,6 @@ $padding-y-navbar-submenu: 9px;
64
64
 
65
65
  .brand-link {
66
66
  overflow: hidden;
67
-
68
- img {
69
- max-width: 125px;
70
- }
71
67
  }
72
68
 
73
69
  .admin-nav-menu {
@@ -355,8 +351,11 @@ nav.menu {
355
351
 
356
352
  .brand-link {
357
353
  display: block;
354
+ height: $main-header-height - 1px;
355
+ overflow: hidden;
358
356
 
359
357
  img {
360
- max-width: 125px;
358
+ max-height: 100%;
359
+ max-width: 100%;
361
360
  }
362
361
  }
@@ -65,7 +65,11 @@
65
65
  }
66
66
 
67
67
  label[for="order_bill_address_attributes_firstname"] {
68
- margin-top: 45px;
68
+ margin-top: 53.5px;
69
+ }
70
+
71
+ label[for="order_bill_address_attributes_name"] {
72
+ margin-top: 53.5px;
69
73
  }
70
74
 
71
75
  #risk_analysis legend {