spree_emails 6.0.0.rc1 → 6.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460c53ff1f08bac66ed9a76caadbdedf216833d3faa0bf2dd7b2e6331f72a6a1
-  data.tar.gz: 73c0209ebcd6c95e34f61d27c6d4b808a3b86451f4c2f7b3b9ca995f65418e71
+  metadata.gz: ca967f077601b0dc275a08b7b82d8e4923d7665a5ca14c0ea29e2d45701442a7
+  data.tar.gz: ae2d21365de3492ee95c86efc7a35a37afa6a75677ab869ecf824b488f766ed6
 SHA512:
-  metadata.gz: 6ced0f9e3ef9421db913ec441cdc8b90cd2bc731c2cab7538e99bc29e358f0565903ed7a13cf11ca8931438c6315dce67479b061ee20f1e168f2e4eab2d8ec62
-  data.tar.gz: 455ae9a4a57332fa838eeedec373640d356fdbf7ec5f623cd249054bfdca31f91318d1fde93338307da3de5ed270613725e8070adc5d17e4122117554518efd2
+  metadata.gz: 48a1f186023067c01b7b4d09b26ddd7d92a4fbc588fea2f2118759b28798ed9d78996c18cc26eab437847d17c42b0cc7a8c2aa79bcc32da70f9b4b8c417cafd6
+  data.tar.gz: d2da8ca96780a73991be4f0ec5a9657f484d07c6896217680e05a088f6ea2476323bb787356cd0db42746e517c2ab74888c74e1606ddf40d8d3fdf5b411cfb49

data/README.md

@@ -73,7 +73,7 @@ module Spree
       @current_store = store
 
       with_store_locale(@current_store) do
-        mail_template({ customer: email_data(customer, Spree.api.customer_serializer) }, to: customer.email)
+        mail_template({ customer: email_data(customer, Spree::Emails::CustomerSerializer) }, to: customer.email)
       end
     end
   end

data/app/mailers/spree/customer_mailer.rb

@@ -11,7 +11,7 @@ module Spree
 
       with_store_locale(store) do
         mail_template(
-          { customer: email_data(user, Spree.api.customer_serializer), reset_url: @reset_url },
+          { customer: email_data(user, Spree::Emails::CustomerSerializer), reset_url: @reset_url },
           to: user.email, store_url: store.storefront_url
         )
       end

data/app/serializers/spree/emails/amount_line_serializer.rb

@@ -5,12 +5,8 @@ module Spree
 
       attributes :label
 
-      attribute :display_amount do |line|
-        line.display_amount.to_s
-      end
-
       attribute :amount do |line|
-        line.amount.to_s
+        Spree::Money::Rounding.format(line.amount, line.currency)
       end
     end
   end

data/app/serializers/spree/emails/applied_promotion_serializer.rb

@@ -1,6 +1,7 @@
 module Spree
   module Emails
     class AppliedPromotionSerializer < Spree::Api::V3::AppliedPromotionSerializer
+      without_display_money
     end
   end
 end

data/app/serializers/spree/emails/customer_group_serializer.rb

@@ -0,0 +1,6 @@
+module Spree
+  module Emails
+    class CustomerGroupSerializer < Spree::Api::V3::CustomerGroupSerializer
+    end
+  end
+end

data/app/serializers/spree/emails/customer_serializer.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Emails
+    class CustomerSerializer < Spree::Api::V3::CustomerSerializer
+      without_display_money
+
+      many :addresses, resource: Spree::Emails::AddressSerializer
+      one :bill_address, key: :default_billing_address, resource: Spree::Emails::AddressSerializer
+      one :ship_address, key: :default_shipping_address, resource: Spree::Emails::AddressSerializer
+
+      one :newsletter_subscriber, resource: Spree::Emails::NewsletterSubscriberSerializer do |user, params|
+        user.newsletter_subscriber(params&.dig(:store) || Spree::Current.store)
+      end
+
+      many :customer_groups,
+           proc { |groups, params| groups.for_store(params&.dig(:store) || Spree::Current.store) },
+           resource: Spree::Emails::CustomerGroupSerializer
+    end
+  end
+end

data/app/serializers/spree/emails/delivery_rate_serializer.rb

@@ -1,6 +1,8 @@
 module Spree
   module Emails
     class DeliveryRateSerializer < Spree::Api::V3::DeliveryRateSerializer
+      without_display_money
+
       typelize freight_summary: [:EmailFreightSummary, nullable: true]
 
       one :freight_summary, resource: Spree::Emails::FreightSummarySerializer

data/app/serializers/spree/emails/fee_serializer.rb

@@ -1,6 +1,7 @@
 module Spree
   module Emails
     class FeeSerializer < Spree::Api::V3::FeeSerializer
+      without_display_money
     end
   end
 end

data/app/serializers/spree/emails/fulfillment_group_serializer.rb

@@ -7,8 +7,11 @@ module Spree
 
       attributes :name
 
-      attribute :display_cost do |group|
-        group.display_cost.to_s
+      # A freight parcel awaiting its forwarder's quote has no cost yet.
+      attribute :unpriced, &:unpriced?
+
+      attribute :cost do |group|
+        Spree::Money::Rounding.format(group.cost, group.currency)
       end
 
       attribute :seller_names do |group|

data/app/serializers/spree/emails/fulfillment_serializer.rb

@@ -1,6 +1,8 @@
 module Spree
   module Emails
     class FulfillmentSerializer < Spree::Api::V3::FulfillmentSerializer
+      without_display_money
+
       typelize delivery_method_name: [:string, nullable: true]
 
       attribute :delivery_method_name do |fulfillment|

data/app/serializers/spree/emails/gift_card_serializer.rb

@@ -1,6 +1,7 @@
 module Spree
   module Emails
     class GiftCardSerializer < Spree::Api::V3::GiftCardSerializer
+      without_display_money
     end
   end
 end

data/app/serializers/spree/emails/line_item_serializer.rb

@@ -3,16 +3,18 @@ module Spree
     class LineItemSerializer < Spree::Api::V3::LineItemSerializer
       include Spree::Emails::PurchasedItemAttributes
 
+      without_display_money
+
       many :option_values, resource: Spree::Emails::OptionValueSerializer
 
-      typelize sku: [:string, nullable: true], display_amount: :string,
+      typelize sku: [:string, nullable: true], amount: :string,
                url: [:string, nullable: true], image_url: [:string, nullable: true]
 
       attributes :sku
 
       # Price times quantity, before discounts — what the line cost.
-      attribute :display_amount do |line_item|
-        line_item.display_amount.to_s
+      attribute :amount do |line_item|
+        Spree::Money::Rounding.format(line_item.amount, line_item.currency)
       end
 
       # The full-size image; emails show the thumbnail in `image_url`.

data/app/serializers/spree/emails/newsletter_subscriber_serializer.rb

@@ -0,0 +1,6 @@
+module Spree
+  module Emails
+    class NewsletterSubscriberSerializer < Spree::Api::V3::NewsletterSubscriberSerializer
+    end
+  end
+end

data/app/serializers/spree/emails/order_group_serializer.rb

@@ -5,10 +5,10 @@ module Spree
     class OrderGroupSerializer < Spree::Api::V3::OrderGroupSerializer
       include Spree::Emails::PurchaseSummaryAttributes
 
-      typelize po_number: [:string, nullable: true], order_count: :number,
-               delivery_total: :string, display_delivery_total: :string,
-               additional_tax_total: :string, display_additional_tax_total: :string,
-               gift_card_total: :string, display_gift_card_total: :string
+      without_display_money
+
+      typelize po_number: [:string, nullable: true], order_count: :number, delivery_total: :string,
+               additional_tax_total: :string, gift_card_total: :string
 
       attributes :po_number
 
@@ -16,29 +16,19 @@ module Spree
         group.orders.size
       end
 
-      attribute :display_delivery_total do |group|
-        group.display_delivery_total.to_s
-      end
-
       attribute :delivery_total do |group|
-        group.delivery_total.to_s
+        Spree::Money::Rounding.format(group.delivery_total, group.currency)
       end
 
       attribute :additional_tax_total do |group|
-        group.additional_tax_total.to_s
-      end
-
-      attribute :display_additional_tax_total do |group|
-        group.display_additional_tax_total.to_s
+        Spree::Money::Rounding.format(group.additional_tax_total, group.currency)
       end
 
       attribute :gift_card_total do |group|
-        group.gift_card_total.to_s
+        Spree::Money::Rounding.format(group.gift_card_total, group.currency)
       end
 
-      attribute :display_gift_card_total do |group|
-        group.display_gift_card_total.to_s
-      end
+      many :payments, resource: Spree::Emails::PaymentSerializer
 
       # Every child order in full is what the webhook payload carries; the
       # email reads the purchase-wide fields above instead.

data/app/serializers/spree/emails/order_serializer.rb

@@ -5,6 +5,8 @@ module Spree
     class OrderSerializer < Spree::Api::V3::OrderSerializer
       include Spree::Emails::PurchaseSummaryAttributes
 
+      without_display_money
+
       many :order_promotions, key: :discounts, resource: Spree::Emails::AppliedPromotionSerializer
       many :fees, resource: Spree::Emails::FeeSerializer
       many :fulfillments, resource: Spree::Emails::FulfillmentSerializer

data/app/serializers/spree/emails/parcel_item_serializer.rb

@@ -24,12 +24,12 @@ module Spree
         item.line_item.options_text
       end
 
-      attribute :display_price do |item|
-        item.line_item.display_price.to_s
+      attribute :price do |item|
+        Spree::Money::Rounding.format(item.line_item.price, item.line_item.currency, unit_price: true)
       end
 
-      attribute :display_amount do |item|
-        Spree::Money.new(item.line_item.price * item.quantity, currency: item.line_item.currency).to_s
+      attribute :amount do |item|
+        Spree::Money::Rounding.format(item.line_item.price * item.quantity, item.line_item.currency)
       end
     end
   end

data/app/serializers/spree/emails/payment_serializer.rb

@@ -1,6 +1,8 @@
 module Spree
   module Emails
     class PaymentSerializer < Spree::Api::V3::PaymentSerializer
+      without_display_money
+
       typelize source: ['Record<string, unknown>', nullable: true]
 
       one :payment_method, resource: Spree::Emails::PaymentMethodSerializer

data/app/serializers/spree/emails/purchase_summary_attributes.rb

@@ -7,14 +7,14 @@ module Spree
       extend ActiveSupport::Concern
 
       included do
-        typelize customer_name: :string, display_total_minus_store_credits: :string
+        typelize customer_name: :string, total_minus_store_credits: :string
 
         attribute :customer_name do |purchase|
           purchase.name.presence || I18n.t('spree.customer')
         end
 
-        attribute :display_total_minus_store_credits do |purchase|
-          purchase.display_total_minus_store_credits.to_s
+        attribute :total_minus_store_credits do |purchase|
+          Spree::Money::Rounding.format(purchase.total_minus_store_credits, purchase.currency)
         end
 
         many :line_items, key: :items, resource: Spree::Emails::LineItemSerializer

data/app/serializers/spree/emails/return_serializer.rb

@@ -1,12 +1,14 @@
 module Spree
   module Emails
     class ReturnSerializer < Spree::Api::V3::ReturnSerializer
-      typelize display_refunded_total: :string
+      without_display_money
+
+      typelize refunded_total: :string
 
       # What was actually paid back — not the Store API's refund_total, which
       # is the figure the return was expected to refund.
-      attribute :display_refunded_total do |return_record|
-        return_record.display_refunded_total.to_s
+      attribute :refunded_total do |return_record|
+        Spree::Money::Rounding.format(return_record.refunded_total, return_record.currency)
       end
 
       many :returned_items,

data/app/services/spree/emails/samples/password_reset.rb

@@ -5,7 +5,7 @@ module Spree
         def variables
           {
             customer: data(Spree.customer_class.new(first_name: 'Jane', last_name: 'Doe', email: 'jane@example.com'),
-                           Spree.api.customer_serializer),
+                           Spree::Emails::CustomerSerializer),
             reset_url: placeholder_url('account/reset-password')
           }
         end

data/app/views/spree/return_mailer/refunded_email.liquid

@@ -12,7 +12,8 @@ subject: "{% if resend %}[{{ 'resend' | t }}] {% endif %}{{ store.name }} {{ 're
 <mj-section padding="48px 0 0">
   <mj-column>
     <mj-text mj-class="section-heading" padding="0 0 16px">{{ 'return_mailer.refunded_email.refund_summary' | t }}</mj-text>
-    <mj-text mj-class="body" padding="0" font-weight="500" color="{{ store.branding.heading_color }}">{{ 'return_mailer.refunded_email.total_refunded' | t: total: return.display_refunded_total }}</mj-text>
+    {%- assign refunded_total = return.refunded_total | money -%}
+    <mj-text mj-class="body" padding="0" font-weight="500" color="{{ store.branding.heading_color }}">{{ 'return_mailer.refunded_email.total_refunded' | t: total: refunded_total }}</mj-text>
   </mj-column>
 </mj-section>
 {% render 'spree/shared/order_summary', heading: heading, purchase: order, items: return.returned_items, totals: false %}

data/app/views/spree/shared/_fulfillment_group.liquid

@@ -14,7 +14,12 @@
     {%- endif -%}
     {% render 'spree/shared/line_item' for group.items as item %}
     <mj-table css-class="summary" padding="16px 0 0">
-      {% render 'spree/shared/summary_row', label: 'shipping', translate: true, sub: group.name, value: group.display_cost %}
+      {%- if group.unpriced -%}
+        {%- assign cost = 'delivery_rates.quoted_after_review' | t -%}
+      {%- else -%}
+        {%- assign cost = group.cost | money -%}
+      {%- endif -%}
+      {% render 'spree/shared/summary_row', label: 'shipping', translate: true, sub: group.name, value: cost %}
     </mj-table>
   </mj-column>
 </mj-section>

data/app/views/spree/shared/_line_item.liquid

@@ -19,8 +19,8 @@
             {%- if item.options_text != blank -%}<p class="item_meta">{{ item.options_text }}</p>{%- endif -%}
           </td>
           <td class="item_amount" align="right" valign="middle">
-            <p class="item_qty">{{ item.quantity }} x {{ item.display_price }}</p>
-            <p class="item_price">{{ item.display_amount }}</p>
+            <p class="item_qty">{{ item.quantity }} x {{ item.price | money }}</p>
+            <p class="item_price">{{ item.amount | money }}</p>
           </td>
         </tr>
       </table>

data/app/views/spree/shared/_purchase_totals.liquid

@@ -4,25 +4,32 @@
 {%- assign tax_total = purchase.additional_tax_total | plus: 0 -%}
 {%- assign gift_card_total = purchase.gift_card_total | plus: 0 -%}
 <mj-table css-class="summary" padding="16px 0 0">
-  {% render 'spree/shared/summary_row', label: 'order_mailer.subtotal', translate: true, value: purchase.display_item_total %}
+  {%- assign value = purchase.item_total | money -%}
+  {% render 'spree/shared/summary_row', label: 'order_mailer.subtotal', translate: true, value: value %}
   {%- for line in purchase.promotion_discounts -%}
-    {% render 'spree/shared/summary_row', label: 'promotion', translate: true, sub: line.label, value: line.display_amount %}
+    {%- assign value = line.amount | money -%}
+    {% render 'spree/shared/summary_row', label: 'promotion', translate: true, sub: line.label, value: value %}
   {%- endfor -%}
   {%- for line in purchase.delivery_lines -%}
-    {% render 'spree/shared/summary_row', label: 'shipping', translate: true, sub: line.label, value: line.display_amount %}
+    {%- assign value = line.amount | money -%}
+    {% render 'spree/shared/summary_row', label: 'shipping', translate: true, sub: line.label, value: value %}
   {%- endfor -%}
   {%- if tax_total != 0 -%}
-    {% render 'spree/shared/summary_row', label: 'tax', translate: true, value: purchase.display_additional_tax_total %}
+    {%- assign value = purchase.additional_tax_total | money -%}
+    {% render 'spree/shared/summary_row', label: 'tax', translate: true, value: value %}
   {%- endif -%}
   {%- if gift_card_total > 0 -%}
-    {%- assign gift_card_value = purchase.display_gift_card_total | prepend: '-' -%}
+    {%- assign gift_card_value = purchase.gift_card_total | money | prepend: '-' -%}
     {% render 'spree/shared/summary_row', label: 'gift_card', translate: true, value: gift_card_value %}
   {%- endif -%}
   {%- for line in purchase.manual_discounts -%}
-    {% render 'spree/shared/summary_row', label: line.label, value: line.display_amount %}
+    {%- assign value = line.amount | money -%}
+    {% render 'spree/shared/summary_row', label: line.label, value: value %}
   {%- endfor -%}
   {%- for line in purchase.fee_lines -%}
-    {% render 'spree/shared/summary_row', label: line.label, value: line.display_amount %}
+    {%- assign value = line.amount | money -%}
+    {% render 'spree/shared/summary_row', label: line.label, value: value %}
   {%- endfor -%}
-  {% render 'spree/shared/summary_row', label: 'order_mailer.total', translate: true, value: purchase.display_total_minus_store_credits, total: true %}
+  {%- assign value = purchase.total_minus_store_credits | money -%}
+  {% render 'spree/shared/summary_row', label: 'order_mailer.total', translate: true, value: value, total: true %}
 </mj-table>

data/config/initializers/typelizer.rb

@@ -12,15 +12,16 @@ Rails.application.config.after_initialize do
     serializer.extend(Typelizer::DSL) unless serializer.respond_to?(:typelize)
   end
 
-  Spree::Emails::AmountLineSerializer.typelize(label: [:string, nullable: true], amount: :string, display_amount: :string)
-  Spree::Emails::FulfillmentGroupSerializer.typelize(name: [:string, nullable: true], display_cost: :string,
+  Spree::Emails::AmountLineSerializer.typelize(label: [:string, nullable: true], amount: :string)
+  Spree::Emails::FulfillmentGroupSerializer.typelize(name: [:string, nullable: true], unpriced: :boolean, cost: :string,
                                                      seller_names: [:string, multi: true],
                                                      # Declared before Typelizer's hooks were attached, so it
                                                      # cannot tell this association is a list.
                                                      items: [:EmailParcelItem, multi: true])
   Spree::Emails::ParcelItemSerializer.typelize(
     id: :string, name: :string, quantity: :number, sku: [:string, nullable: true], options_text: [:string, nullable: true],
-    display_price: :string, display_amount: :string, url: [:string, nullable: true], image_url: [:string, nullable: true]
+    price: :string, amount: :string, url: [:string, nullable: true],
+    image_url: [:string, nullable: true]
   )
   Spree::Emails::StoreSerializer.typelize(
     id: :string, name: :string, address: [:string, nullable: true], mail_from_address: :string, default_currency: :string,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc1
+  version: 6.0.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-08 00:00:00.000000000 Z
+date: 2026-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +64,8 @@ files:
 - app/serializers/spree/emails/address_serializer.rb
 - app/serializers/spree/emails/amount_line_serializer.rb
 - app/serializers/spree/emails/applied_promotion_serializer.rb
+- app/serializers/spree/emails/customer_group_serializer.rb
+- app/serializers/spree/emails/customer_serializer.rb
 - app/serializers/spree/emails/delivery_method_serializer.rb
 - app/serializers/spree/emails/delivery_rate_serializer.rb
 - app/serializers/spree/emails/delivery_serializer.rb
@@ -74,6 +76,7 @@ files:
 - app/serializers/spree/emails/gift_card_serializer.rb
 - app/serializers/spree/emails/line_item_serializer.rb
 - app/serializers/spree/emails/market_serializer.rb
+- app/serializers/spree/emails/newsletter_subscriber_serializer.rb
 - app/serializers/spree/emails/option_value_serializer.rb
 - app/serializers/spree/emails/order_group_serializer.rb
 - app/serializers/spree/emails/order_serializer.rb
@@ -187,9 +190,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths: