Merge branch 'r-1902001-01' into foodcourt

2020-08-04 11:45:01 +06:30
parent 9a17ab5d9b ffb8e56031
commit 82925881f7
43 changed files with 401 additions and 970 deletions
--- a/app/uploaders/customer_image_uploader.rb
+++ b/app/uploaders/customer_image_uploader.rb
@@ -20,10 +20,11 @@ class CustomerImageUploader < CarrierWave::Uploader::Base
  end

  def filename
-    if Shop.current_shop.nil?
-      "#{original_filename}" if original_filename.present?
+    return unless original_filename.present?
+    if Shop.current_shop.shop_code.nil?
+      "#{original_filename}"
    else
-      "#{Shop.current_shop.shop_code}_#{original_filename}" if original_filename.present?
+      "#{Shop.current_shop.shop_code}_#{original_filename}"
    end
  end