solidus_api 4.6.4 → 4.7.0

data/app/controllers/spree/api/shipments_controller.rb

@@ -14,7 +14,7 @@ module Spree
           @shipments = Spree::Shipment
             .reverse_chronological
             .joins(:order)
-            .where(spree_orders: { user_id: current_api_user.id })
+            .where(spree_orders: {user_id: current_api_user.id})
             .includes(mine_includes)
             .ransack(params[:q]).result
 
@@ -57,7 +57,7 @@ module Spree
             @shipment.ready!
           else
             logger.error("cannot_ready_shipment shipment_state=#{@shipment.state}")
-            render('spree/api/shipments/cannot_ready_shipment', status: 422) && return
+            render("spree/api/shipments/cannot_ready_shipment", status: 422) && return
           end
         end
         respond_with(@shipment, default_template: :show)
@@ -66,7 +66,7 @@ module Spree
       def ship
         authorize! :ship, @shipment
         unless @shipment.shipped?
-          @shipment.suppress_mailer = (params[:send_mailer] == 'false')
+          @shipment.suppress_mailer = (params[:send_mailer] == "false")
           @shipment.ship!
         end
         respond_with(@shipment, default_template: :show)
@@ -75,7 +75,7 @@ module Spree
       def add
         quantity = params[:quantity].to_i
 
-        @shipment.order.contents.add(variant, quantity, { shipment: @shipment })
+        @shipment.order.contents.add(variant, quantity, {shipment: @shipment})
         respond_with(@shipment, default_template: :show)
       end
 
@@ -86,7 +86,7 @@ module Spree
           @shipment.errors.add(:base, :cannot_remove_items_shipment_state, state: @shipment.state)
           invalid_resource!(@shipment)
         else
-          @shipment.order.contents.remove(variant, quantity, { shipment: @shipment })
+          @shipment.order.contents.remove(variant, quantity, {shipment: @shipment})
           @shipment.reload if @shipment.persisted?
           respond_with(@shipment, default_template: :show)
         end
@@ -110,19 +110,19 @@ module Spree
         )
 
         if fulfilment_changer.run!
-          render json: { success: true, message: t('spree.api.shipment.transfer_success') }, status: :accepted
+          render json: {success: true, message: t("spree.api.shipment.transfer_success")}, status: :accepted
         else
-          render json: { success: false, message: fulfilment_changer.errors.full_messages.to_sentence }, status: :accepted
+          render json: {success: false, message: fulfilment_changer.errors.full_messages.to_sentence}, status: :accepted
         end
       end
 
       private
 
       def load_transfer_params
-        @original_shipment         = Spree::Shipment.find_by!(number: params[:original_shipment_number])
-        @order                     = @original_shipment.order
-        @variant                   = Spree::Variant.find(params[:variant_id])
-        @quantity                  = params[:quantity].to_i
+        @original_shipment = Spree::Shipment.find_by!(number: params[:original_shipment_number])
+        @order = @original_shipment.order
+        @variant = Spree::Variant.find(params[:variant_id])
+        @quantity = params[:quantity].to_i
         authorize! [:update, :destroy], @original_shipment
         authorize! :create, Shipment
       end

data/app/controllers/spree/api/states_controller.rb

@@ -6,8 +6,8 @@ module Spree
       skip_before_action :authenticate_user
 
       def index
-        @states = scope.ransack(params[:q]).result.
-                    includes(:country).order('name ASC')
+        @states = scope.ransack(params[:q]).result
+          .includes(:country).order("name ASC")
 
         if params[:page] || params[:per_page]
           @states = paginate(@states)

data/app/controllers/spree/api/stock_items_controller.rb

@@ -62,7 +62,7 @@ module Spree
       end
 
       def scope
-        includes = { variant: [{ option_values: :option_type }, :product] }
+        includes = {variant: [{option_values: :option_type}, :product]}
         @stock_location.stock_items.accessible_by(current_ability).includes(includes)
       end
 
@@ -77,14 +77,14 @@ module Spree
 
       def adjust_stock_item_count_on_hand(count_on_hand_adjustment)
         if @stock_item.count_on_hand + count_on_hand_adjustment < 0
-          raise StockLocation::InvalidMovementError.new(t('spree.api.stock_not_below_zero'))
+          raise StockLocation::InvalidMovementError.new(t("spree.api.stock_not_below_zero"))
         end
         @stock_movement = @stock_location.move(@stock_item.variant, count_on_hand_adjustment, current_api_user)
         @stock_item = @stock_movement.stock_item
       end
 
       def render_stock_items_error
-        render json: { error: t('spree.api.stock_not_below_zero') }, status: 422
+        render json: {error: t("spree.api.stock_not_below_zero")}, status: 422
       end
     end
   end

data/app/controllers/spree/api/stock_locations_controller.rb

@@ -6,11 +6,11 @@ module Spree
       def index
         authorize! :index, StockLocation
 
-        @stock_locations = StockLocation.
-          accessible_by(current_ability).
-          order('name ASC').
-          ransack(params[:q]).
-          result
+        @stock_locations = StockLocation
+          .accessible_by(current_ability)
+          .order("name ASC")
+          .ransack(params[:q])
+          .result
 
         @stock_locations = paginate(@stock_locations)
 

data/app/controllers/spree/api/taxonomies_controller.rb

@@ -43,18 +43,18 @@ module Spree
       private
 
       def taxonomies
-        @taxonomies = Taxonomy.
-          accessible_by(current_ability).
-          order('name').
-          includes(root: :children).
-          ransack(params[:q]).
-          result
+        @taxonomies = Taxonomy
+          .accessible_by(current_ability)
+          .order("name")
+          .includes(root: :children)
+          .ransack(params[:q])
+          .result
       end
 
       def taxonomy
-        @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :show).
-          includes(root: :children).
-          find(params[:id])
+        @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :show)
+          .includes(root: :children)
+          .find(params[:id])
       end
 
       def taxonomy_params

data/app/controllers/spree/api/taxons_controller.rb

@@ -4,12 +4,12 @@ module Spree
   module Api
     class TaxonsController < Spree::Api::BaseController
       def index
-        if taxonomy
-          @taxons = taxonomy.root.children
+        @taxons = if taxonomy
+          taxonomy.root.children
         elsif params[:ids]
-          @taxons = Spree::Taxon.accessible_by(current_ability).where(id: params[:ids].split(','))
+          Spree::Taxon.accessible_by(current_ability).where(id: params[:ids].split(","))
         else
-          @taxons = Spree::Taxon.accessible_by(current_ability).order(:taxonomy_id, :lft).ransack(params[:q]).result
+          Spree::Taxon.accessible_by(current_ability).order(:taxonomy_id, :lft).ransack(params[:q]).result
         end
 
         unless params[:without_children]
@@ -36,7 +36,7 @@ module Spree
         taxonomy = Spree::Taxonomy.find_by(id: params[:taxonomy_id])
 
         if taxonomy.nil?
-          @taxon.errors.add(:taxonomy_id, I18n.t('spree.api.invalid_taxonomy_id'))
+          @taxon.errors.add(:taxonomy_id, I18n.t("spree.api.invalid_taxonomy_id"))
           invalid_resource!(@taxon) && return
         end
 
@@ -78,7 +78,7 @@ module Spree
             product_properties: true,
             classifications: true
           }
-          @product_attributes = %i(id name display_price)
+          @product_attributes = %i[id name display_price]
         end
         render "spree/api/products/index"
       end

data/app/controllers/spree/api/users_controller.rb

@@ -80,16 +80,10 @@ class Spree::Api::UsersController < Spree::Api::BaseController
   end
 
   def permitted_user_attributes
-    attributes = super
-
     if action_name == "create" || can?(:update_email, @user)
-      attributes |= [:email]
-    end
-
-    unless action_name == "create" || @user == current_api_user || can?(:update_password, @user)
-      attributes -= [:password, :password_confirmation]
+      super | [:email]
+    else
+      super
     end
-
-    attributes
   end
 end

data/app/controllers/spree/api/variants_controller.rb

@@ -63,10 +63,10 @@ module Spree
       end
 
       def scope
-        if @product
-          variants = @product.variants_including_master
+        variants = if @product
+          @product.variants_including_master
         else
-          variants = Spree::Variant
+          Spree::Variant
         end
 
         if current_ability.can?(:manage, Variant) && params[:show_deleted]
@@ -89,7 +89,7 @@ module Spree
       end
 
       def include_list
-        [{ option_values: :option_type }, :product, :prices, :images, { stock_items: :stock_location }]
+        [{option_values: :option_type}, :product, :prices, :images, {stock_items: :stock_location}]
       end
     end
   end

data/app/controllers/spree/api/zones_controller.rb

@@ -20,11 +20,11 @@ module Spree
       end
 
       def index
-        @zones = Spree::Zone.
-          accessible_by(current_ability).
-          order('name ASC').
-          ransack(params[:q]).
-          result
+        @zones = Spree::Zone
+          .accessible_by(current_ability)
+          .order("name ASC")
+          .ransack(params[:q])
+          .result
 
         @zones = paginate(@zones)
 

data/app/views/spree/api/addresses/_address.json.jbuilder

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 json.cache! address do
-  json.(address, *address_attributes)
+  json.call(address, *address_attributes)
   json.country do
     if address.country
-      json.(address.country, *country_attributes)
+      json.call(address.country, *country_attributes)
     else
       json.nil!
     end
   end
   json.state do
     if address.state
-      json.(address.state, *state_attributes)
+      json.call(address.state, *state_attributes)
     else
       json.nil!
     end

data/app/views/spree/api/adjustments/_adjustment.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.cache! [I18n.locale, adjustment] do
-  json.(adjustment, *adjustment_attributes)
+  json.call(adjustment, *adjustment_attributes)
   json.display_amount(adjustment.display_amount.to_s)
 end

data/app/views/spree/api/countries/index.json.jbuilder

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-json.countries(@countries) { |country| json.(country, *country_attributes) }
-json.partial! 'spree/api/shared/pagination', pagination: @countries
+json.countries(@countries) { |country| json.call(country, *country_attributes) }
+json.partial! "spree/api/shared/pagination", pagination: @countries

data/app/views/spree/api/countries/show.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-json.(@country, *country_attributes)
+json.call(@country, *country_attributes)
 json.states(@country.states) do |state|
-  json.(state, :id, :name, :abbr, :country_id)
+  json.call(state, :id, :name, :abbr, :country_id)
 end

data/app/views/spree/api/credit_cards/_credit_card.json.jbuilder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 json.cache! [I18n.locale, credit_card] do
-  json.(credit_card, *creditcard_attributes)
+  json.call(credit_card, *creditcard_attributes)
   json.address do
     if credit_card.address
       json.partial!("spree/api/addresses/address", address: credit_card.address)

data/app/views/spree/api/credit_cards/index.json.jbuilder

@@ -3,4 +3,4 @@
 json.credit_cards(@credit_cards) do |credit_card|
   json.partial!("spree/api/credit_cards/credit_card", credit_card:)
 end
-json.partial! 'spree/api/shared/pagination', pagination: @credit_cards
+json.partial! "spree/api/shared/pagination", pagination: @credit_cards

data/app/views/spree/api/customer_returns/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.customer_returns(@customer_returns) do |customer_return|
-  json.(customer_return, *customer_return_attributes)
+  json.call(customer_return, *customer_return_attributes)
 end
-json.partial! 'spree/api/shared/pagination', pagination: @customer_returns
+json.partial! "spree/api/shared/pagination", pagination: @customer_returns

data/app/views/spree/api/customer_returns/show.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(@customer_return, *customer_return_attributes)
+json.call(@customer_return, *customer_return_attributes)

data/app/views/spree/api/errors/invalid_api_key.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.error(I18n.t('spree.api.invalid_api_key', key: api_key))
+json.error(I18n.t("spree.api.invalid_api_key", key: api_key))

data/app/views/spree/api/images/_image.json.jbuilder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-json.(image, *image_attributes)
-json.(image, :viewable_type, :viewable_id)
+json.call(image, *image_attributes)
+json.call(image, :viewable_type, :viewable_id)
 
 Spree::Image.attachment_definitions[:attachment][:styles].each_key do |key|
   json.set! "#{key}_url", image.url(key)

data/app/views/spree/api/inventory_units/show.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(@inventory_unit, *inventory_unit_attributes)
+json.call(@inventory_unit, *inventory_unit_attributes)

data/app/views/spree/api/line_items/_line_item.json.jbuilder

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 json.cache! [I18n.locale, line_item] do
-  json.(line_item, *line_item_attributes)
+  json.call(line_item, *line_item_attributes)
   json.single_display_amount(line_item.single_display_amount.to_s)
   json.display_amount(line_item.display_amount.to_s)
   json.total(line_item.total)
   json.variant do
     json.partial!("spree/api/variants/small", variant: line_item.variant)
-    json.(line_item.variant, :product_id)
+    json.call(line_item.variant, :product_id)
     json.images(line_item.variant.gallery.images) do |image|
       json.partial!("spree/api/images/image", image:)
     end

data/app/views/spree/api/option_types/_option_type.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-json.(option_type, *option_type_attributes)
+json.call(option_type, *option_type_attributes)
 json.option_values(option_type.option_values) do |option_value|
-  json.(option_value, *option_value_attributes)
+  json.call(option_value, *option_value_attributes)
 end

data/app/views/spree/api/option_values/_option_value.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(option_value, *option_value_attributes)
+json.call(option_value, *option_value_attributes)

data/app/views/spree/api/orders/_big.json.jbuilder

@@ -2,7 +2,7 @@
 
 json.partial!("spree/api/orders/order", order:)
 json.payment_methods(order.available_payment_methods) do |payment_method|
-  json.(payment_method, :id, :name, :partial_name)
+  json.call(payment_method, :id, :name, :partial_name)
   json.method_type payment_method.partial_name
 end
 json.bill_address do
@@ -23,8 +23,8 @@ json.line_items(order.line_items) do |line_item|
   json.partial!("spree/api/line_items/line_item", line_item:)
 end
 json.payments(order.payments) do |payment|
-  json.(payment, *payment_attributes)
-  json.payment_method { json.(payment.payment_method, :id, :name) }
+  json.call(payment, *payment_attributes)
+  json.payment_method { json.call(payment.payment_method, :id, :name) }
   json.source do
     ##
     # payment.source could be a Spree::Payment. If it is then we need to call

data/app/views/spree/api/orders/_order.json.jbuilder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 json.cache! [I18n.locale, order] do
-  json.(order, *order_attributes)
+  json.call(order, *order_attributes)
   json.display_item_total(order.display_item_total.to_s)
   json.total_quantity(order.line_items.to_a.sum(&:quantity))
   json.display_total(order.display_total.to_s)

data/app/views/spree/api/orders/index.json.jbuilder

@@ -3,4 +3,4 @@
 json.orders(@orders) do |order|
   json.partial!("spree/api/orders/order", order:)
 end
-json.partial! 'spree/api/shared/pagination', pagination: @orders
+json.partial! "spree/api/shared/pagination", pagination: @orders

data/app/views/spree/api/orders/mine.json.jbuilder

@@ -3,4 +3,4 @@
 json.orders(@orders) do |order|
   json.partial!("spree/api/orders/big", order:)
 end
-json.partial! 'spree/api/shared/pagination', pagination: @orders
+json.partial! "spree/api/shared/pagination", pagination: @orders

data/app/views/spree/api/payments/credit_over_limit.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.error(I18n.t('spree.api.payment.credit_over_limit', limit: @payment.credit_allowed))
+json.error(I18n.t("spree.api.payment.credit_over_limit", limit: @payment.credit_allowed))

data/app/views/spree/api/payments/index.json.jbuilder

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-json.payments(@payments) { |payment| json.(payment, *payment_attributes) }
-json.partial! 'spree/api/shared/pagination', pagination: @payments
+json.payments(@payments) { |payment| json.call(payment, *payment_attributes) }
+json.partial! "spree/api/shared/pagination", pagination: @payments

data/app/views/spree/api/payments/new.json.jbuilder

@@ -2,5 +2,5 @@
 
 json.attributes([*payment_attributes])
 json.payment_methods(@payment_methods) do |payment_method|
-  json.(payment_method, *payment_method_attributes)
+  json.call(payment_method, *payment_method_attributes)
 end

data/app/views/spree/api/payments/show.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(@payment, *payment_attributes)
+json.call(@payment, *payment_attributes)

data/app/views/spree/api/payments/source_views/_gateway.json.jbuilder

@@ -5,4 +5,4 @@ if current_user_roles.include?("admin")
   attrs += [:gateway_customer_profile_id, :gateway_payment_profile_id]
 end
 
-json.(payment_source, *attrs)
+json.call(payment_source, *attrs)

data/app/views/spree/api/payments/source_views/_store_credit.json.jbuilder

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-json.(payment_source, :id, :memo, :created_at)
+json.call(payment_source, :id, :memo, :created_at)
 json.created_by payment_source.created_by.email
 json.category payment_source.category, :id, :name

data/app/views/spree/api/payments/update_forbidden.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.error(I18n.t('spree.api.payment.update_forbidden', state: @payment.state))
+json.error(I18n.t("spree.api.payment.update_forbidden", state: @payment.state))

data/app/views/spree/api/product_properties/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.product_properties(@product_properties) do |product_property|
-  json.(product_property, *product_property_attributes)
+  json.call(product_property, *product_property_attributes)
 end
-json.partial! 'spree/api/shared/pagination', pagination: @product_properties
+json.partial! "spree/api/shared/pagination", pagination: @product_properties

data/app/views/spree/api/product_properties/show.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(@product_property, *product_property_attributes)
+json.call(@product_property, *product_property_attributes)

data/app/views/spree/api/products/_product.json.jbuilder

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 @product_attributes ||= product_attributes
-json.cache! [I18n.locale, current_user_roles.include?('admin'), current_pricing_options, @product_attributes, @exclude_data, product] do
-  json.(product, *(@product_attributes - [:total_on_hand]))
+json.cache! [I18n.locale, current_user_roles.include?("admin"), current_pricing_options, @product_attributes, @exclude_data, product] do
+  json.call(product, *(@product_attributes - [:total_on_hand]))
   json.total_on_hand(total_on_hand_for(product))
   json.price(product.price_for_options(current_pricing_options)&.amount)
   json.display_price(product.price_for_options(current_pricing_options)&.money&.to_s)
@@ -19,17 +19,17 @@ json.cache! [I18n.locale, current_user_roles.include?('admin'), current_pricing_
   end
   unless @exclude_data[:option_types]
     json.option_types(product.option_types) do |option_type|
-      json.(option_type, *option_type_attributes)
+      json.call(option_type, *option_type_attributes)
     end
   end
   unless @exclude_data[:product_properties]
     json.product_properties(product.product_properties) do |product_property|
-      json.(product_property, *product_property_attributes)
+      json.call(product_property, *product_property_attributes)
     end
   end
   unless @exclude_data[:classifications]
     json.classifications(product.classifications) do |classification|
-      json.(classification, :taxon_id, :position)
+      json.call(classification, :taxon_id, :position)
       json.taxon do
         json.partial!("spree/api/taxons/taxon", taxon: classification.taxon)
       end

data/app/views/spree/api/products/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-json.partial! 'spree/api/shared/pagination', pagination: @products
+json.partial! "spree/api/shared/pagination", pagination: @products
 json.products(@products) do |product|
   json.partial!("spree/api/products/product", product:)
 end

data/app/views/spree/api/promotions/show.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(@promotion, *promotion_attributes)
+json.call(@promotion, *promotion_attributes)

data/app/views/spree/api/properties/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.properties(@properties) do |property|
-  json.(property, *property_attributes)
+  json.call(property, *property_attributes)
 end
-json.partial! 'spree/api/shared/pagination', pagination: @properties
+json.partial! "spree/api/shared/pagination", pagination: @properties

data/app/views/spree/api/properties/show.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(@property, *property_attributes)
+json.call(@property, *property_attributes)

data/app/views/spree/api/return_authorizations/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.return_authorizations(@return_authorizations) do |return_authorization|
-  json.(return_authorization, *return_authorization_attributes)
+  json.call(return_authorization, *return_authorization_attributes)
 end
-json.partial! 'spree/api/shared/pagination', pagination: @return_authorizations
+json.partial! "spree/api/shared/pagination", pagination: @return_authorizations

data/app/views/spree/api/return_authorizations/show.json.jbuilder

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.(@return_authorization, *return_authorization_attributes)
+json.call(@return_authorization, *return_authorization_attributes)

data/app/views/spree/api/shared/_pagination.json.jbuilder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-json.count        pagination.count
-json.total_count  pagination.total_count
+json.count pagination.count
+json.total_count pagination.total_count
 json.current_page pagination.current_page
-json.pages        pagination.total_pages
-json.per_page     pagination.limit_value
+json.pages pagination.total_pages
+json.per_page pagination.limit_value