80 Commits

Author	SHA1	Message	Date
Pau Pérez Fabregat	6ce552727b	Merge pull request #2118 from oeoeaio/payment-summary-for-emails ... Show payment summary in confirmation email regardless of payment method	2018-03-23 15:30:44 +01:00
Duende13	330e7d71af	Sort line items by name and unit_value for confirmation email and summary screen	2018-03-23 17:37:50 +11:00
Rob Harrington	4d757dde78	Show payment summary in confirmation email regardless of payment method	2018-03-16 10:55:56 +11:00
Rob Harrington	672f96b85b	Replace references to 'standing order' with 'subscription'	2018-02-09 14:44:13 +11:00
Rob Harrington	6e83c6dc86	Move standing order emails to a dedicated StandingOrderMailer	2018-02-09 14:44:07 +11:00
Rob Harrington	b89ab2c407	Adding link to view/edit the order from Standing Order placement and confirmation emails	2018-02-09 14:44:02 +11:00
Rob Harrington	7d1fc8cbe1	Make sure correct intro message is used for empty standing order notification	2018-02-09 14:44:02 +11:00
Rob Harrington	f969caa2d1	Do not place standing order when no items are available ... Send notification to customer informing them that an order was not placed...	2018-02-09 14:44:02 +11:00
Rob Harrington	439c81d836	Format of hours in standing order placement email without leading zero	2018-02-09 14:43:56 +11:00
Rob Harrington	1e0d43e975	Changing explain text on confirm email ... Removing mention of making changes	2018-02-09 14:43:56 +11:00
Rob Harrington	994baf12c4	Adding specs to ensure placement emails are sent	2018-02-09 14:43:56 +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
Pierre de Lacroix	a245590114	Fix some translations	2017-10-18 14:38:40 +11:00
Pau Perez	1f2820f6d4	Add #delivery? in ShippingMethod	2017-08-11 14:41:02 +10:00
François Turbelin	be6b09a6e0	Adding i18n keys on JS templates	2017-03-12 12:22:13 +01:00
Lynne Davis	a0f51af355	Correcting name tag for order conf email	2016-01-25 23:50:53 +00:00
Rob Harrington	75846a4d1f	Merge branch 'master' into line_item_naming	2015-11-16 10:38:42 +11:00
Rob Harrington	cb1f79f59a	Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants	2015-10-28 15:42:14 +11:00
Rob Harrington	ab7bfd10c5	Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module" ... This reverts commit e86e08b72e939fee61eddd41d56081395666a877. Conflicts: lib/open_food_network/order_and_distributor_report.rb spec/features/admin/variants_spec.rb spec/lib/open_food_network/order_and_distributor_report_spec.rb	2015-10-28 13:08:50 +11:00
Rob Harrington	795830d94d	Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module	2015-10-28 13:07:31 +11:00
Maikel Linke	2053fbecda	Merge branch 'i18n-replace-strings-in-js' into i18n ... Conflicts: .travis.yml app/views/spree/order_mailer/confirm_email_for_customer.html.haml config/locales/en.yml	2015-10-21 14:09:43 +11:00
Rob Harrington	6e7fc6a0f7	Adding invoice action to orders controller, to allow sending of invoice email	2015-10-16 17:25:40 +11:00
Rob Harrington	104b100fe6	Pulling distributor signoff out into separate partial	2015-10-16 17:25:39 +11:00
Maikel Linke	0b4a43d77a	Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views ... Conflicts: app/views/shared/menu/_cart.html.haml app/views/spree/order_mailer/confirm_email_for_shop.html.haml	2015-09-16 16:32:16 +10:00
Maikel Linke	e25805aa78	Restoring all changes of the last combined branch ... This reverts commit 1e55e8a907.	2015-09-10 15:03:13 +10:00
Maikel Linke	1e55e8a907	Reverting all changes of the last combined branch ... The production server hangs on certain requests. To rule out a code bug, we revert to the last deployed version.	2015-09-10 12:50:40 +10:00
Maikel Linke	23355d1a25	include order email and phone number in email for shop	2015-09-03 14:46:08 +10:00
Maikel Linke	85c99102dd	i18n: Replacing all language strings in app/view/ ... Languages strings were moved to config/locale/en.yml. All views contain according calls to t() now.	2015-08-28 16:59:23 +10:00
Rohan Mitchell	e843beaf18	Remove enterprise address from order confirmation and mailer, since in these contexts the pickup location will be specified elsewhere. #636	2015-08-07 14:19:48 +10:00
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