Commit Graph

86 Commits

Author SHA1 Message Date
luisramos0
b9b91231ae Fix rubocop issues in mailers 2018-12-06 14:18:24 +00:00
luisramos0
0f442a911e Improve I18nHelper.valid_locale to handle empty objects 2018-12-06 12:48:48 +00:00
luisramos0
feea499298 Make all mailers use appropriate locale when sending emails 2018-12-06 11:45:44 +00:00
Matt-Yorkley
8f5fd41c8b Update email confirmation address 2018-10-08 21:38:47 +01:00
Kristina Lim
ad8b120e48 Extract format for order cycle closing in emails
Using a helper for this, but this can be changed to look up a
translation key.
2018-09-01 23:46:08 +08:00
luisramos0
8246893652 Added notice for unexpected mail in confirmation instructions mail (HugsDaniel) 2018-07-19 09:26:29 +10:00
Maikel Linke
fbe2f7ab4c Remove unused variable from mailer
The second variable passed by Devise is actually a hash, not a token.
2018-07-13 09:04:41 +10:00
Pau Pérez Fabregat
dadc02fb11 Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails
Uk/1663variant order emails
2018-03-23 15:29:05 +01:00
Pau Pérez Fabregat
13115d4a2d Merge branch 'master' into email/manager_invite 2018-03-23 12:56:10 +01:00
stveep
8a783bbb7d PR changes: extract SQL in methods to scopes, add case insensitivity to test for sorting 2018-03-23 17:37:50 +11:00
stveep
9375318c4b Codeclimate: remove empty line 2018-03-23 17:37:50 +11:00
stveep
dc76b3922b Add sorting to query for producer mailer 2018-03-23 17:37:50 +11:00
Pau Perez
2c588847df Pick from_address from MailMethod as in Spree
Spree::Config[] picks it up from AppConfiguration rather than MailMethod
and so, gets a value different from the one configured.
2018-03-22 18:36:41 +01:00
Matt-Yorkley
128ca3b1ef Invite manager specs 2018-03-15 18:48:47 +00:00
Matt-Yorkley
b64327fbb3 Invite enterprise manager functionality 2018-03-15 18:48:47 +00:00
Pau Perez
1b39d57800 Remove deprecated reference to Spree::MailMethod
Said class is removed in https://github.com/spree/spree/pull/2643 in
Spree.
2018-03-07 16:24:39 +01:00
Pau Perez
aa4bd7f397 Improve code style and docs of job 2018-02-09 09:53:39 +01:00
Rob Harrington
e12207f3de Use shop contact email and contact name for subscription emails 2018-02-09 14:44:15 +11:00
Rob Harrington
672f96b85b Replace references to 'standing order' with 'subscription' 2018-02-09 14:44:13 +11:00
Rob Harrington
a9b5fd69d8 Renaming standing order files 2018-02-09 14:44:13 +11:00
Rob Harrington
c5f3249172 Fix rubocop issues 2018-02-09 14:44:12 +11:00
Rob Harrington
c86207212f Add confirmation summary email 2018-02-09 14:44:08 +11:00
Rob Harrington
13d01df4d8 Add mail method and template for sending placement summary emails to shop owners 2018-02-09 14:44:08 +11:00
Rob Harrington
67e05cea9c Add failed payment email to StandingOrderMailer 2018-02-09 14:44:07 +11:00
Rob Harrington
6e83c6dc86 Move standing order emails to a dedicated StandingOrderMailer 2018-02-09 14:44:07 +11:00
Rob Harrington
deebc31c34 DRYing out standing order email template 2018-02-09 14:43:53 +11:00
Rob Harrington
f14c36ed6b Sending placement email when standing order order in placed on OC open 2018-02-09 14:43:42 +11:00
Matt-Yorkley
ba98c7e2c5 Rewrite enterprise contact functionality 2018-02-07 10:41:52 +11:00
Matt-Yorkley
22eae753fe Remove enterprise confirmations 2018-02-07 10:41:52 +11:00
Matt-Yorkley
969b6caa96 Code cleanup 2018-02-07 10:41:51 +11:00
Pierre de Lacroix
91704d9df7 Create user confirmation email 2018-02-07 10:41:51 +11:00
Julius Pabrinkis
5caaec8ef3 Extract translations from mailers and helpers 2017-07-21 12:17:12 +10:00
Rob Harrington
7bb58342fc Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences 2017-06-23 16:49:08 +10:00
Rohan Mitchell
764219b9ed Fix OrderMailer#find_order 2016-11-04 09:39:17 +11:00
Rohan Mitchell
32d2adc8a2 Fix mailers - provide from address 2016-11-04 09:39:17 +11:00
Steve Pettitt
a504a10b52 Change to explicitly check complete state (default Spree::Order.complete scope checks only for presence of 'completed_at' timestamp) 2016-06-08 11:15:02 +10:00
Rob Harrington
5d3adc0bdb Fixing producer emails so that they calculate tax correctly
Also listing items by full_name rather than by variant, to catch cases where line item weights/volumes have been adjusted
2016-05-20 11:01:33 +10:00
Rob Harrington
6a3f6e7bfa Revert "Add line item included_tax_amount method to multiply by quantity"
This reverts commit 547fcf49e0.
2016-05-20 09:46:31 +10:00
Steve Pettitt
547fcf49e0 Add line item included_tax_amount method to multiply by quantity 2016-05-14 11:00:13 +01:00
Rohan Mitchell
9f56494c4c Simplify 2016-05-13 10:36:23 +10:00
Steve Pettitt
559f7afc60 HTML order cycle report email, text customisable in translations 2016-05-13 10:30:21 +10:00
Steve Pettitt
ef418c7f50 Change to use total rather than display_total (which returns a Spree::Money object) 2016-05-13 10:30:21 +10:00
Steve Pettitt
c80255e9ab Add total to producer emails 2016-05-13 10:30:21 +10:00
Maikel Linke
3e231da472 Translate subjects of enterprise emails
Minor text change

Fix #906

Thanks to Nicolas Blanc:
https://github.com/openfoodfoundation/openfoodnetwork/pull/937
2016-05-06 11:31:15 +10:00
Steve Pettitt
5a62098b95 Cleaning up and attempt to add feature spec 2016-01-15 09:07:49 +11:00
Maikel Linke
1589bd9ac3 Use mail() instead of devise_mail
The EnterpriseMailer used `devise_mail` to send confirmation
instructions. That call is more complicated than `mail` and added an
unwanted reply-to header.
2015-12-04 10:37:55 +11:00
Rohan Mitchell
bd854bf2dd Remove receival_time from exchange, just use receival_instructions 2015-12-02 15:05:49 +11:00
Rohan Mitchell
5ffad4d343 Fix quantity calculation 2015-11-05 09:43:44 +11:00
Rohan Mitchell
f63a80300b Merge branch 'master' into folklabs-producer-emails 2015-10-29 11:49:24 +11:00
Rohan Mitchell
421774e46c Do not send producer notifications when the producer has no orders for this order cycle 2015-10-17 11:02:47 +11:00