Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions app/controllers/spree/api/ams/countries_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,18 @@ class CountriesController < Spree::Api::CountriesController

# We don't need this paginated.
def index
@countries = Country.accessible_by(current_ability, :read).order('name ASC')
@countries = Country.accessible_by(current_ability, :read)
.includes(:states).order(:name)

isos = params[:isos]
isos = isos.split ',' if isos.is_a?(String)

@countries = @countries.where(iso: isos) if isos.present?

respond_with @countries
end

end
end
end
end
end
7 changes: 3 additions & 4 deletions app/serializers/spree/state_serializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ class StateSerializer < ActiveModel::Serializer

attributes :id,
:name,
:abbr

has_one :country, include: false
:abbr,
:country_id

end
end
end