49 Commits

Author	SHA1	Message	Date
Rohan Mitchell	08fef890ec	Do not show tax lines if there is no tax on the order	2015-04-17 13:41:14 +10:00
Rohan Mitchell	a93633a626	Show tax on order confirmation emails	2015-04-17 13:41:14 +10:00
Rohan Mitchell	4bd1ff2011	Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication	2015-04-17 13:40:08 +10:00
summerscope	d2fbf9f14d	Fixing logic for instance where collection instructions are not entered	2015-03-13 18:00:36 +11:00
summerscope	2cdab7af25	More label tweaks and logic tweaks to templates	2015-03-05 11:26:15 +11:00
summerscope	e6591be55c	More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.	2015-03-04 17:34:24 +11:00
summerscope	163035dcad	Tweaking email template to be more like order confirmation	2015-03-04 17:18:37 +11:00
summerscope	b097a62c7a	WIP adding variant name logic to the email templates	2015-03-04 12:37:57 +11:00
summerscope	2c2352cd4e	Final tweaks to different layout use cases for these emails.	2015-02-27 17:14:33 +11:00
summerscope	12bfb9301a	More updates dealing with pick up instructions.	2015-02-27 17:09:59 +11:00
summerscope	ba0d4c2111	More order confirmation email updates. Making language correct for hub vs user.	2015-02-27 16:55:36 +11:00
summerscope	4eee86a240	Tweak label	2015-02-27 16:09:14 +11:00
summerscope	587e4ae86d	WIP getting all the confirmation details right for collection, delivery, etc.	2015-02-27 16:08:20 +11:00
summerscope	87842ecaf5	More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements.	2015-02-27 14:00:49 +11:00
summerscope	2ba632456f	WIP email mailer updates for customer email confirmation etc.	2015-02-27 12:40:13 +11:00
Rob Harrington	6a226e4f92	Fixing typos and changing delivery address display in order confirmation email	2014-12-12 12:00:15 +11:00
Rob Harrington	0cf2df8358	Remove obsolete text version of order confirm_email	2014-11-26 18:54:50 +11:00
Rob Harrington	8a3bffb37d	Cart page conforms to convention in rest of checkout, adjusting helpers through checkout	2014-11-26 18:53:29 +11:00
Rob Harrington	f6b0863279	Make cost breakdowns consistent throughout checkout	2014-11-26 13:07:40 +11:00
Rob Harrington	ebaaf2a136	Display line items in confirmation email with fees included in item totals	2014-11-20 20:17:18 +11:00
Rob Harrington	15d157abc0	Stripping out inline styles from email templates	2014-11-20 15:42:03 +11:00
Rob Harrington	fe0bb49baf	WIP: Adding templates for different order confirmation emails	2014-11-20 12:06:53 +11:00
Rafael Schouten	ff4f8f63af	Merge branch 'master' into raf_bugfix ... Conflicts: app/views/spree/order_mailer/confirm_email.text.haml	2014-10-02 19:06:30 +10:00
Rafael Schouten	a2dff2305f	space in order confirm mailer	2014-09-30 19:39:56 +10:00
Rafael Schouten	dee869a273	move checks and links in sidebars	2014-09-26 17:58:00 +10:00
Rafael Schouten	92a40fc842	order mailer edits	2014-09-26 17:21:41 +10:00
Rafael Schouten	83b19ee632	fix haml and formatting on confirm email	2014-09-17 16:56:44 +10:00
Rafael Schouten	79fd8ed98b	dubug mail template	2014-09-17 15:37:38 +10:00
Rafael Schouten	b6fd3a11fa	remove old mailer	2014-09-17 11:54:06 +10:00
Rafael Schouten	f79dfed6ef	use haml for mailer	2014-09-17 11:53:47 +10:00
Rob H	115d8e0d6e	Smoosh distributions up into cart item subtotal in order confirmation email	2014-08-08 17:50:00 +10:00
Rohan Mitchell	3dd7b296be	Show order notes (special instructions) on report and confirmation email	2014-07-24 15:13:23 +10:00
Rob H	a668a4fd55	Further tidy-up for order confirmation email	2014-06-20 12:21:33 +10:00
Rob H	bd13b2b3fc	Add shipping method description to confirmation email, cleanup	2014-06-19 17:52:25 +10:00
Will Marshall	96913ad922	Changing the order confirmation text with Kirsten	2014-04-11 13:33:13 +10:00
Will Marshall	fcb04481c4	Fixing a nil chain bug	2014-04-08 17:55:09 +10:00
Will Marshall	1e04a3b5f7	Changing the confirm email text a little bit	2014-04-07 14:31:02 +10: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
Rohan Mitchell	b73c584c3b	Update order confirmation email in line with changes in spree	2013-07-23 14:00:29 +10:00
Rob H	3a3f427a8d	Reference name of payment method rather than payment method itself	2012-12-07 14:30:05 +11:00
Rob H	58a79e9b0c	Minor changes to order confirm email	2012-11-23 16:06:25 +11:00
Rohan Mitchell	7dd42b7feb	Fix use of pickup_address and url fields with enterprises, checkout spec passes	2012-10-31 17:10:21 +11:00
Andrew Spinks	759ceae23f	add distributor name to confirmation email	2012-07-11 23:20:59 +10:00
Andrew Spinks	32b37a1390	add padding to the second address line.	2012-07-11 22:45:57 +10:00
Andrew Spinks	0e43fcfaa1	adjust address formatting in confirmation email.	2012-07-11 22:25:42 +10:00
Andrew Spinks	6a27f8da32	update formatting of confirmation email.	2012-07-11 22:15:46 +10:00
Andrew Spinks	c24543c237	Add delivery details to confirmation email.	2012-07-11 22:07:18 +10:00
Andrew Spinks	44314ccb99	copied original spree confirmation mail	2012-07-11 21:35:07 +10:00