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

app/uploaders/commissioner_image_uploader.rb

@@ -20,7 +20,11 @@ class CommissionerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir

app/uploaders/customer_image_uploader.rb

@@ -20,7 +20,11 @@ class CustomerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir

app/uploaders/employee_image_uploader.rb

@@ -20,7 +20,11 @@ class EmployeeImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir

app/uploaders/menu_item_image_uploader.rb

@@ -20,7 +20,11 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir

app/uploaders/product_image_uploader.rb

@@ -20,7 +20,11 @@ class ProductImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir

app/uploaders/shop_image_uploader.rb

@@ -20,7 +20,11 @@ class ShopImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir