solidus_api 4.6.4 → 4.7.0

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 (105) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +8 -8
  3. data/app/controllers/spree/api/addresses_controller.rb +4 -3
  4. data/app/controllers/spree/api/base_controller.rb +9 -9
  5. data/app/controllers/spree/api/checkouts_controller.rb +7 -17
  6. data/app/controllers/spree/api/countries_controller.rb +5 -5
  7. data/app/controllers/spree/api/coupon_codes_controller.rb +4 -4
  8. data/app/controllers/spree/api/customer_returns_controller.rb +11 -11
  9. data/app/controllers/spree/api/inventory_units_controller.rb +4 -4
  10. data/app/controllers/spree/api/line_items_controller.rb +7 -7
  11. data/app/controllers/spree/api/option_types_controller.rb +3 -3
  12. data/app/controllers/spree/api/option_values_controller.rb +6 -6
  13. data/app/controllers/spree/api/orders_controller.rb +12 -42
  14. data/app/controllers/spree/api/payments_controller.rb +1 -12
  15. data/app/controllers/spree/api/product_properties_controller.rb +6 -6
  16. data/app/controllers/spree/api/products_controller.rb +11 -11
  17. data/app/controllers/spree/api/return_authorizations_controller.rb +5 -5
  18. data/app/controllers/spree/api/shipments_controller.rb +11 -11
  19. data/app/controllers/spree/api/states_controller.rb +2 -2
  20. data/app/controllers/spree/api/stock_items_controller.rb +3 -3
  21. data/app/controllers/spree/api/stock_locations_controller.rb +5 -5
  22. data/app/controllers/spree/api/taxonomies_controller.rb +9 -9
  23. data/app/controllers/spree/api/taxons_controller.rb +6 -6
  24. data/app/controllers/spree/api/users_controller.rb +3 -9
  25. data/app/controllers/spree/api/variants_controller.rb +4 -4
  26. data/app/controllers/spree/api/zones_controller.rb +5 -5
  27. data/app/views/spree/api/addresses/_address.json.jbuilder +3 -3
  28. data/app/views/spree/api/adjustments/_adjustment.json.jbuilder +1 -1
  29. data/app/views/spree/api/countries/index.json.jbuilder +2 -2
  30. data/app/views/spree/api/countries/show.json.jbuilder +2 -2
  31. data/app/views/spree/api/credit_cards/_credit_card.json.jbuilder +1 -1
  32. data/app/views/spree/api/credit_cards/index.json.jbuilder +1 -1
  33. data/app/views/spree/api/customer_returns/index.json.jbuilder +2 -2
  34. data/app/views/spree/api/customer_returns/show.json.jbuilder +1 -1
  35. data/app/views/spree/api/errors/invalid_api_key.json.jbuilder +1 -1
  36. data/app/views/spree/api/images/_image.json.jbuilder +2 -2
  37. data/app/views/spree/api/inventory_units/show.json.jbuilder +1 -1
  38. data/app/views/spree/api/line_items/_line_item.json.jbuilder +2 -2
  39. data/app/views/spree/api/option_types/_option_type.json.jbuilder +2 -2
  40. data/app/views/spree/api/option_values/_option_value.json.jbuilder +1 -1
  41. data/app/views/spree/api/orders/_big.json.jbuilder +3 -3
  42. data/app/views/spree/api/orders/_order.json.jbuilder +1 -1
  43. data/app/views/spree/api/orders/index.json.jbuilder +1 -1
  44. data/app/views/spree/api/orders/mine.json.jbuilder +1 -1
  45. data/app/views/spree/api/payments/credit_over_limit.json.jbuilder +1 -1
  46. data/app/views/spree/api/payments/index.json.jbuilder +2 -2
  47. data/app/views/spree/api/payments/new.json.jbuilder +1 -1
  48. data/app/views/spree/api/payments/show.json.jbuilder +1 -1
  49. data/app/views/spree/api/payments/source_views/_gateway.json.jbuilder +1 -1
  50. data/app/views/spree/api/payments/source_views/_store_credit.json.jbuilder +1 -1
  51. data/app/views/spree/api/payments/update_forbidden.json.jbuilder +1 -1
  52. data/app/views/spree/api/product_properties/index.json.jbuilder +2 -2
  53. data/app/views/spree/api/product_properties/show.json.jbuilder +1 -1
  54. data/app/views/spree/api/products/_product.json.jbuilder +5 -5
  55. data/app/views/spree/api/products/index.json.jbuilder +1 -1
  56. data/app/views/spree/api/promotions/show.json.jbuilder +1 -1
  57. data/app/views/spree/api/properties/index.json.jbuilder +2 -2
  58. data/app/views/spree/api/properties/show.json.jbuilder +1 -1
  59. data/app/views/spree/api/return_authorizations/index.json.jbuilder +2 -2
  60. data/app/views/spree/api/return_authorizations/show.json.jbuilder +1 -1
  61. data/app/views/spree/api/shared/_pagination.json.jbuilder +4 -4
  62. data/app/views/spree/api/shipments/_big.json.jbuilder +7 -7
  63. data/app/views/spree/api/shipments/_small.json.jbuilder +4 -4
  64. data/app/views/spree/api/shipments/estimated_rates.json.jbuilder +1 -1
  65. data/app/views/spree/api/shipments/mine.json.jbuilder +1 -1
  66. data/app/views/spree/api/shipments/show.json.jbuilder +4 -4
  67. data/app/views/spree/api/shipping_rates/_shipping_rate.json.jbuilder +1 -1
  68. data/app/views/spree/api/states/index.json.jbuilder +2 -2
  69. data/app/views/spree/api/states/show.json.jbuilder +1 -1
  70. data/app/views/spree/api/stock_items/_stock_item.json.jbuilder +1 -1
  71. data/app/views/spree/api/stock_items/index.json.jbuilder +1 -1
  72. data/app/views/spree/api/stock_locations/_stock_location.json.jbuilder +3 -3
  73. data/app/views/spree/api/stock_locations/index.json.jbuilder +1 -1
  74. data/app/views/spree/api/stock_movements/_stock_movement.json.jbuilder +1 -1
  75. data/app/views/spree/api/stock_movements/index.json.jbuilder +1 -1
  76. data/app/views/spree/api/store_credit_events/mine.json.jbuilder +2 -2
  77. data/app/views/spree/api/stores/index.json.jbuilder +1 -1
  78. data/app/views/spree/api/stores/show.json.jbuilder +1 -1
  79. data/app/views/spree/api/taxonomies/_nested.json.jbuilder +3 -3
  80. data/app/views/spree/api/taxonomies/_taxonomy.json.jbuilder +3 -3
  81. data/app/views/spree/api/taxonomies/index.json.jbuilder +1 -1
  82. data/app/views/spree/api/taxons/_taxon.json.jbuilder +2 -2
  83. data/app/views/spree/api/taxons/_taxons.json.jbuilder +1 -1
  84. data/app/views/spree/api/taxons/index.json.jbuilder +2 -2
  85. data/app/views/spree/api/users/_user.json.jbuilder +1 -1
  86. data/app/views/spree/api/users/index.json.jbuilder +1 -1
  87. data/app/views/spree/api/variants/_big.json.jbuilder +3 -3
  88. data/app/views/spree/api/variants/_small.json.jbuilder +2 -2
  89. data/app/views/spree/api/variants/index.json.jbuilder +1 -1
  90. data/app/views/spree/api/zones/_zone.json.jbuilder +2 -2
  91. data/app/views/spree/api/zones/index.json.jbuilder +1 -1
  92. data/config/locales/en.yml +0 -1
  93. data/config/routes.rb +9 -9
  94. data/lib/solidus_api.rb +1 -1
  95. data/lib/spree/api/config.rb +1 -1
  96. data/lib/spree/api/engine.rb +4 -4
  97. data/lib/spree/api/responders.rb +2 -2
  98. data/lib/spree/api/testing_support/helpers.rb +3 -3
  99. data/lib/spree/api/testing_support/setup.rb +1 -1
  100. data/lib/spree/api.rb +2 -2
  101. data/lib/spree/api_configuration.rb +8 -12
  102. data/lib/spree_api.rb +3 -3
  103. data/solidus_api.gemspec +16 -16
  104. metadata +9 -7
  105. data/app/views/spree/api/orders/invalid_state.json.jbuilder +0 -3
@@ -1,19 +1,19 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.cache! [I18n.locale, shipment] do
4
- json.(shipment, *shipment_attributes)
4
+ json.call(shipment, *shipment_attributes)
5
5
  json.partial!("spree/api/shipments/small", shipment:)
6
6
  json.inventory_units(shipment.inventory_units) do |inventory_unit|
7
- json.(inventory_unit, *inventory_unit_attributes)
7
+ json.call(inventory_unit, *inventory_unit_attributes)
8
8
  json.variant do
9
9
  json.partial!("spree/api/variants/small", variant: inventory_unit.variant)
10
- json.(inventory_unit.variant, :product_id)
10
+ json.call(inventory_unit.variant, :product_id)
11
11
  json.images(inventory_unit.variant.gallery.images) do |image|
12
12
  json.partial!("spree/api/images/image", image:)
13
13
  end
14
14
  end
15
15
  json.line_item do
16
- json.(inventory_unit.line_item, *line_item_attributes)
16
+ json.call(inventory_unit.line_item, *line_item_attributes)
17
17
  json.single_display_amount(inventory_unit.line_item.single_display_amount.to_s)
18
18
  json.display_amount(inventory_unit.line_item.display_amount.to_s)
19
19
  json.total(inventory_unit.line_item.total)
@@ -32,15 +32,15 @@ json.cache! [I18n.locale, shipment] do
32
32
  json.partial!("spree/api/addresses/address", address: shipment.order.shipping_address)
33
33
  end
34
34
  json.payments(shipment.order.payments) do |payment|
35
- json.(payment, :id, :amount, :display_amount, :state)
35
+ json.call(payment, :id, :amount, :display_amount, :state)
36
36
  if payment.source
37
37
  json.source do
38
38
  attrs = [:id]
39
39
  (attrs << :cc_type) if payment.source.respond_to?(:cc_type)
40
- json.(payment.source, *attrs)
40
+ json.call(payment.source, *attrs)
41
41
  end
42
42
  end
43
- json.payment_method { json.(payment.payment_method, :id, :name) }
43
+ json.payment_method { json.call(payment.payment_method, :id, :name) }
44
44
  end
45
45
  end
46
46
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.cache! [I18n.locale, shipment] do
4
- json.(shipment, *shipment_attributes)
4
+ json.call(shipment, *shipment_attributes)
5
5
  json.order_id(shipment.order.number)
6
6
  json.stock_location_name(shipment.stock_location.name)
7
7
  json.shipping_rates(shipment.shipping_rates) do |shipping_rate|
@@ -15,12 +15,12 @@ json.cache! [I18n.locale, shipment] do
15
15
  end
16
16
  end
17
17
  json.shipping_methods(shipment.shipping_methods) do |shipping_method|
18
- json.(shipping_method, :id, :code, :name)
18
+ json.call(shipping_method, :id, :code, :name)
19
19
  json.zones(shipping_method.zones) do |zone|
20
- json.(zone, :id, :name, :description)
20
+ json.call(zone, :id, :name, :description)
21
21
  end
22
22
  json.shipping_categories(shipping_method.shipping_categories) do |shipping_category|
23
- json.(shipping_category, :id, :name)
23
+ json.call(shipping_category, :id, :name)
24
24
  end
25
25
  end
26
26
  json.manifest(shipment.manifest) do |manifest_item|
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.shipping_rates @shipping_rates do |shipping_rate|
4
- json.(shipping_rate, :name, :cost, :shipping_method_id, :shipping_method_code)
4
+ json.call(shipping_rate, :name, :cost, :shipping_method_id, :shipping_method_code)
5
5
  json.display_cost(shipping_rate.display_cost.to_s)
6
6
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.partial! 'spree/api/shared/pagination', pagination: @shipments
3
+ json.partial! "spree/api/shared/pagination", pagination: @shipments
4
4
  json.shipments(@shipments) do |shipment|
5
5
  json.partial!("spree/api/shipments/big", shipment:)
6
6
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.cache! [I18n.locale, @shipment] do
4
- json.(@shipment, *shipment_attributes)
4
+ json.call(@shipment, *shipment_attributes)
5
5
  json.order_id(@shipment.order.number)
6
6
  json.stock_location_name(@shipment.stock_location.name)
7
7
  json.shipping_rates(@shipment.shipping_rates) do |shipping_rate|
@@ -15,12 +15,12 @@ json.cache! [I18n.locale, @shipment] do
15
15
  end
16
16
  end
17
17
  json.shipping_methods(@shipment.shipping_methods) do |shipping_method|
18
- json.(shipping_method, :id, :name)
18
+ json.call(shipping_method, :id, :name)
19
19
  json.zones(shipping_method.zones) do |zone|
20
- json.(zone, :id, :name, :description)
20
+ json.call(zone, :id, :name, :description)
21
21
  end
22
22
  json.shipping_categories(shipping_method.shipping_categories) do |shipping_category|
23
- json.(shipping_category, :id, :name)
23
+ json.call(shipping_category, :id, :name)
24
24
  end
25
25
  end
26
26
  json.manifest(@shipment.manifest) do |manifest_item|
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(shipping_rate, :id, :name, :cost, :selected, :shipping_method_id, :shipping_method_code)
3
+ json.call(shipping_rate, :id, :name, :cost, :selected, :shipping_method_id, :shipping_method_code)
4
4
  json.display_cost(shipping_rate.display_cost.to_s)
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.states_required(@country.states_required) if @country
4
- json.states(@states) { |state| json.(state, *state_attributes) }
4
+ json.states(@states) { |state| json.call(state, *state_attributes) }
5
5
  if @states.respond_to?(:total_pages)
6
- json.partial! 'spree/api/shared/pagination', pagination: @states
6
+ json.partial! "spree/api/shared/pagination", pagination: @states
7
7
  end
@@ -1,3 +1,3 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(@state, *state_attributes)
3
+ json.call(@state, *state_attributes)
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(stock_item, *stock_item_attributes)
3
+ json.call(stock_item, *stock_item_attributes)
4
4
  json.variant do
5
5
  json.partial!("spree/api/variants/small", variant: stock_item.variant)
6
6
  end
@@ -3,4 +3,4 @@
3
3
  json.stock_items(@stock_items) do |stock_item|
4
4
  json.partial!("spree/api/stock_items/stock_item", stock_item:)
5
5
  end
6
- json.partial! 'spree/api/shared/pagination', pagination: @stock_items
6
+ json.partial! "spree/api/shared/pagination", pagination: @stock_items
@@ -1,16 +1,16 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(stock_location, *stock_location_attributes)
3
+ json.call(stock_location, *stock_location_attributes)
4
4
  json.country do
5
5
  if stock_location.country
6
- json.(stock_location.country, *country_attributes)
6
+ json.call(stock_location.country, *country_attributes)
7
7
  else
8
8
  json.nil!
9
9
  end
10
10
  end
11
11
  json.state do
12
12
  if stock_location.state
13
- json.(stock_location.state, *state_attributes)
13
+ json.call(stock_location.state, *state_attributes)
14
14
  else
15
15
  json.nil!
16
16
  end
@@ -3,4 +3,4 @@
3
3
  json.stock_locations(@stock_locations) do |stock_location|
4
4
  json.partial!("spree/api/stock_locations/stock_location", stock_location:)
5
5
  end
6
- json.partial! 'spree/api/shared/pagination', pagination: @stock_locations
6
+ json.partial! "spree/api/shared/pagination", pagination: @stock_locations
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(stock_movement, *stock_movement_attributes)
3
+ json.call(stock_movement, *stock_movement_attributes)
4
4
  json.stock_item do
5
5
  json.partial!("spree/api/stock_items/stock_item", stock_item: stock_movement.stock_item)
6
6
  end
@@ -3,4 +3,4 @@
3
3
  json.stock_movements(@stock_movements) do |stock_movement|
4
4
  json.partial!("spree/api/stock_movements/stock_movement", stock_movement:)
5
5
  end
6
- json.partial! 'spree/api/shared/pagination', pagination: @stock_movements
6
+ json.partial! "spree/api/shared/pagination", pagination: @stock_movements
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.store_credit_events(@store_credit_events) do |store_credit_event|
4
- json.(store_credit_event, *store_credit_history_attributes)
4
+ json.call(store_credit_event, *store_credit_history_attributes)
5
5
  json.order_number(store_credit_event.order.try(:number))
6
6
  end
7
- json.partial! 'spree/api/shared/pagination', pagination: @store_credit_events
7
+ json.partial! "spree/api/shared/pagination", pagination: @store_credit_events
@@ -1,3 +1,3 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.stores(@stores) { |store| json.(store, *store_attributes) }
3
+ json.stores(@stores) { |store| json.call(store, *store_attributes) }
@@ -1,3 +1,3 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(@store, *store_attributes)
3
+ json.call(@store, *store_attributes)
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(taxonomy, *taxonomy_attributes)
3
+ json.call(taxonomy, *taxonomy_attributes)
4
4
  json.root do
5
- json.(taxonomy.root, *taxon_attributes)
5
+ json.call(taxonomy.root, *taxon_attributes)
6
6
  json.taxons(taxonomy.root.children) do |taxon|
7
- json.(taxon, *taxon_attributes)
7
+ json.call(taxon, *taxon_attributes)
8
8
  json.partial!("spree/api/taxons/taxons", taxon:)
9
9
  end
10
10
  end
@@ -3,11 +3,11 @@
3
3
  if params[:set] == "nested"
4
4
  json.partial!("spree/api/taxonomies/nested", taxonomy:)
5
5
  else
6
- json.(taxonomy, *taxonomy_attributes)
6
+ json.call(taxonomy, *taxonomy_attributes)
7
7
  json.root do
8
- json.(taxonomy.root, *taxon_attributes)
8
+ json.call(taxonomy.root, *taxon_attributes)
9
9
  json.taxons(taxonomy.root.children) do |taxon|
10
- json.(taxon, *taxon_attributes)
10
+ json.call(taxon, *taxon_attributes)
11
11
  end
12
12
  end
13
13
  end
@@ -3,4 +3,4 @@
3
3
  json.taxonomies(@taxonomies) do |taxonomy|
4
4
  json.partial!("spree/api/taxonomies/taxonomy", taxonomy:)
5
5
  end
6
- json.partial! 'spree/api/shared/pagination', pagination: @taxonomies
6
+ json.partial! "spree/api/shared/pagination", pagination: @taxonomies
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(taxon, *taxon_attributes)
4
- json.taxons(taxon.children) { |taxon| json.(taxon, *taxon_attributes) }
3
+ json.call(taxon, *taxon_attributes)
4
+ json.taxons(taxon.children) { |taxon| json.call(taxon, *taxon_attributes) }
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.taxons(taxon.children) do |taxon|
4
- json.(taxon, *taxon_attributes)
4
+ json.call(taxon, *taxon_attributes)
5
5
  json.partial!("spree/api/taxons/taxons", taxon:)
6
6
  end
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.partial! 'spree/api/shared/pagination', pagination: @taxons
3
+ json.partial! "spree/api/shared/pagination", pagination: @taxons
4
4
  json.taxons(@taxons) do |taxon|
5
- json.(taxon, *taxon_attributes)
5
+ json.call(taxon, *taxon_attributes)
6
6
  unless params[:without_children]
7
7
  json.partial!("spree/api/taxons/taxons", taxon:)
8
8
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(user, *user_attributes)
3
+ json.call(user, *user_attributes)
4
4
  json.bill_address do
5
5
  if user.bill_address
6
6
  json.partial!("spree/api/addresses/address", address: user.bill_address)
@@ -3,4 +3,4 @@
3
3
  json.users(@users) do |user|
4
4
  json.partial!("spree/api/users/user", user:)
5
5
  end
6
- json.partial! 'spree/api/shared/pagination', pagination: @users
6
+ json.partial! "spree/api/shared/pagination", pagination: @users
@@ -1,13 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.cache! [I18n.locale, Spree::StockLocation.accessible_by(current_ability), variant] do
4
- json.(variant, *variant_attributes)
4
+ json.call(variant, *variant_attributes)
5
5
  json.partial!("spree/api/variants/small", variant:)
6
6
  json.variant_properties(variant.variant_properties) do |variant_property|
7
- json.(variant_property, *variant_property_attributes)
7
+ json.call(variant_property, *variant_property_attributes)
8
8
  end
9
9
  json.stock_items(variant.stock_items.accessible_by(current_ability)) do |stock_item|
10
- json.(stock_item, :id, :count_on_hand, :stock_location_id, :backorderable)
10
+ json.call(stock_item, :id, :count_on_hand, :stock_location_id, :backorderable)
11
11
  json.available stock_item.available?
12
12
  json.stock_location_name(stock_item.stock_location.name)
13
13
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  json.cache! [I18n.locale, current_pricing_options, variant] do
4
- json.(variant, *variant_attributes)
4
+ json.call(variant, *variant_attributes)
5
5
  json.price(variant.price_for_options(current_pricing_options)&.amount)
6
6
  json.display_price(variant.price_for_options(current_pricing_options)&.money&.to_s)
7
7
  json.options_text(variant.options_text)
@@ -13,7 +13,7 @@ json.cache! [I18n.locale, current_pricing_options, variant] do
13
13
 
14
14
  json.is_destroyed(variant.destroyed?)
15
15
  json.option_values(variant.option_values) do |option_value|
16
- json.(option_value, *option_value_attributes)
16
+ json.call(option_value, *option_value_attributes)
17
17
  end
18
18
  json.images(variant.gallery.images) do |image|
19
19
  json.partial!("spree/api/images/image", image:)
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.partial! 'spree/api/shared/pagination', pagination: @variants
3
+ json.partial! "spree/api/shared/pagination", pagination: @variants
4
4
  json.variants(@variants) do |variant|
5
5
  json.partial!("spree/api/variants/big", variant:)
6
6
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- json.(zone, :id, :name, :description)
3
+ json.call(zone, :id, :name, :description)
4
4
  json.zone_members(zone.zone_members) do |zone_member|
5
- json.(zone_member, :id, :name, :zoneable_type, :zoneable_id)
5
+ json.call(zone_member, :id, :name, :zoneable_type, :zoneable_id)
6
6
  end
@@ -3,4 +3,4 @@
3
3
  json.zones(@zones) do |zone|
4
4
  json.partial!("spree/api/zones/zone", zone:)
5
5
  end
6
- json.partial! 'spree/api/shared/pagination', pagination: @zones
6
+ json.partial! "spree/api/shared/pagination", pagination: @zones
@@ -12,7 +12,6 @@ en:
12
12
  order:
13
13
  expected_total_mismatch: Expected total does not match actual total.
14
14
  invalid_shipping_method: Invalid shipping method specified.
15
- invalid_state: Invalid state specified.
16
15
  quantity_is_not_available: Quantity is not available for items in your order
17
16
  payment:
18
17
  credit_over_limit: This payment can only be credited up to %{limit}. Please specify an amount less than or equal to this number.
data/config/routes.rb CHANGED
@@ -3,11 +3,11 @@
3
3
  Spree::Core::Engine.routes.draw do
4
4
  namespace :admin do
5
5
  resources :users do
6
- resource :api_key, controller: 'users/api_key', only: [:create, :destroy]
6
+ resource :api_key, controller: "users/api_key", only: [:create, :destroy]
7
7
  end
8
8
  end
9
9
 
10
- namespace :api, defaults: { format: 'json' } do
10
+ namespace :api, defaults: {format: "json"} do
11
11
  resources :promotions, only: [:show]
12
12
 
13
13
  resources :products do
@@ -58,7 +58,7 @@ Spree::Core::Engine.routes.draw do
58
58
  end
59
59
  resources :option_values, only: :index
60
60
 
61
- get '/orders/mine', to: 'orders#mine', as: 'my_orders'
61
+ get "/orders/mine", to: "orders#mine", as: "my_orders"
62
62
  get "/orders/current", to: "orders#current", as: "current_order"
63
63
 
64
64
  resources :orders, concerns: :order_routes do
@@ -77,8 +77,8 @@ Spree::Core::Engine.routes.draw do
77
77
 
78
78
  resources :shipments, only: [:create, :update] do
79
79
  collection do
80
- post 'transfer_to_location'
81
- post 'transfer_to_shipment'
80
+ post "transfer_to_location"
81
+ post "transfer_to_shipment"
82
82
  get :mine
83
83
  end
84
84
 
@@ -125,9 +125,9 @@ Spree::Core::Engine.routes.draw do
125
125
  end
126
126
  end
127
127
 
128
- get '/config/money', to: 'config#money'
129
- get '/config', to: 'config#show'
130
- put '/classifications', to: 'classifications#update', as: :classifications
131
- get '/taxons/products', to: 'taxons#products', as: :taxon_products
128
+ get "/config/money", to: "config#money"
129
+ get "/config", to: "config#show"
130
+ put "/classifications", to: "classifications#update", as: :classifications
131
+ get "/taxons/products", to: "taxons#products", as: :taxon_products
132
132
  end
133
133
  end
data/lib/solidus_api.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spree_api'
3
+ require "spree_api"
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spree/api_configuration'
3
+ require "spree/api_configuration"
4
4
 
5
5
  module Spree
6
6
  module Api
@@ -1,19 +1,19 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spree/api/config'
3
+ require "spree/api/config"
4
4
 
5
5
  module Spree
6
6
  module Api
7
7
  class Engine < Rails::Engine
8
8
  isolate_namespace Spree
9
- engine_name 'spree_api'
9
+ engine_name "spree_api"
10
10
 
11
11
  # Leave initializer empty for backwards-compatibility. Other apps
12
12
  # might still rely on this event.
13
- initializer "spree.api.environment", before: :load_config_initializers do; end
13
+ initializer("spree.api.environment", before: :load_config_initializers) {}
14
14
 
15
15
  config.after_initialize do
16
- Spree::Api::Config.check_load_defaults_called('Spree::Api::Config')
16
+ Spree::Api::Config.check_load_defaults_called("Spree::Api::Config")
17
17
  end
18
18
  end
19
19
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'responders'
4
- require 'spree/api/responders/jbuilder_template'
3
+ require "responders"
4
+ require "spree/api/responders/jbuilder_template"
5
5
 
6
6
  module Spree
7
7
  module Api
@@ -14,12 +14,12 @@ module Spree
14
14
  end
15
15
 
16
16
  def assert_not_found!
17
- expect(json_response).to eq({ "error" => "The resource you were looking for could not be found." })
17
+ expect(json_response).to eq({"error" => "The resource you were looking for could not be found."})
18
18
  expect(response.status).to eq 404
19
19
  end
20
20
 
21
21
  def assert_unauthorized!
22
- expect(json_response).to eq({ "error" => "You are not authorized to perform that action." })
22
+ expect(json_response).to eq({"error" => "You are not authorized to perform that action."})
23
23
  expect(response.status).to eq 401
24
24
  end
25
25
 
@@ -47,7 +47,7 @@ module Spree
47
47
  end
48
48
 
49
49
  def upload_image(filename)
50
- Rack::Test::UploadedFile.new(File.open(image(filename).path), 'image/jpeg')
50
+ Rack::Test::UploadedFile.new(File.open(image(filename).path), "image/jpeg")
51
51
  end
52
52
  end
53
53
  end
@@ -6,7 +6,7 @@ module Spree
6
6
  module Setup
7
7
  def sign_in_as_admin!
8
8
  let!(:current_api_user) do
9
- stub_model(Spree::LegacyUser, spree_roles: [Spree::Role.find_or_initialize_by(name: 'admin')])
9
+ stub_model(Spree::LegacyUser, spree_roles: [Spree::Role.find_or_initialize_by(name: "admin")])
10
10
  end
11
11
  end
12
12
  end
data/lib/spree/api.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spree/core'
3
+ require "spree/core"
4
4
 
5
- require 'spree/api/engine'
5
+ require "spree/api/engine"
@@ -2,10 +2,6 @@
2
2
 
3
3
  module Spree
4
4
  class ApiConfiguration < Preferences::Configuration
5
- # @!attribute [rw] allow_arbitrary_state_in_api
6
- # @return [Boolean] When true, the API will allow arbitrary state transitions on orders (default: +false+)
7
- preference :allow_arbitrary_state_in_checkout, :boolean, default: false
8
-
9
5
  preference :requires_authentication, :boolean, default: true
10
6
 
11
7
  preference :product_attributes, :array, default: [
@@ -48,13 +44,13 @@ module Spree
48
44
  # Spree::Api::Config.metadata_api_parameters contains the models
49
45
  # to which the admin_metadata attribute is added
50
46
  preference :metadata_api_parameters, :array, default: [
51
- [:order, 'Spree::Order'],
52
- [:customer_return, 'Spree::CustomerReturn'],
53
- [:payment, 'Spree::Payment'],
54
- [:return_authorization, 'Spree::ReturnAuthorization'],
55
- [:shipment, 'Spree::Shipment'],
56
- [:user, 'Spree.user_class'],
57
- [:line_item, 'Spree::LineItem']
47
+ [:order, "Spree::Order"],
48
+ [:customer_return, "Spree::CustomerReturn"],
49
+ [:payment, "Spree::Payment"],
50
+ [:return_authorization, "Spree::ReturnAuthorization"],
51
+ [:shipment, "Spree::Shipment"],
52
+ [:user, "Spree.user_class"],
53
+ [:line_item, "Spree::LineItem"]
58
54
  ]
59
55
 
60
56
  # Spree::Api::Config.metadata_permit_parameters contains the models
@@ -148,7 +144,7 @@ module Spree
148
144
  end
149
145
  alias_method :preferred_promotion_attributes=, :promotion_attributes=
150
146
  promotion_attributes_deprecation_message = "Spree::ApiConfiguration#promotion_attributes= is deprecated. Please use Spree::Config.promotions.promotion_api_attributes= instead."
151
- deprecate "promotion_attributes=" => promotion_attributes_deprecation_message, deprecator: Spree.deprecator
147
+ deprecate "promotion_attributes=" => promotion_attributes_deprecation_message, :deprecator => Spree.deprecator
152
148
 
153
149
  preference :store_attributes, :array, default: [
154
150
  :id, :name, :url, :meta_description, :meta_keywords, :seo_title,
data/lib/spree_api.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'spree/api'
4
- require 'spree/api/responders'
5
- require 'jbuilder'
3
+ require "spree/api"
4
+ require "spree/api/responders"
5
+ require "jbuilder"
data/solidus_api.gemspec CHANGED
@@ -1,30 +1,30 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative '../core/lib/spree/core/version.rb'
3
+ require_relative "../core/lib/spree/core/version"
4
4
 
5
5
  Gem::Specification.new do |s|
6
- s.platform = Gem::Platform::RUBY
7
- s.name = "solidus_api"
8
- s.version = Spree.solidus_version
9
- s.summary = 'REST API for the Solidus e-commerce framework.'
6
+ s.platform = Gem::Platform::RUBY
7
+ s.name = "solidus_api"
8
+ s.version = Spree.solidus_version
9
+ s.summary = "REST API for the Solidus e-commerce framework."
10
10
  s.description = s.summary
11
11
 
12
- s.author = 'Solidus Team'
13
- s.email = 'contact@solidus.io'
14
- s.homepage = 'http://solidus.io'
15
- s.license = 'BSD-3-Clause'
12
+ s.author = "Solidus Team"
13
+ s.email = "contact@solidus.io"
14
+ s.homepage = "http://solidus.io"
15
+ s.license = "BSD-3-Clause"
16
16
 
17
- s.metadata['rubygems_mfa_required'] = 'true'
17
+ s.metadata["rubygems_mfa_required"] = "true"
18
18
 
19
19
  s.files = `git ls-files -z`.split("\x0").reject do |f|
20
20
  f.match(%r{^(spec|bin)/})
21
21
  end
22
22
 
23
- s.required_ruby_version = '>= 3.1.0'
24
- s.required_rubygems_version = '>= 1.8.23'
23
+ s.required_ruby_version = ">= 3.2.0"
24
+ s.required_rubygems_version = ">= 1.8.23"
25
25
 
26
- s.add_dependency 'jbuilder', '~> 2.8'
27
- s.add_dependency 'kaminari-activerecord', '~> 1.1'
28
- s.add_dependency 'responders'
29
- s.add_dependency 'solidus_core', s.version
26
+ s.add_dependency "jbuilder", "~> 2.8"
27
+ s.add_dependency "kaminari-activerecord", "~> 1.1"
28
+ s.add_dependency "responders"
29
+ s.add_dependency "solidus_core", s.version
30
30
  end