From 2e052105961bb1cfa62f3dd92497ee5babd8ea56 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Tue, 31 May 2022 16:31:24 +1000 Subject: [PATCH 1/2] Preview shipping emails with tracking if present --- spec/mailers/previews/shipment_preview.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spec/mailers/previews/shipment_preview.rb b/spec/mailers/previews/shipment_preview.rb index 69721c1e9f..28a396b92b 100644 --- a/spec/mailers/previews/shipment_preview.rb +++ b/spec/mailers/previews/shipment_preview.rb @@ -5,7 +5,10 @@ require 'open_food_network/scope_variant_to_hub' module Spree class ShipmentPreview < ActionMailer::Preview def shipped - ShipmentMailer.shipped_email(Shipment.last) + shipment = + Shipment.where.not(tracking: [nil, ""]).last || + Shipment.last + ShipmentMailer.shipped_email(shipment) end end end From b169f1baf1f2bd2494f1dfceacd731666a780899 Mon Sep 17 00:00:00 2001 From: Mikhail Grigoriev Date: Tue, 31 May 2022 14:39:02 -0400 Subject: [PATCH 2/2] Fix shipped email's tracking information font size using p.lead --- app/views/spree/shipment_mailer/shipped_email.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/spree/shipment_mailer/shipped_email.html.haml b/app/views/spree/shipment_mailer/shipped_email.html.haml index cd8a9eb15d..465c61ffea 100644 --- a/app/views/spree/shipment_mailer/shipped_email.html.haml +++ b/app/views/spree/shipment_mailer/shipped_email.html.haml @@ -15,11 +15,11 @@ %br - if @shipment.tracking - %p + %p.lead = t('.track_information', tracking: @shipment.tracking) - if @shipment.tracking_url - %p + %p.lead = t('.track_link', url: @shipment.tracking_url) %p.lead