spree_emails 5.4.0.rc3 → 5.4.0.rc4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dab6d56fae9a27310a12db8de2daef9c14760603984ceeb11a809ccf948cf73a
|
|
4
|
+
data.tar.gz: c0e7a23ec974d42514a5673f7d268f4f72a20d332f86dadcc589d91deb847582
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 352187f5939ae836f7079f62a7de7eafda9089bb6577a59a61e4fccd34304060f5bdbb48b9abc4b33e54ad233af5e3ec7d376cf2d12a3aafbb1fd66b9a0c5064
|
|
7
|
+
data.tar.gz: e208237fc1dfbc5d6f3b06c47b8f246c1496f7f9920af8d57c36dc2323a4312e1caf62653ef5500ac15d52e070e497109ec5bf49686560945a0c5e0497e08cd2
|
data/lib/spree/emails/engine.rb
CHANGED
|
@@ -15,8 +15,7 @@ module Spree
|
|
|
15
15
|
Spree::OrderEmailSubscriber,
|
|
16
16
|
Spree::ShipmentEmailSubscriber,
|
|
17
17
|
Spree::ReimbursementEmailSubscriber,
|
|
18
|
-
Spree::NewsletterSubscriberEmailSubscriber
|
|
19
|
-
Spree::CustomerEmailSubscriber
|
|
18
|
+
Spree::NewsletterSubscriberEmailSubscriber
|
|
20
19
|
]
|
|
21
20
|
end
|
|
22
21
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_emails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.4.0.
|
|
4
|
+
version: 5.4.0.rc4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Schofield
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2026-03-
|
|
13
|
+
date: 2026-03-26 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: spree
|
|
@@ -18,14 +18,14 @@ dependencies:
|
|
|
18
18
|
requirements:
|
|
19
19
|
- - ">="
|
|
20
20
|
- !ruby/object:Gem::Version
|
|
21
|
-
version: 5.4.0.
|
|
21
|
+
version: 5.4.0.rc4
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
|
25
25
|
requirements:
|
|
26
26
|
- - ">="
|
|
27
27
|
- !ruby/object:Gem::Version
|
|
28
|
-
version: 5.4.0.
|
|
28
|
+
version: 5.4.0.rc4
|
|
29
29
|
- !ruby/object:Gem::Dependency
|
|
30
30
|
name: email_spec
|
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -58,12 +58,10 @@ files:
|
|
|
58
58
|
- app/assets/images/noimage/noimage/small.png
|
|
59
59
|
- app/assets/images/noimage/small.png
|
|
60
60
|
- app/helpers/spree/mail_helper.rb
|
|
61
|
-
- app/mailers/spree/customer_mailer.rb
|
|
62
61
|
- app/mailers/spree/newsletter_mailer.rb
|
|
63
62
|
- app/mailers/spree/order_mailer.rb
|
|
64
63
|
- app/mailers/spree/reimbursement_mailer.rb
|
|
65
64
|
- app/mailers/spree/shipment_mailer.rb
|
|
66
|
-
- app/subscribers/spree/customer_email_subscriber.rb
|
|
67
65
|
- app/subscribers/spree/newsletter_subscriber_email_subscriber.rb
|
|
68
66
|
- app/subscribers/spree/order_email_subscriber.rb
|
|
69
67
|
- app/subscribers/spree/reimbursement_email_subscriber.rb
|
|
@@ -103,9 +101,9 @@ licenses:
|
|
|
103
101
|
- BSD-3-Clause
|
|
104
102
|
metadata:
|
|
105
103
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
|
106
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.
|
|
104
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc4
|
|
107
105
|
documentation_uri: https://docs.spreecommerce.org/
|
|
108
|
-
source_code_uri: https://github.com/spree/spree/tree/v5.4.0.
|
|
106
|
+
source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc4
|
|
109
107
|
post_install_message:
|
|
110
108
|
rdoc_options: []
|
|
111
109
|
require_paths:
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Spree
|
|
4
|
-
class CustomerMailer < BaseMailer
|
|
5
|
-
def password_reset_email(user_id, store_id, reset_token, redirect_url = nil)
|
|
6
|
-
@user = Spree.user_class.find(user_id)
|
|
7
|
-
@current_store = Spree::Store.find(store_id)
|
|
8
|
-
@reset_token = reset_token
|
|
9
|
-
@reset_url = build_reset_url(redirect_url, reset_token)
|
|
10
|
-
|
|
11
|
-
subject = "#{@current_store.name} #{Spree.t('customer_mailer.password_reset_email.subject')}"
|
|
12
|
-
mail(
|
|
13
|
-
to: @user.email,
|
|
14
|
-
from: from_address,
|
|
15
|
-
subject: subject,
|
|
16
|
-
store_url: @current_store.storefront_url,
|
|
17
|
-
reply_to: reply_to_address
|
|
18
|
-
)
|
|
19
|
-
end
|
|
20
|
-
|
|
21
|
-
private
|
|
22
|
-
|
|
23
|
-
def build_reset_url(redirect_url, token)
|
|
24
|
-
return nil if redirect_url.blank?
|
|
25
|
-
|
|
26
|
-
uri = URI.parse(redirect_url)
|
|
27
|
-
params = URI.decode_www_form(uri.query || '')
|
|
28
|
-
params << ['token', token]
|
|
29
|
-
uri.query = URI.encode_www_form(params)
|
|
30
|
-
uri.to_s
|
|
31
|
-
end
|
|
32
|
-
end
|
|
33
|
-
end
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Spree
|
|
4
|
-
class CustomerEmailSubscriber < Spree::Subscriber
|
|
5
|
-
subscribes_to 'customer.password_reset_requested'
|
|
6
|
-
|
|
7
|
-
def handle(event)
|
|
8
|
-
email = event.payload['email']
|
|
9
|
-
return if email.blank?
|
|
10
|
-
|
|
11
|
-
user = Spree.user_class.find_by(email: email)
|
|
12
|
-
return unless user
|
|
13
|
-
|
|
14
|
-
store = find_store(event)
|
|
15
|
-
return unless store
|
|
16
|
-
return unless store.prefers_send_consumer_transactional_emails?
|
|
17
|
-
|
|
18
|
-
reset_token = event.payload['reset_token']
|
|
19
|
-
redirect_url = event.payload['redirect_url']
|
|
20
|
-
|
|
21
|
-
CustomerMailer.password_reset_email(
|
|
22
|
-
user.id,
|
|
23
|
-
store.id,
|
|
24
|
-
reset_token,
|
|
25
|
-
redirect_url
|
|
26
|
-
).deliver_later
|
|
27
|
-
end
|
|
28
|
-
|
|
29
|
-
private
|
|
30
|
-
|
|
31
|
-
def find_store(event)
|
|
32
|
-
store_id = event.store_id
|
|
33
|
-
return Spree::Store.find(store_id) if store_id.present?
|
|
34
|
-
|
|
35
|
-
Spree::Current.store || Spree::Store.default
|
|
36
|
-
end
|
|
37
|
-
end
|
|
38
|
-
end
|