diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d2faf9da..fd37fb2d 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -183,7 +183,27 @@ $(document).ready(function() { ' {caption}\n' + '\n', } - }); + }); + + $(".order").fileinput({ + previewFileType: "mp3", + allowedFileExtensions: ["mp3"], + browseClass: "btn btn-success", + browseLabel: "Pick Audio", + browseIcon: " ", + removeClass: "btn btn-danger", + removeLabel: "Delete", + removeIcon: " ", + showUpload: false, + // uploadClass: "btn btn-info", + // uploadLabel: "Upload", + // uploadIcon: " ", + previewTemplates: { + image: '
\n' + + ' {caption}\n' + + '
\n', + } + }); // first input focus for all form $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus(); diff --git a/app/controllers/settings/shops_controller.rb b/app/controllers/settings/shops_controller.rb index 975d9e25..7d9ccd25 100644 --- a/app/controllers/settings/shops_controller.rb +++ b/app/controllers/settings/shops_controller.rb @@ -47,13 +47,26 @@ class Settings::ShopsController < ApplicationController # PATCH/PUT /settings/shops/1 # PATCH/PUT /settings/shops/1.json def update - respond_to do |format| if @settings_shop.update(shop_params) if params[:display_images].present? params[:display_images][:image].each do |a| - @aa = Base64.encode64(a.read) - @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => "data:image/jpeg;base64,"+@aa) + if File.extname(a.original_filename) == ".mp3" + delete_path = Rails.root.join("public/#{@settings_shop.display_images.find_by_name("order_audio").image}") + if File.exists?(delete_path) + File.delete(delete_path) + end + save_path = Rails.root.join("public/#{Shop.find(1).shop_code}_#{a.original_filename}") + File.open(save_path, 'wb') do |f| + f.write a.read + end + audio_name = "#{Shop.find(1).shop_code}_#{a.original_filename}" + @settings_shop.display_images.where(:name => "order_audio").destroy_all + @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :name => "order_audio", :image => audio_name) + else + @aa = Base64.encode64(a.read) + @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => "data:image/jpeg;base64,"+@aa) + end end end format.html { redirect_to settings_shops_url, notice: 'Shop was successfully updated.' } @@ -85,6 +98,6 @@ class Settings::ShopsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def shop_params - params.require(:shop).permit(:logo, :name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info, display_images_attributes: [:id, :shop_id, :image]) + params.require(:shop).permit(:logo, :name,:address,:city,:township,:state,:country,:phone_no,:reservation_no,:license,:activated_at,:license_data,:base_currency,:cloud_token,:cloud_url,:owner_token,:id_prefix,:is_rounding_adj,:quick_sale_summary,:calc_tax_order,:show_account_info, display_images_attributes: [:id, :shop_id, :name, :image]) end end diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb index 57665164..bc9bf75d 100755 --- a/app/views/settings/shops/_form.html.erb +++ b/app/views/settings/shops/_form.html.erb @@ -41,20 +41,40 @@
-
- +
+
<%= f.fields_for :display_images do |p| %> + <% 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 %>
+
+
+ <%= f.file_field :image, :multiple => true, name: "display_images[image][]" %> +
+ +
+
+ +
+
+
+ <%= f.fields_for :display_images do |p| %> + <% if !p.object.name.nil? %> + <%= "#{p.object.image}"%> + <% end %> + <% end %> +
-
- <%= f.file_field :image, :multiple => true, name: "display_images[image][]" %> +
+
+ <%= f.file_field :image, :multiple => false, name: "display_images[image][]", accept: 'audio/mp3', :class => "order" %>
diff --git a/app/views/settings/shops/show.html.erb b/app/views/settings/shops/show.html.erb index 40082d72..eb8632e2 100755 --- a/app/views/settings/shops/show.html.erb +++ b/app/views/settings/shops/show.html.erb @@ -103,7 +103,19 @@ Shop Images <% @display_images.each do |p| %> - <%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%> + <% if p.name.nil? %> + <%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%> + <% end %> + <% end %> + + + + Order Audio + + <% @display_images.each do |p| %> + <% if !p.name.nil? %> + <%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%> + <% end %> <% end %> diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index fb212f13..04204a73 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -18,13 +18,13 @@ class ActionController::Base # redirect_to root_url(:host => request.domain) + "store_error" render :json => [{ status: false, message: 'Invalid Access!'}] end - else - # check for license file - if check_license - current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + # else + # # check for license file + # if check_license + # current_license(ENV["SX_PROVISION_URL"]) + # else + # redirect_to activate_path + # end end end