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

app/assets/javascripts/origami.js

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

app/uploaders/menu_item_image_uploader.rb

@@ -15,7 +15,7 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   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}"
   end