X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=app%2Fhelpers%2Fbase_helper.rb;h=c3a49b82e39fd3f21a0d8b6b0cdff9a8acac9b2f;hb=cfb890a96852d08238dd5f6e9ff6970349034e24;hp=02f99b0442ca4f0075f7664b4da8aaa649786b52;hpb=bb6df0b3e34944376c5dcf6a3acbef333f95a6eb;p=elecoma%2Felecoma.git

diff --git a/app/helpers/base_helper.rb b/app/helpers/base_helper.rb
index 02f99b0..c3a49b8 100644
--- a/app/helpers/base_helper.rb
+++ b/app/helpers/base_helper.rb
@@ -284,9 +284,10 @@ EJS
     options = ({
       :alt => payment.name
     }).merge(options)
-    id = payment.resource_id
-    if id
-      view_resource_id(id, options)
+    if payment.use_remote_resource
+      image_tag(payment.resource_url, options) unless payment.resource_url.blank?
+    elsif payment.resource_id
+      view_resource_id(payment.resource_id, options)
     else
       ''
     end
@@ -321,6 +322,20 @@ EJS
     end
   end
 
+  def logo_without_text(payment)
+    if payment.use_remote_resource
+      if !payment.resource_url.blank? && payment.without_text
+        true
+      else
+        false
+      end
+    elsif payment.resource_id && payment.without_text
+      true
+    else
+      false
+    end 
+  end
+
 =begin rdoc
   <select>
    <option value="x">食料</option>