spree_emails 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ceac2b95d9e84c7468a3d3d4dda158f4e2cb4d157523be027161f04158bc07
-  data.tar.gz: e53a184321e77723591652f5aafeb0784cf62dfeaf385dc732ac34b158385b66
+  metadata.gz: 687d36f5a175c7c2f16de6b9cff4e8491360844e7d96dcd11f4b347f04c958fc
+  data.tar.gz: 39fbca5e6f9e2dd6e5394227ff67f17bbc6663f5c945f9323bb7442b607a42c3
 SHA512:
-  metadata.gz: e14ea8d8f98bbacdf6e7f742ebc2c1d9f8ea70e1f8b497faed2c98adaa4b8d6a141a43ba6bd955077766bca59706c5d996c3640beb148a70e4687a29415847fd
-  data.tar.gz: 2f7dc6cd87a64a1a55877cf2beae4464e94a83e26598f6f32c6e23144043a3a42524fe564c12fab7ea2de4ae8377d8878a6edfe3f99da3fd47933c5cde179071
+  metadata.gz: 96343178f45f7e9c7d5b9972de8accfab7bbc7e2ab801ee5e598ad84ce11d4d4a808b3d13870ae4c3de87f163815e3f889a00acc2e6360cc2dc3902a06d00c2f
+  data.tar.gz: cdd8d1311ac9a34558d0c1e03a61978d9a201f9aa640bd5cdb89009ce8d32f24529290fd08b5d2a5b54bd731e4c693f8364feb45c3e20f2555522eec1ea494a1

data/app/helpers/spree/mail_helper.rb

@@ -4,7 +4,7 @@ module Spree
 
     def variant_image_url(variant)
       image = default_image_for_product_or_variant(variant)
-      image ? main_app.url_for(image.url(:small)) : image_url('noimage/small.png')
+      image ? main_app.cdn_image_url(image.url(:small)) : image_url('noimage/small.png')
     end
 
     def name_for(order)
@@ -12,23 +12,13 @@ module Spree
     end
 
     def store_logo
-      @store_logo ||= current_store&.mailer_logo || current_store&.logo
-    end
-
-    def default_logo
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        `MailHelper#default_logo` is deprecated and will be removed in Spree 5.0.
-        Please upload a Store logo instead
-      DEPRECATION
-
-      image_url('logo/spree_50.png')
+      @store_logo ||= current_store&.mailer_logo&.attachment || current_store&.logo&.attachment
     end
 
     def logo_path
-      return default_logo unless store_logo.attached?
-      return main_app.url_for(store_logo.variant(resize: '244x104>')) if store_logo.variable?
+      return main_app.cdn_image_url(store_logo.variant(resize_to_limit: [244, 104])) if store_logo&.variable?
 
-      return main_app.url_for(store_logo) if store_logo.image?
+      return main_app.cdn_image_url(store_logo) if store_logo&.image?
     end
   end
 end

data/app/mailers/spree/base_mailer.rb

@@ -11,6 +11,10 @@ module Spree
       current_store.mail_from_address
     end
 
+    def reply_to_address
+      current_store.mail_from_address
+    end
+
     def money(amount, currency = nil)
       currency ||= current_store.default_currency
       Spree::Money.new(amount, currency: currency).to_s

data/app/mailers/spree/order_mailer.rb

@@ -5,14 +5,14 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url, reply_to: reply_to_address)
     end
 
     def store_owner_notification_email(order)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       current_store = @order.store
       subject = Spree.t('order_mailer.store_owner_notification_email.subject', store_name: current_store.name)
-      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.url)
+      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.url, reply_to: reply_to_address)
     end
 
     def cancel_email(order, resend = false)
@@ -20,7 +20,7 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url, reply_to: reply_to_address)
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @reimbursement.store || Spree::Store.default
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: current_store.mail_from_address, subject: subject, store_url: current_store.url)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url, reply_to: reply_to_address)
     end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @shipment.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url, reply_to: reply_to_address)
     end
   end
 end

data/app/mailers/spree/test_mailer.rb

@@ -2,7 +2,7 @@ module Spree
   class TestMailer < BaseMailer
     def test_email(email)
       subject = "#{Spree::Store.default.name} #{Spree.t('test_mailer.test_email.subject')}"
-      mail(to: email, from: from_address, subject: subject)
+      mail(to: email, from: from_address, reply_to: reply_to_address, subject: subject)
     end
   end
 end

data/app/views/spree/shared/_base_mailer_header.html.erb

@@ -2,7 +2,11 @@
 <tr>
   <td class="email-masthead">
     <%= link_to current_store.url, class: 'template-label' do %>
-      <%= image_tag logo_path, class: 'logo', alt: current_store.name, title: current_store.name %>
+      <% if logo_path.present? %>
+        <%= image_tag logo_path, class: 'logo', alt: current_store.name, title: current_store.name %>
+      <% else %>
+        <%= current_store.name %>
+      <% end %>
     <% end %>
   </td>
 </tr>

data/app/views/spree/shared/_base_mailer_stylesheets.html.erb

@@ -107,7 +107,7 @@
     border-bottom: 10px solid #3869D4;
     border-left: 18px solid #3869D4;
     display: inline-block;
-    color: #FFF;
+    color: #FFF !important;
     text-decoration: none;
     border-radius: 3px;
     box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
@@ -134,9 +134,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.4.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.5.0
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.4.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.5.0
 post_install_message:
 rdoc_options: []
 require_paths: