diff --git a/app/uploaders/commissioner_image_uploader.rb b/app/uploaders/commissioner_image_uploader.rb index a6389405..9b65e4a8 100644 --- a/app/uploaders/commissioner_image_uploader.rb +++ b/app/uploaders/commissioner_image_uploader.rb @@ -20,10 +20,10 @@ class CommissionerImageUploader < CarrierWave::Uploader::Base end def filename - if current_shop.shop_code.nil? + if Shop.first.shop_code.nil? "#{original_filename}" if original_filename.present? else - "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? + "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? end end diff --git a/app/uploaders/customer_image_uploader.rb b/app/uploaders/customer_image_uploader.rb index 13a384f0..be1326d6 100644 --- a/app/uploaders/customer_image_uploader.rb +++ b/app/uploaders/customer_image_uploader.rb @@ -20,10 +20,10 @@ class CustomerImageUploader < CarrierWave::Uploader::Base end def filename - if current_shop.shop_code.nil? + if Shop.first.shop_code.nil? "#{original_filename}" if original_filename.present? else - "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? + "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? end end diff --git a/app/uploaders/employee_image_uploader.rb b/app/uploaders/employee_image_uploader.rb index e176d660..17c9d120 100644 --- a/app/uploaders/employee_image_uploader.rb +++ b/app/uploaders/employee_image_uploader.rb @@ -20,10 +20,10 @@ class EmployeeImageUploader < CarrierWave::Uploader::Base end def filename - if current_shop.shop_code.nil? + if Shop.first.shop_code.nil? "#{original_filename}" if original_filename.present? else - "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? + "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? end end diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb index 4198e501..8a340b22 100755 --- a/app/uploaders/menu_item_image_uploader.rb +++ b/app/uploaders/menu_item_image_uploader.rb @@ -20,10 +20,10 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base end def filename - if current_shop.shop_code.nil? + if Shop.first.shop_code.nil? "#{original_filename}" if original_filename.present? else - "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? + "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? end end diff --git a/app/uploaders/product_image_uploader.rb b/app/uploaders/product_image_uploader.rb index 32e5f272..c39d867d 100755 --- a/app/uploaders/product_image_uploader.rb +++ b/app/uploaders/product_image_uploader.rb @@ -20,10 +20,10 @@ class ProductImageUploader < CarrierWave::Uploader::Base end def filename - if current_shop.shop_code.nil? + if Shop.first.shop_code.nil? "#{original_filename}" if original_filename.present? else - "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? + "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? end end diff --git a/app/uploaders/shop_image_uploader.rb b/app/uploaders/shop_image_uploader.rb index 7927548a..394704c3 100644 --- a/app/uploaders/shop_image_uploader.rb +++ b/app/uploaders/shop_image_uploader.rb @@ -20,10 +20,10 @@ class ShopImageUploader < CarrierWave::Uploader::Base end def filename - if current_shop.shop_code.nil? + if Shop.first.shop_code.nil? "#{original_filename}" if original_filename.present? else - "#{current_shop.shop_code}_#{original_filename}" if original_filename.present? + "#{Shop.first.shop_code}_#{original_filename}" if original_filename.present? end end