diff --git a/app/controllers/api/display_images_controller.rb b/app/controllers/api/display_images_controller.rb index 47d72f34..81c41c57 100644 --- a/app/controllers/api/display_images_controller.rb +++ b/app/controllers/api/display_images_controller.rb @@ -1,7 +1,9 @@ class Api::DisplayImagesController < Api::ApiController skip_before_action :authenticate + skip_before_action :set_current_tenant_by_subdomain_or_name, only: [:display_image] + def display_image - display_image = DisplayImage.where("shop_code",params[:shop_code]).last + display_image = DisplayImage.where("shop_code=?",params[:shop_code]).last unless display_image.nil? image = Base64.decode64(display_image.image.gsub(/\Adata:image\/jpeg;base64\,/, '')) send_data image,:filename=>"shop.jpeg",:type=> "image/jpeg", :disposition => 'inline' diff --git a/app/controllers/api/shops_controller.rb b/app/controllers/api/shops_controller.rb index 42842fdf..7c264f83 100644 --- a/app/controllers/api/shops_controller.rb +++ b/app/controllers/api/shops_controller.rb @@ -3,8 +3,7 @@ class Api::ShopsController < Api::ApiController skip_before_action :set_current_tenant_by_subdomain_or_name, only: [:index, :show] def index - @shops = Shop.select('shops.id, logo, shops.name, shops.shop_code') - # @shops = Shop.select('id, logo, name, shop_code').where.not(cloud_url: nil).all + @shops = Shop.select('id, logo, name, shop_code').where.not(cloud_url: nil).all end def show