trying to generalize image attachment handling for sold and unsold li…

…ne item groups
fairmondo · Jan 19, 2015 · 92744ed · 92744ed
1 parent 57b1914
commit 92744ed
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/app/mailers/cart_mailer.rb b/app/mailers/cart_mailer.rb
@@ -78,14 +78,14 @@ def send_cart(cart_id, email)
   private
 
     def add_image_attachments_for line_item_group
-      line_item_group.business_transactions.each do |bt|
-        attachment = image_attachment_for bt
-        attachments.inline[bt.article.title_image.image_file_name] = attachment if attachment
+      line_item_group.line_items.each do |li|
+        attachment = image_attachment_for li
+        attachments.inline[li.article.title_image.image_file_name] = attachment if attachment
       end
     end
 
-    def image_attachment_for business_transaction
-      image = business_transaction.article.title_image
+    def image_attachment_for line_item
+      image = line_item.article.title_image
       if image
         attachment = {
           content: File.read("#{ Rails.root }/#{ image.image.path(:thumb) }"),

diff --git a/app/views/carts/show/_open.html.slim b/app/views/carts/show/_open.html.slim
@@ -13,14 +13,7 @@ p
         p
           = t('article.free_transport_at', price: money(group.seller_free_transport_at_price))
       - if group.seller_has_other_articles?
-<<<<<<< HEAD
         = link_to t('cart.texts.shop_on'), user_path(group.seller), class: 'Button Button--small Button--gray'
-||||||| merged common ancestors
-        = link_to 'Weiter bei diesem/dieser Händler*in einkaufen', user_path(group.seller), class: 'Button Button--small Button--gray'
-=======
-        p
-          = link_to 'Weiter bei diesem/dieser Händler*in einkaufen', user_path(group.seller), class: 'Button Button--small Button--gray'
->>>>>>> master
   .checkout
     .total_price
       = t('cart.texts.total')

diff --git a/config/locales/cart/de.yml b/config/locales/cart/de.yml
@@ -15,6 +15,7 @@ de:
       purchase_from: "Deine Bestellungen vom %{date}"
       your_order_for: "Deine Bestellung bei"
       shop_on: 'Weiter bei diesem/dieser Händler*in einkaufen'
+      send_via_email: 'Den Inhalt des Warenkorbes per E-Mail versenden'
       terms: "AGB"
       explain: "Eine Bestellbestätigung wurde per Email an Deine Adresse versandt. Du hast Bestellungen bei mehreren Anbietern getätigt. Die unten angezeigten Bestellungen kannst du auch über Dein Profil abrufen."
       cancellation: "Widerrufsbelehrung"

diff --git a/test/features/cart_test.rb b/test/features/cart_test.rb
@@ -446,9 +446,9 @@ def expect_cart_emails arg= :once
       page.html.must_include I18n.t('line_item.notices.success_create', href: '/carts/1').html_safe
       click_link(I18n.t('header.cart.title', count: 1), match: :first)
       page.must_have_content 'foobar'
-      page.must_have_content 'Lass Dir den Warenkorb per E-Mail zuschicken.'
+      page.must_have_content 'Den Inhalt des Warenkorbes per E-Mail versenden'
 
-      click_link('Lass Dir den Warenkorb per E-Mail zuschicken.', match: :first)
+      click_link('Den Inhalt des Warenkorbes per E-Mail versenden', match: :first)
       page.must_have_content 'Warenkorb per E-Mail versenden '
       page.html.must_include 'jetzt versenden'