solidus_api 2.5.2 → 2.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddcab56109f84fbbfb71d8d153d0089ac3f2828bf9777a706327ce2965f30efc
-  data.tar.gz: 65406b044f2831228871056a36f8fa77553b027d1118c350dcce53aab5f55d61
+  metadata.gz: 7c5d3883943667e7a4f52315a0071be065726a672bdf8d9b18e1048fe4a4d5c3
+  data.tar.gz: c0efc2209c8ab214173df7181e4eb29b8c3ffcd9b88b5bf6ce1a23eb680efe7c
 SHA512:
-  metadata.gz: ce13a46a961d8c7182ffd054609c209f21af399a19140511daaa51d1aff84510c0788f883bb8ca0f2cb47c41b12d19202b611f2b2fa189963154c84b82999932
-  data.tar.gz: 5d19e5737c30c49dc9c8269d9244db721695bfd49a8e611826d00b07088cbc597f887f07a9df29220da0cf297e00e7b59bb7d813de6afa81875d631f2b69bdca
+  metadata.gz: 7a4bb5441f83cea2bf0707e1a60a6b652e941617b2f1bfc22277f56787adcb720e13100d6d1cb4ea1aea8a887c74fbb685b454c6cd086308042361a6aaa0d4a5
+  data.tar.gz: 5f7b1a01e2201a559398510e9868b59b40a9e40b05c168a93b07ecbdfa5257e9ed447b8a66209218ff46d72d25b61dd3475b2dd436cc00eda528f31f0905dc8b

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
@@ -8,7 +10,7 @@ RSpec::Core::RakeTask.new
 task default: :spec
 
 DummyApp::RakeTasks.new(
-  gem_root: File.expand_path('../', __FILE__),
+  gem_root: File.expand_path(__dir__),
   lib_name: 'solidus_api'
 )
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class AddressBooksController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class AddressesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/api/responders'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class CheckoutsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ClassificationsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ConfigController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class CountriesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class CreditCardsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ImagesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class InventoryUnitsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class LineItemsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class OptionTypesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class OptionValuesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class OrdersController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class PaymentsController < Spree::Api::BaseController
@@ -27,7 +29,7 @@ module Spree
 
       def update
         authorize! params[:action], @payment
-        if ! @payment.pending?
+        if !@payment.pending?
           render 'update_forbidden', status: 403
         elsif @payment.update_attributes(payment_params)
           respond_with(@payment, default_template: :show)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ProductPropertiesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ProductsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class PromotionsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class PropertiesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::Api::ResourceController < Spree::Api::BaseController
   before_action :load_resource, only: [:show, :update, :destroy]
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ReturnAuthorizationsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ShipmentsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class StatesController < Spree::Api::BaseController
@@ -24,9 +26,9 @@ module Spree
       def scope
         if params[:country_id]
           @country = Spree::Country.accessible_by(current_ability, :read).find(params[:country_id])
-          return @country.states.accessible_by(current_ability, :read)
+          @country.states.accessible_by(current_ability, :read)
         else
-          return Spree::State.accessible_by(current_ability, :read)
+          Spree::State.accessible_by(current_ability, :read)
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class StockItemsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class StockLocationsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class StockMovementsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::Api::StoreCreditEventsController < Spree::Api::BaseController
   def mine
     if current_api_user

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class StoresController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class TaxonomiesController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class TaxonsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::Api::UsersController < Spree::Api::ResourceController
   private
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class VariantsController < Spree::Api::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     class ZonesController < Spree::Api::BaseController

data/app/helpers/spree/api/api_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     module ApiHelpers
@@ -51,7 +53,7 @@ module Spree
       @@product_attributes = [
         :id, :name, :description, :price, :display_price, :available_on,
         :slug, :meta_description, :meta_keywords, :shipping_category_id,
-        :taxon_ids, :total_on_hand
+        :taxon_ids, :total_on_hand, :meta_title
       ]
 
       @@product_property_attributes = [
@@ -131,7 +133,7 @@ module Spree
 
       @@adjustment_attributes = [
         :id, :source_type, :source_id, :adjustable_type, :adjustable_id,
-        :amount, :label, :promotion_code,
+        :amount, :label, :promotion_code_id,
         :finalized, :eligible, :created_at, :updated_at
       ]
 
@@ -166,12 +168,12 @@ module Spree
 
       @@store_attributes = [
         :id, :name, :url, :meta_description, :meta_keywords, :seo_title,
-        :mail_from_address, :default_currency, :code, :default
+        :mail_from_address, :default_currency, :code, :default, :available_locales
       ]
 
       @@store_credit_history_attributes = [
         :display_amount, :display_user_total_amount, :display_action,
-        :display_event_date
+        :display_event_date, :display_remaining_amount
       ]
 
       def variant_attributes

data/app/models/spree/api_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class ApiConfiguration < Preferences::Configuration
     preference :requires_authentication, :boolean, default: true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.array! @user_addresses do |user_address|
   json.partial!("spree/api/addresses/address", address: user_address.address)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! address do
   json.(address, *address_attributes)
   json.country do

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/addresses/address", address: @address)

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

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

data/app/views/spree/api/config/money.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.symbol(::Money.new(1, Spree::Config[:currency]).symbol)

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.default_country_id(Spree::Country.default.id)
 json.default_country_iso(Spree::Config[:default_country_iso])

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

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, credit_card] do
   json.(credit_card, *creditcard_attributes)
   json.address do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.credit_cards(@credit_cards) do |credit_card|
   json.partial!("spree/api/credit_cards/credit_card", credit_card: credit_card)
 end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/credit_cards/credit_card", credit_card: @credit_card)

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error I18n.t(:delete_restriction_error, scope: "spree.api")

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:gateway_error, scope: "spree.api", text: @error))

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

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

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:invalid_resource, scope: "spree.api"))
 json.errors(@resource.errors.to_hash)

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:must_specify_api_key, scope: "spree.api"))

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:resource_not_found, scope: "spree.api"))

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:unauthorized, scope: "spree.api"))

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.(image, *image_attributes)
 json.(image, :viewable_type, :viewable_id)
 Spree::Image.attachment_definitions[:attachment][:styles].each do |k, _v|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.images(@images) do |image|
   json.partial!("spree/api/images/image", image: image)
 end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/images/image", image: @image)

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, line_item] do
   json.(line_item, *line_item_attributes)
   json.single_display_amount(line_item.single_display_amount.to_s)

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes(([*line_item_attributes] - [:id]))
 json.required_attributes([:variant_id, :quantity])

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/line_items/line_item", line_item: @line_item)

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.array! @option_types do |option_type|
   json.partial!("spree/api/option_types/option_type", option_type: option_type)
 end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/option_types/option_type", option_type: @option_type)

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.array! @option_values do |option_value|
   json.partial!("spree/api/option_values/option_value", option_value: option_value)
 end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/option_values/option_value", option_value: @option_value)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/orders/order", order: order)
 json.payment_methods(order.available_payment_methods) do |payment_method|
   json.(payment_method, :id, :name, :partial_name)
@@ -24,12 +26,18 @@ json.payments(order.payments) do |payment|
   json.(payment, *payment_attributes)
   json.payment_method { json.(payment.payment_method, :id, :name) }
   json.source do
-    if payment.source
-      json.(payment.source, *payment_source_attributes)
+    ##
+    # payment.source could be a Spree::Payment. If it is then we need to call
+    # source twice.
+    # @see https://github.com/solidusio/solidus/blob/v2.4/backend/app/views/spree/admin/payments/show.html.erb#L16
+    #
+    payment_source = payment.source.is_a?(Spree::Payment) ? payment.source.source : payment.source
 
-      if @current_user_roles.include?("admin")
-        json.(payment.source, :gateway_customer_profile_id, :gateway_payment_profile_id)
-      end
+    if payment_source
+      json.partial!(
+        "spree/api/payments/source_views/#{payment.payment_method.partial_name}",
+        payment_source: payment_source
+      )
     else
       json.nil!
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, order] do
   json.(order, *order_attributes)
   json.display_item_total(order.display_item_total.to_s)

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error(@coupon_message)

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:could_not_transition, scope: "spree.api.order"))
 json.errors(@order.errors.to_hash)

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.errors(expected_total: [I18n.t(:expected_total_mismatch, scope: "spree.api.order")])

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.orders(@orders) do |order|
   json.partial!("spree/api/orders/order", order: order)
 end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.errors([I18n.t(:invalid_shipping_method, scope: "spree.api.order")])

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.orders(@orders) do |order|
   json.partial!("spree/api/orders/big", order: order)
 end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/orders/big", order: @order)

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

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.attributes([*payment_attributes])
 json.payment_methods(@payment_methods) do |payment_method|
   json.(payment_method, *payment_method_attributes)

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

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

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

@@ -0,0 +1 @@
+json.nil!