From 54175ddcdf6cbfde53a37828430997ce6929d728 Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Fri, 6 Mar 2020 11:20:16 +0630 Subject: [PATCH] cover image --- .../api/display_images_controller.rb | 10 +++++++ app/controllers/api/shops_controller.rb | 5 ++-- app/views/api/shops/index.json.jbuilder | 8 +++++- app/views/settings/shops/_form.html.erb | 26 +++++++++---------- blah | 0 config/routes.rb | 3 +++ 6 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 app/controllers/api/display_images_controller.rb create mode 100644 blah diff --git a/app/controllers/api/display_images_controller.rb b/app/controllers/api/display_images_controller.rb new file mode 100644 index 00000000..47d72f34 --- /dev/null +++ b/app/controllers/api/display_images_controller.rb @@ -0,0 +1,10 @@ +class Api::DisplayImagesController < Api::ApiController + skip_before_action :authenticate + def display_image + 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' + end + end +end diff --git a/app/controllers/api/shops_controller.rb b/app/controllers/api/shops_controller.rb index 3d34959a..42842fdf 100644 --- a/app/controllers/api/shops_controller.rb +++ b/app/controllers/api/shops_controller.rb @@ -3,9 +3,8 @@ 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,image as cover') - .left_joins(:display_images) - .where.not(cloud_url: nil).order('shop_code,display_images.created_at desc').uniq + @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 end def show diff --git a/app/views/api/shops/index.json.jbuilder b/app/views/api/shops/index.json.jbuilder index 4c80b9c3..1bbc4a0d 100644 --- a/app/views/api/shops/index.json.jbuilder +++ b/app/views/api/shops/index.json.jbuilder @@ -1,6 +1,12 @@ if @shops json.status true - json.data @shops + json.data @shops do |shop| + json.id shop.id + json.name shop.name + json.logo shop.logo + json.shop_code shop.shop_code + json.cover shop.display_images.empty? ? nil : "#{api_display_image_url(shop.shop_code)}.jpeg" + end else json.status false json.message "Record Not Found" diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb index 08fda560..85d928b1 100755 --- a/app/views/settings/shops/_form.html.erb +++ b/app/views/settings/shops/_form.html.erb @@ -23,7 +23,7 @@ <%= f.input :quick_sale_summary %> <%= f.input :calc_tax_order %> <%= f.input :show_account_info %> - + @@ -34,13 +34,13 @@ <% if f.object.logo? %>

<%= f.object.name %>

<%= image_tag f.object.logo.url, :class => "img-thumbnail" %> - <% else %> + <% else %> <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> + <% end %> <%= f.file_field :logo, :class => "img-thumbnail" %> - +
@@ -52,14 +52,14 @@ <% if p.object.name.nil? %> <%= image_tag "#{p.object.image}", :class => "img-thumbnail second-display", :size => "150x185"%> <%= link_to 'delete'.html_safe, settings_shop_display_image_path(p.object), method: :delete %> - <% end %> - <% end %> + <% end %> + <% end %>
- + <%= f.file_field :image, :multiple => true, name: "display_images[image][]" %> - +
@@ -71,13 +71,13 @@ <% if !p.object.name.nil? %> <%= "#{p.object.image}"%> <% end %> - <% end %> + <% end %>
- + <%= f.file_field :image, :multiple => false, name: "display_images[image][]", accept: 'audio/mp3', :class => "order" %> - + <%= f.input :note, as: :text, :input_html => { :rows => 5} %> @@ -110,7 +110,7 @@ 14)is_rounding_adj - to check for calculate rounding adj of shop
15)quick_sale_summary - to check for view Quick Sale Summary
16)calc_tax_order - to check for tax calculation of shop
- +

list <%= t("views.right_panel.header.button_lists") %>

@@ -122,6 +122,6 @@ 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.shop_txt") %>

- + diff --git a/blah b/blah new file mode 100644 index 00000000..e69de29b diff --git a/config/routes.rb b/config/routes.rb index 79de27da..a303d2d0 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -138,6 +138,9 @@ scope "(:locale)", locale: /en|mm/ do #for foodcourt app get "search_paypar_account_no" => "payments#search_paypar_account_no" # get "check_security_code" => "payments#check_security_code" + + #for display image + get "display_image/:shop_code" => "display_images#display_image", as:'display_image' end #--------- Cashier ------------#