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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes

Browse Source
This commit is contained in:
yemin
2018-10-11 11:41:52 +06:30
parent fe76398617 549a655bad
commit bc4d616363
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/origami.js
View File

@@ -492,6 +492,7 @@ function getAllMenu(){
url: '/origami/get_all_menu', url: '/origami/get_all_menu',
data: {}, data: {},
success:function(result){ success:function(result){
console.log(result)
localStorage.setItem("menus", JSON.stringify(result)); localStorage.setItem("menus", JSON.stringify(result));
var menu = localStorage.getItem("menus"); var menu = localStorage.getItem("menus");

2
app/uploaders/menu_item_image_uploader.rb
View File

@@ -15,7 +15,7 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
# Override the directory where uploaded files will be stored. # Override the directory where uploaded files will be stored.
# This is a sensible default for uploaders that are meant to be mounted: # This is a sensible default for uploaders that are meant to be mounted:
def store_dir def store_dir
"image/menu_images/#{current_shop.shop_code}" "image/menu_images/#{Shop.first.shop_code}"
# "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
end end