spree_emails 6.0.0.beta4 → 6.0.0.rc2

data/config/locales/th.yml

@@ -0,0 +1,37 @@
+---
+th:
+  spree:
+    customer_mailer:
+      password_reset_email:
+        action: ตั้งรหัสผ่านใหม่
+        expiry_notice: ลิงก์ตั้งรหัสผ่านใหม่นี้จะหมดอายุในไม่ช้า หากคุณไม่ได้ร้องขอ ไม่จำเป็นต้องดำเนินการใด ๆ
+        greeting: สวัสดีคุณ %{name},
+        ignore_notice: หากคุณไม่ได้ร้องขอการตั้งรหัสผ่านใหม่ คุณสามารถละเว้นอีเมลนี้ได้อย่างปลอดภัย รหัสผ่านของคุณจะไม่ถูกเปลี่ยนแปลง
+        instructions: เราได้รับคำขอตั้งรหัสผ่านใหม่ของคุณ คลิกที่ปุ่มด้านล่างเพื่อเลือกรหัสผ่านใหม่
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: สวัสดี,
+        ignore_disclaimer: หากคุณไม่ได้ร้องขอ กรุณาละเว้นอีเมลนี้
+        instructions: กรุณาคลิกที่ปุ่มด้านล่างเพื่อยืนยันที่อยู่อีเมลของคุณ
+        message_copy_link: 'หากปุ่มไม่ทำงาน กรุณาคัดลอกและวางลิงก์ต่อไปนี้ลงในเบราว์เซอร์ของคุณ:'
+        subject: ยืนยันที่อยู่อีเมลของคุณ
+        verify_email_address_link: ยืนยันที่อยู่อีเมล
+    order_mailer:
+      cancel_email:
+        instructions: สินค้าของคุณได้ถูกยกเลิกแล้ว กรุณาเก็บหลักฐานอีเมลฉบับนี้เอาไว้ เพื่อใช้ในการอ้างอิงในอนาคต
+        subject: การยกเลิกการสั่งซื้อ
+      confirm_email:
+        instructions: กรุณาตรวจสอบและเก็บรายละเอียดการสั่งซื้อนี้เอาไว้
+        subject: ยืนยันการสั่งซื้อ
+      payment_link_email:
+        message: กรุณาคลิกที่ปุ่มด้านล่างเพื่อชำระเงินสำหรับคำสั่งซื้อของคุณ
+        message_copy_link: 'หากปุ่มไม่ทำงาน กรุณาคัดลอกและวางลิงก์ต่อไปนี้ลงในเบราว์เซอร์ของคุณ:'
+        pay_for_order: ชำระเงินสำหรับคำสั่งซื้อ
+        subject: 'ลิงก์ชำระเงินสำหรับคำสั่งซื้อ #%{number}'
+      store_owner_notification_email:
+        heading: ได้รับคำสั่งซื้อใหม่
+        instructions: คุณได้รับคำสั่งซื้อใหม่
+        order_summary: สรุปคำสั่งซื้อ %{number}
+        subject: "%{store_name} ได้รับคำสั่งซื้อใหม่"
+      subtotal: 'ยอดรวมย่อย:'
+      total: 'ยอดรวมคำสั่งซื้อ:'

data/config/locales/tr.yml

@@ -0,0 +1,38 @@
+---
+tr:
+  spree:
+    customer_mailer:
+      password_reset_email:
+        action: Parolayı Sıfırla
+        expiry_notice: Bu parola sıfırlama bağlantısının süresi kısa süre içinde dolacaktır. Bu isteği siz yapmadıysanız herhangi bir işlem yapmanıza gerek yoktur.
+        greeting: Merhaba %{name},
+        ignore_notice: Parola sıfırlama talebinde bulunmadıysanız bu e-postayı güvenle yok sayabilirsiniz. Parolanız değiştirilmeyecektir.
+        instructions: Parolanızı sıfırlamak için bir talep aldık. Yeni bir parola seçmek için aşağıdaki düğmeye tıklayın.
+        subject: Parola Sıfırlama Talimatları
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: Merhaba,
+        ignore_disclaimer: Bunu siz talep etmediyseniz lütfen bu e-postayı yok sayın.
+        instructions: E-posta adresinizi doğrulamak için lütfen aşağıdaki düğmeye tıklayın.
+        message_copy_link: 'Düğme çalışmıyorsa lütfen aşağıdaki bağlantıyı kopyalayıp tarayıcınıza yapıştırın:'
+        subject: E-posta adresinizi doğrulayın
+        verify_email_address_link: E-posta adresini doğrula
+    order_mailer:
+      cancel_email:
+        instructions: Siparişiniz iptal edilmiştir. Kayıtlarınız için lütfen iptal etme işleminin bilgilerini saklayınız.
+        subject: Sipariş İptal Etme
+      confirm_email:
+        instructions: Lütfen aşağıdaki sipariş bilgilerini gözden geçiriniz ve kayıtlarınız için saklayınız.
+        subject: Sipariş Onayı
+      payment_link_email:
+        message: Siparişinizin ödemesini yapmak için lütfen aşağıdaki düğmeye tıklayın.
+        message_copy_link: 'Düğme çalışmıyorsa lütfen aşağıdaki bağlantıyı kopyalayıp tarayıcınıza yapıştırın:'
+        pay_for_order: Siparişin ödemesini yap
+        subject: "#%{number} numaralı sipariş için ödeme bağlantısı"
+      store_owner_notification_email:
+        heading: Yeni Sipariş Alındı
+        instructions: Yeni bir sipariş aldınız.
+        order_summary: "%{number} Numaralı Sipariş Özeti"
+        subject: "%{store_name} yeni bir sipariş aldı"
+      subtotal: 'Ara Toplam:'
+      total: 'Sipariş Toplamı:'

data/config/locales/uk.yml

@@ -0,0 +1,42 @@
+---
+uk:
+  spree:
+    customer_mailer:
+      password_reset_email:
+        action: Скинути пароль
+        expiry_notice: Це посилання для скидання пароля незабаром закінчиться. Якщо ви не надсилали такий запит, жодних дій не потрібно.
+        greeting: Вітаємо, %{name}!
+        ignore_notice: Якщо ви не надсилали запит на скидання пароля, можете спокійно проігнорувати цей лист. Ваш пароль не буде змінено.
+        instructions: Ми отримали запит на скидання вашого пароля. Натисніть кнопку нижче, щоб обрати новий пароль.
+        subject: Інструкції зі скидання пароля
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: Вітаємо,
+        ignore_disclaimer: Якщо ви не надсилали такий запит, проігноруйте цей лист.
+        instructions: Натисніть кнопку нижче, щоб підтвердити свою адресу електронної пошти.
+        message_copy_link: 'Якщо кнопка не працює, скопіюйте та вставте наступне посилання у свій браузер:'
+        subject: Підтвердьте свою адресу електронної пошти
+        verify_email_address_link: Підтвердити адресу електронної пошти
+    order_mailer:
+      cancel_email:
+        dear_customer: Шановний(а) %{name},
+        instructions: Ваше замовлення СКАСОВАНО. Будь ласка, збережіть цю інформацію про скасування для своїх записів.
+        order_summary_canceled: Підсумок замовлення %{number} [СКАСОВАНО]
+        subject: Скасування замовлення
+      confirm_email:
+        dear_customer: Шановний(а) %{name},
+        instructions: Будь ласка, перегляньте та збережіть наступну інформацію про замовлення для своїх записів.
+        order_summary: Підсумок замовлення %{number}
+        subject: Підтвердження замовлення
+      payment_link_email:
+        message: Натисніть кнопку нижче, щоб оплатити своє замовлення.
+        message_copy_link: 'Якщо кнопка не працює, скопіюйте та вставте наступне посилання у свій браузер:'
+        pay_for_order: Оплатити замовлення
+        subject: Посилання для оплати замовлення №%{number}
+      store_owner_notification_email:
+        heading: Нове замовлення отримано
+        instructions: Ви отримали нове замовлення.
+        order_summary: Підсумок замовлення %{number}
+        subject: "%{store_name} отримав нове замовлення"
+      subtotal: 'Підсумок:'
+      total: 'Загальна сума замовлення:'

data/config/locales/vi.yml

@@ -0,0 +1,35 @@
+---
+vi:
+  spree:
+    customer_mailer:
+      password_reset_email:
+        action: Đặt lại mật khẩu
+        expiry_notice: Liên kết đặt lại mật khẩu này sẽ sớm hết hạn. Nếu bạn không yêu cầu điều này, bạn không cần làm gì.
+        greeting: Chào %{name},
+        ignore_notice: Nếu bạn không yêu cầu đặt lại mật khẩu, bạn có thể yên tâm bỏ qua email này. Mật khẩu của bạn sẽ không bị thay đổi.
+        instructions: Chúng tôi đã nhận được yêu cầu đặt lại mật khẩu của bạn. Nhấp vào nút bên dưới để chọn mật khẩu mới.
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: Xin chào,
+        ignore_disclaimer: Nếu bạn không yêu cầu điều này, vui lòng bỏ qua email này.
+        instructions: Vui lòng nhấp vào nút bên dưới để xác minh địa chỉ email của bạn.
+        message_copy_link: 'Nếu nút không hoạt động, vui lòng sao chép và dán liên kết sau vào trình duyệt của bạn:'
+        subject: Xác minh địa chỉ email của bạn
+        verify_email_address_link: Xác minh địa chỉ email
+    order_mailer:
+      cancel_email:
+        instructions: Đơn đặt hàng của quý khách bị hủy. Vui lòng kiểm tra lại đơn hàng của bạn.
+      confirm_email:
+        instructions: Vui lòng kiểm tra đơn đặt hàng của bạn.
+      payment_link_email:
+        message: Vui lòng nhấp vào nút bên dưới để thanh toán cho đơn hàng của bạn.
+        message_copy_link: 'Nếu nút không hoạt động, vui lòng sao chép và dán liên kết sau vào trình duyệt của bạn:'
+        pay_for_order: Thanh toán đơn hàng
+        subject: 'Liên kết thanh toán cho đơn hàng #%{number}'
+      store_owner_notification_email:
+        heading: Đã nhận đơn hàng mới
+        instructions: Bạn đã nhận được một đơn hàng mới.
+        order_summary: Tóm tắt đơn hàng %{number}
+        subject: "%{store_name} đã nhận được một đơn hàng mới"
+      subtotal: 'Tạm tính:'
+      total: 'Tổng đơn hàng:'

data/config/locales/zh-CN.yml

@@ -0,0 +1,38 @@
+---
+zh-CN:
+  spree:
+    customer_mailer:
+      password_reset_email:
+        action: 重置密码
+        expiry_notice: 此密码重置链接将很快过期。如果这不是您本人的操作，则无需理会。
+        greeting: 您好，%{name}：
+        ignore_notice: 如果您没有请求重置密码，可以放心忽略此邮件。您的密码不会被更改。
+        instructions: 我们收到了重置您密码的请求。请点击下方按钮设置新密码。
+        subject: 密码重置说明
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: 您好，
+        ignore_disclaimer: 如果这不是您本人的请求，请忽略此邮件。
+        instructions: 请点击下方按钮验证您的电子邮箱地址。
+        message_copy_link: 如果按钮无法使用，请复制以下链接并粘贴到您的浏览器中：
+        subject: 验证您的电子邮箱地址
+        verify_email_address_link: 验证电子邮箱地址
+    order_mailer:
+      cancel_email:
+        instructions: 您的订单已被取消。请保留此取消信息记录。
+        subject: 取消订单
+      confirm_email:
+        instructions: 请仔细阅读并保留以下订单信息记录。
+        subject: 订单确认
+      payment_link_email:
+        message: 请点击下方按钮支付您的订单。
+        message_copy_link: 如果按钮无法使用，请复制以下链接并粘贴到您的浏览器中：
+        pay_for_order: 支付订单
+        subject: '订单 #%{number} 的支付链接'
+      store_owner_notification_email:
+        heading: 收到新订单
+        instructions: 您收到了一个新订单。
+        order_summary: 订单 %{number} 摘要
+        subject: "%{store_name} 收到一个新订单"
+      subtotal: 小计：
+      total: 订单总额：

data/config/locales/zh-TW.yml

@@ -0,0 +1,40 @@
+---
+zh-TW:
+  spree:
+    customer_mailer:
+      password_reset_email:
+        action: 重設密碼
+        expiry_notice: 此重設密碼連結將很快失效。若您並未提出此要求，則無需採取任何行動。
+        greeting: 您好 %{name}，
+        ignore_notice: 若您並未要求重設密碼，可放心忽略此電子郵件。您的密碼不會被變更。
+        instructions: 我們收到了重設您密碼的要求。請點選下方按鈕設定新密碼。
+        subject: 密碼重設說明
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: 您好，
+        ignore_disclaimer: 若您並未提出此要求，請忽略此電子郵件。
+        instructions: 請點選下方按鈕以驗證您的電子郵件地址。
+        message_copy_link: 若按鈕無法運作，請複製並貼上以下連結至您的瀏覽器：
+        subject: 驗證您的電子郵件地址
+        verify_email_address_link: 驗證電子郵件地址
+    order_mailer:
+      cancel_email:
+        instructions: 你的訂單已取消。請你保留好此信件做為紀錄。
+        order_summary_canceled: 訂單編號 %{number} 總結 [CANCELED]
+        subject: 訂單取消
+      confirm_email:
+        instructions: 請你保留好此信件做為紀錄。
+        order_summary: 訂單編號 %{number} 總結
+        subject: 訂單確認信件
+      payment_link_email:
+        message: 請點選下方按鈕為您的訂單付款。
+        message_copy_link: 若按鈕無法運作，請複製並貼上以下連結至您的瀏覽器：
+        pay_for_order: 為訂單付款
+        subject: '訂單 #%{number} 的付款連結'
+      store_owner_notification_email:
+        heading: 新訂單
+        instructions: 一筆新訂單
+        order_summary: 訂單 %{number} 總結
+        subject: "%{store_name}收到了一筆新訂單"
+      subtotal: '小記:'
+      total: '總計:'

data/lib/spree/emails/engine.rb

@@ -6,9 +6,6 @@ module Spree
       isolate_namespace Spree
       engine_name 'spree_emails'
 
-      # Add app/subscribers to autoload paths
-      config.paths.add 'app/subscribers', eager_load: true
-
       # Register bundled ActionMailer previews so they show up at /rails/mailers
       # without the host app having to copy any files.
       initializer 'spree_emails.mailer_previews' do |app|
@@ -17,6 +14,30 @@ module Spree
         end
       end
 
+      # The customer emails merchants may edit in the dashboard, with the layout
+      # and shared partials they are built from. Staff, store-owner and seller
+      # emails are deliberately not registered.
+      initializer 'spree_emails.editable_templates' do
+        {
+          'spree/order_mailer/confirm_email' => 'Spree::Emails::Samples::Order',
+          'spree/order_mailer/cancel_email' => 'Spree::Emails::Samples::Order',
+          'spree/order_mailer/payment_link_email' => 'Spree::Emails::Samples::PaymentLink',
+          'spree/order_group_mailer/confirm_email' => 'Spree::Emails::Samples::OrderGroup',
+          'spree/fulfillment_mailer/fulfilled_email' => 'Spree::Emails::Samples::Fulfillment',
+          'spree/return_mailer/refunded_email' => 'Spree::Emails::Samples::Return',
+          'spree/digital_asset_mailer/files_ready_email' => 'Spree::Emails::Samples::Downloads',
+          'spree/customer_mailer/password_reset_email' => 'Spree::Emails::Samples::PasswordReset',
+          'spree/customer_mailer/data_export_email' => 'Spree::Emails::Samples::DataExport',
+          'spree/newsletter_mailer/email_confirmation' => 'Spree::Emails::Samples::NewsletterConfirmation',
+          'spree/company_mailer/invitation_email' => 'Spree::Emails::Samples::CompanyInvitation'
+        }.each { |key, sample| Spree.editable_email_templates.register(key, kind: :email, sample: sample) }
+
+        Spree.editable_email_templates.register('layouts/spree/base_mailer', kind: :layout)
+        %w[line_item order_summary purchase_totals fulfillment_group summary_row].each do |partial|
+          Spree.editable_email_templates.register("spree/shared/#{partial}", kind: :partial)
+        end
+      end
+
       # Add email event subscribers
       config.after_initialize do
         Spree.subscribers.concat [
@@ -26,6 +47,9 @@ module Spree
           Spree::ReturnEmailSubscriber,
           Spree::NewsletterSubscriberEmailSubscriber,
           Spree::CustomerEmailSubscriber,
+          Spree::DataRequestEmailSubscriber,
+          Spree::CompanyEmailSubscriber,
+          Spree::DigitalAssetEmailSubscriber,
           Spree::SellerEmailSubscriber
         ]
       end

data/lib/spree/emails/previews/company_preview.rb

@@ -0,0 +1,10 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree company emails at /rails/mailers/spree/company
+class Spree::CompanyPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def invitation_email
+    Spree::CompanyMailer.invitation_email(Spree::CompanyInvitation.pending.last)
+  end
+end

data/lib/spree/emails/previews/customer_preview.rb

@@ -11,4 +11,8 @@ class Spree::CustomerPreview < ActionMailer::Preview
       Spree::PreviewData.store(locale)
     )
   end
+
+  def data_export_email
+    Spree::CustomerMailer.data_export_email(Spree::DataRequest.access.with_status(:completed).last)
+  end
 end

data/lib/spree/emails/previews/digital_asset_preview.rb

@@ -0,0 +1,20 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree digital download emails at /rails/mailers/spree/digital_asset
+class Spree::DigitalAssetPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def files_ready_email
+    Spree::DigitalAssetMailer.files_ready_email(order)
+  end
+
+  private
+
+  # The most recent order with downloads, with its locale overridden in memory
+  # when the preview toolbar requests one (the change is never saved).
+  def order
+    order = Spree::Order.complete.joins(line_items: :digital_links).last
+    order.locale = locale if order && locale.present?
+    order
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta4
+  version: 6.0.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-24 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.beta4
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta4
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -50,10 +50,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/helpers/spree/base_helper.rb
-- app/helpers/spree/digital_asset_helper.rb
-- app/helpers/spree/fulfillment_helper.rb
-- app/helpers/spree/mail_helper.rb
 - app/mailers/spree/company_mailer.rb
 - app/mailers/spree/customer_mailer.rb
 - app/mailers/spree/digital_asset_mailer.rb
@@ -64,6 +60,44 @@ files:
 - app/mailers/spree/return_mailer.rb
 - app/mailers/spree/seller_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
+- app/models/spree/emails/amount_line.rb
+- 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
+- app/serializers/spree/emails/fee_serializer.rb
+- app/serializers/spree/emails/freight_summary_serializer.rb
+- app/serializers/spree/emails/fulfillment_group_serializer.rb
+- app/serializers/spree/emails/fulfillment_serializer.rb
+- 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
+- app/serializers/spree/emails/parcel_item_serializer.rb
+- app/serializers/spree/emails/payment_method_serializer.rb
+- app/serializers/spree/emails/payment_serializer.rb
+- app/serializers/spree/emails/purchase_summary_attributes.rb
+- app/serializers/spree/emails/purchased_item_attributes.rb
+- app/serializers/spree/emails/return_serializer.rb
+- app/serializers/spree/emails/stock_location_serializer.rb
+- app/services/spree/emails/samples/base.rb
+- app/services/spree/emails/samples/company_invitation.rb
+- app/services/spree/emails/samples/data_export.rb
+- app/services/spree/emails/samples/downloads.rb
+- app/services/spree/emails/samples/fulfillment.rb
+- app/services/spree/emails/samples/newsletter_confirmation.rb
+- app/services/spree/emails/samples/order.rb
+- app/services/spree/emails/samples/order_group.rb
+- app/services/spree/emails/samples/password_reset.rb
+- app/services/spree/emails/samples/payment_link.rb
+- app/services/spree/emails/samples/return.rb
 - app/subscribers/spree/company_email_subscriber.rb
 - app/subscribers/spree/customer_email_subscriber.rb
 - app/subscribers/spree/data_request_email_subscriber.rb
@@ -74,56 +108,77 @@ files:
 - app/subscribers/spree/order_group_email_subscriber.rb
 - app/subscribers/spree/return_email_subscriber.rb
 - app/subscribers/spree/seller_email_subscriber.rb
-- app/views/spree/company_mailer/invitation_email.html.erb
-- app/views/spree/company_mailer/invitation_email.text.erb
-- app/views/spree/customer_mailer/data_export_email.html.erb
-- app/views/spree/customer_mailer/data_export_email.text.erb
-- app/views/spree/customer_mailer/password_reset_email.html.erb
-- app/views/spree/customer_mailer/password_reset_email.text.erb
-- app/views/spree/digital_asset_mailer/files_ready_email.html.erb
-- app/views/spree/digital_asset_mailer/files_ready_email.text.erb
-- app/views/spree/fulfillment_mailer/fulfilled_email.html.erb
-- app/views/spree/fulfillment_mailer/fulfilled_email.text.erb
-- app/views/spree/newsletter_mailer/email_confirmation.html.erb
-- app/views/spree/newsletter_mailer/email_confirmation.text.erb
-- app/views/spree/order_group_mailer/confirm_email.html.erb
-- app/views/spree/order_group_mailer/confirm_email.text.erb
-- app/views/spree/order_group_mailer/store_owner_notification_email.html.erb
-- app/views/spree/order_group_mailer/store_owner_notification_email.text.erb
-- app/views/spree/order_mailer/cancel_email.html.erb
-- app/views/spree/order_mailer/cancel_email.text.erb
-- app/views/spree/order_mailer/confirm_email.html.erb
-- app/views/spree/order_mailer/confirm_email.text.erb
-- app/views/spree/order_mailer/payment_link_email.html.erb
-- app/views/spree/order_mailer/store_owner_notification_email.html.erb
-- app/views/spree/order_mailer/store_owner_notification_email.text.erb
-- app/views/spree/return_mailer/refunded_email.html.erb
-- app/views/spree/return_mailer/refunded_email.text.erb
-- app/views/spree/seller_mailer/approved_email.html.erb
-- app/views/spree/seller_mailer/approved_email.text.erb
-- app/views/spree/seller_mailer/rejected_email.html.erb
-- app/views/spree/seller_mailer/rejected_email.text.erb
-- app/views/spree/seller_mailer/suspended_email.html.erb
-- app/views/spree/seller_mailer/suspended_email.text.erb
-- app/views/spree/shared/_fulfillment_group_section.html.erb
-- app/views/spree/shared/_fulfillment_group_section.text.erb
-- app/views/spree/shared/_item_thumbnail_link.html.erb
-- app/views/spree/shared/_order_summary_section.html.erb
-- app/views/spree/shared/_po_number.text.erb
-- app/views/spree/shared/_purchase_totals.html.erb
-- app/views/spree/shared/_purchase_totals.text.erb
-- app/views/spree/shared/_purchased_items_table.html.erb
-- app/views/spree/shared/_purchased_items_table.text.erb
-- app/views/spree/shared/purchased_items_table/_line_item.html.erb
-- app/views/spree/shared/purchased_items_table/_subtotal.html.erb
-- app/views/spree/shared/purchased_items_table/_summary_row.html.erb
-- app/views/spree/shared/purchased_items_table/_total.html.erb
-- config/i18n-tasks.yml
+- app/views/spree/company_mailer/invitation_email.liquid
+- app/views/spree/customer_mailer/data_export_email.liquid
+- app/views/spree/customer_mailer/password_reset_email.liquid
+- app/views/spree/digital_asset_mailer/files_ready_email.liquid
+- app/views/spree/fulfillment_mailer/fulfilled_email.liquid
+- app/views/spree/newsletter_mailer/email_confirmation.liquid
+- app/views/spree/order_group_mailer/confirm_email.liquid
+- app/views/spree/order_group_mailer/store_owner_notification_email.liquid
+- app/views/spree/order_mailer/cancel_email.liquid
+- app/views/spree/order_mailer/confirm_email.liquid
+- app/views/spree/order_mailer/payment_link_email.liquid
+- app/views/spree/order_mailer/store_owner_notification_email.liquid
+- app/views/spree/return_mailer/refunded_email.liquid
+- app/views/spree/seller_mailer/approved_email.liquid
+- app/views/spree/seller_mailer/rejected_email.liquid
+- app/views/spree/seller_mailer/suspended_email.liquid
+- app/views/spree/shared/_fulfillment_group.liquid
+- app/views/spree/shared/_line_item.liquid
+- app/views/spree/shared/_order_summary.liquid
+- app/views/spree/shared/_purchase_totals.liquid
+- config/initializers/typelizer.rb
+- config/locales/ar.yml
+- config/locales/be.yml
+- config/locales/bg.yml
+- config/locales/ca.yml
+- config/locales/cs.yml
+- config/locales/da.yml
+- config/locales/de-CH.yml
+- config/locales/de.yml
+- config/locales/el.yml
 - config/locales/en.yml
+- config/locales/es-CL.yml
+- config/locales/es-EC.yml
+- config/locales/es-MX.yml
+- config/locales/es.yml
+- config/locales/et.yml
+- config/locales/fa.yml
+- config/locales/fi.yml
+- config/locales/fr.yml
+- config/locales/hu.yml
+- config/locales/id.yml
+- config/locales/it.yml
+- config/locales/ja.yml
+- config/locales/km.yml
+- config/locales/ko.yml
+- config/locales/ku.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/nb.yml
+- config/locales/ne.yml
+- config/locales/nl.yml
+- config/locales/pl.yml
+- config/locales/pt-BR.yml
+- config/locales/pt.yml
+- config/locales/ro.yml
+- config/locales/ru.yml
+- config/locales/sk.yml
+- config/locales/sl-SI.yml
+- config/locales/sv.yml
+- config/locales/th.yml
+- config/locales/tr.yml
+- config/locales/uk.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - lib/generators/spree/emails/install/install_generator.rb
 - lib/spree/emails.rb
 - lib/spree/emails/engine.rb
+- lib/spree/emails/previews/company_preview.rb
 - lib/spree/emails/previews/customer_preview.rb
+- lib/spree/emails/previews/digital_asset_preview.rb
 - lib/spree/emails/previews/fulfillment_preview.rb
 - lib/spree/emails/previews/newsletter_preview.rb
 - lib/spree/emails/previews/order_group_preview.rb
@@ -135,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.beta4
+  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.beta4
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/helpers/spree/base_helper.rb

@@ -1,45 +0,0 @@
-module Spree
-  module BaseHelper
-    # returns the URL of an object on the storefront
-    # @param resource [Spree::Product, Spree::Category] the resource to get the URL for
-    # @param options [Hash] the options for the URL
-    # @option options [String] :locale the locale of the resource, defaults to I18n.locale
-    # @option options [String] :store the store of the resource, defaults to current_store
-    # @option options [String] :relative whether to use the relative URL, defaults to false
-    # @option options [String] :preview_id the preview ID of the resource, usually the ID of the resource
-    # @option options [String] :variant_id the variant ID of the resource, usually the ID of the variant (only used for products)
-    # @return [String] the URL of the resource
-    def spree_storefront_resource_url(resource, options = {})
-      store = options[:store] || current_store
-
-      base_url = if options[:relative]
-                   ''
-                 else
-                   store.storefront_url
-                 end
-
-      localize = if options[:locale].present?
-                   "/#{options[:locale]}"
-                 else
-                   ''
-                 end
-
-      if resource.instance_of?(Spree::Product)
-        preview_id = ("preview_id=#{options[:preview_id]}" if options[:preview_id].present?)
-
-        variant_id = ("variant_id=#{options[:variant_id]}" if options[:variant_id].present?)
-
-        params = [preview_id, variant_id].compact_blank.join('&')
-        params = "?#{params}" if params.present?
-
-        "#{base_url + localize}/products/#{resource.slug}#{params}"
-      elsif resource.is_a?(Spree::Category)
-        "#{base_url + localize}/t/#{resource.permalink}"
-      elsif localize.blank?
-        base_url
-      else
-        base_url + localize
-      end
-    end
-  end
-end

data/app/helpers/spree/digital_asset_helper.rb

@@ -1,16 +0,0 @@
-module Spree
-  module DigitalAssetHelper
-    # Emails need an absolute link — the route helper only produces a path, and
-    # the download endpoint lives on the backend rather than the storefront.
-    #
-    # The host is passed in rather than resolved per link: every link in one
-    # email belongs to the same order, so its store is already known.
-    #
-    # @param digital_link [Spree::DigitalLink]
-    # @param host [String] the backend's own URL
-    # @return [String]
-    def digital_link_download_url(digital_link, host)
-      Spree::Api::DigitalLinkUrls.download_url(digital_link, host)
-    end
-  end
-end

data/app/helpers/spree/fulfillment_helper.rb

@@ -1,12 +0,0 @@
-module Spree
-  module FulfillmentHelper
-    def fulfillment_tracking_link_to(fulfillment:, name: nil, html_options: {})
-      tracking_url = fulfillment.tracking_url.presence
-      return '' unless tracking_url
-
-      display_text = name || fulfillment.tracking.presence || tracking_url
-
-      link_to display_text, tracking_url, html_options
-    end
-  end
-end

data/app/helpers/spree/mail_helper.rb

@@ -1,10 +0,0 @@
-module Spree
-  module MailHelper
-    include Spree::BaseHelper
-    include Spree::ImagesHelper
-
-    def name_for(order)
-      order.name || Spree.t('customer')
-    end
-  end
-end