git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict after merch dev for current shop

Browse Source
This commit is contained in:
Nweni
2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/settings/shops_controller.rb
View File

@@ -56,14 +56,15 @@ class Settings::ShopsController < ApplicationController
audio_data = @settings_shop.display_images.find_by_name("order_audio").image
delete_path = Rails.root.join("public/#{audio_data}")
if File.exists?(delete_path)
File.delete(delete_path)
end
end
save_path = Rails.root.join("public/#{current_shop.shop_code}_#{a.original_filename}")
File.delete(delete_path)
end
end
save_path = Rails.root.join("public/#{Shop.current_shop.shop_code}_#{a.original_filename}")
File.open(save_path, 'wb') do |f|
f.write a.read
end
audio_name = "#{current_shop.shop_code}_#{a.original_filename}"
audio_name = "#{Shop.current_shop.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