Rohan Mitchell
|
5ffad4d343
|
Fix quantity calculation
|
2015-11-05 09:43:44 +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 |
|
Paul Mackay
|
baaa192967
|
#275: Code cleanup.
|
2015-05-24 10:44:39 +01:00 |
|
Paul Mackay
|
2f05fc3824
|
#275: Insert receival time and instructions into email.
|
2015-05-24 10:38:49 +01:00 |
|
Rohan Mitchell
|
6999bcfd4e
|
Only include complete orders in producer mailer report
|
2015-04-29 15:43:50 +10:00 |
|
Rohan Mitchell
|
3a3bf19cf8
|
Clean up duplication
|
2015-04-29 15:31:42 +10:00 |
|
Rohan Mitchell
|
36584f0177
|
Remove puts from specs, fix failing controller spec
|
2015-04-29 14:46:20 +10:00 |
|
Rohan Mitchell
|
6b1c125b03
|
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
Conflicts:
Gemfile.lock
app/controllers/admin/order_cycles_controller.rb
app/views/admin/order_cycles/edit.html.haml
app/views/admin/order_cycles/show.rep
db/schema.rb
spec/controllers/admin/order_cycles_controller_spec.rb
|
2015-04-29 14:42:17 +10:00 |
|
Paul Mackay
|
99709b53ed
|
Change controller action to 'notify_producers'.
Add flash message on completion.
Simplify job variables.
Improve mailer query.
Spec for job.
|
2015-04-11 13:19:48 +01:00 |
|
Paul Mackay
|
717b3b6494
|
#275: Fixes for testing aggregated orders.
|
2015-03-10 19:19:57 +00:00 |
|
Paul Mackay
|
ca665dc6bc
|
Merge master into producer-emails.
|
2015-03-04 19:09:43 +00:00 |
|
Rob Harrington
|
e8818c5191
|
Adding a ship address to order in spec
|
2015-03-01 12:22:06 +11:00 |
|
Paul Mackay
|
67b17de695
|
#275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.
|
2014-12-30 11:33:13 +00:00 |
|
Rob Harrington
|
c9d0721acd
|
Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners
|
2014-11-19 11:03:00 +11:00 |
|
Paul Mackay
|
375bdc0586
|
#275: Change report format. Improved mailer.
|
2014-11-16 07:14:29 +00:00 |
|
Rob Harrington
|
6b21bbdf74
|
Reconfirmation email sends to the right address
|
2014-11-12 15:20:51 +11:00 |
|
Rob Harrington
|
ee2ee5dba7
|
Adding an enterprise welcome email
|
2014-11-12 15:20:51 +11:00 |
|
Rob Harrington
|
a6bc9e66f6
|
Only send one enterprise creation confirmation email
|
2014-10-17 12:29:51 +11:00 |
|
Rob Harrington
|
6e699b2e8b
|
Mailer tests
|
2014-10-15 11:52:04 +11:00 |
|
Rob H
|
f5048ecf7c
|
Sends confirmation email when Enterprise is created
|
2014-09-12 13:24:17 +10:00 |
|
Will Marshall
|
87a43fc36e
|
Fixing the build! Some minor bugs due to mailer changes
|
2014-04-09 12:19:52 +10:00 |
|
Will Marshall
|
5c999fd9cf
|
Adding a signup confirmation email
|
2014-04-04 12:36:33 +13:00 |
|
Will Marshall
|
26a8daed0e
|
Patching up the order mailer to set reply_to
|
2014-01-16 11:39:10 +11:00 |
|
Will Marshall
|
63349c7c9a
|
Fixing some breaking bugs in the refactored mailer
|
2013-12-13 15:40:23 +11:00 |
|
Will Marshall
|
12743850b4
|
Removing a chili, refactoring order mailer
|
2013-12-13 15:40:22 +11:00 |
|