6861 Commits

Author	SHA1	Message	Date
Matt-Yorkley	451dd3966f	form partial	2014-11-23 15:22:56 +00:00
Rob Harrington	9bd3909449	Merge master into pretty-emails	2014-11-21 14:43:01 +11:00
Rob Harrington	2f28312f7e	Removing incorrectly placed directive in profile shops skinny view	2014-11-21 14:18:22 +11:00
Rohan Mitchell	0b030a85ff	Incrementally load products	2014-11-21 13:49:09 +11:00
Rohan Mitchell	58fdc48b9f	Display products in table	2014-11-21 13:49:09 +11:00
Rohan Mitchell	680ba379c1	User can select a hub	2014-11-21 13:49:09 +11:00
Rohan Mitchell	912c60f720	Do not show producers in hubs list	2014-11-21 13:49:09 +11:00
Rohan Mitchell	2c74a94e31	Show list of hubs to select for managing variant overrides	2014-11-21 13:49:09 +11:00
Rohan Mitchell	7e4d337773	Extract DisplayProperties to a service ... Conflicts: app/assets/javascripts/admin/bulk_product_update.js.coffee	2014-11-21 08:41:41 +11:00
Rohan Mitchell	29e49b67cc	In BPE, rename producer and category JSON attrs to producer_id and category_id ... Conflicts: spec/features/admin/bulk_product_update_spec.rb	2014-11-21 08:41:41 +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	c310a3bdaa	Don't use svg for email header	2014-11-20 20:14:57 +11:00
Rob Harrington	46462a1abb	Format fiddling in user signup confirm email	2014-11-20 20:13:54 +11:00
Rohan Mitchell	76c300283b	Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon	2014-11-20 15:59:06 +11:00
Rob Harrington	3d98ec6eef	Stripping out inline styles from enterprise email templates	2014-11-20 15:51:28 +11:00
Rob Harrington	4dd5e51ed5	Stripping out inline styles from user signup email template	2014-11-20 15:48:36 +11:00
Rob Harrington	f5a5b93c22	Can use relative paths for assets in emails because roadie	2014-11-20 15:45:12 +11:00
Rob Harrington	15d157abc0	Stripping out inline styles from email templates	2014-11-20 15:42:03 +11:00
Rohan Mitchell	8096ca2519	Merge remote-tracking branch 'origin/config' into config	2014-11-20 15:41:15 +11:00
Rob Harrington	fe0bb49baf	WIP: Adding templates for different order confirmation emails	2014-11-20 12:06:53 +11:00
Rob Harrington	dd6a5ecd0b	Adding helper for assets in mailer views, fixing links in mailer layout	2014-11-19 16:42:31 +11:00
Lynne Davis	b81bf60dc2	267: Cont. Didn't realise commit -a doesn't add a file	2014-11-18 19:30:44 +00:00
Paul Mackay	375bdc0586	#275: Change report format. Improved mailer.	2014-11-16 07:14:29 +00:00
Lynne Davis	e89184de02	286: Last sneaky dollar sign. Updated to use spree_number_to_currency	2014-11-14 14:24:22 +00:00
Rob Harrington	8d1facb7c3	Adding revamp of enterprise welcome email by @summerscope	2014-11-14 18:42:16 +11:00
Rob Harrington	0907e2d886	A few alterations to the enterprise email confirmation email	2014-11-14 18:10:40 +11:00
Rob Harrington	d182bb7bf7	Add signoff partial for mailer templates	2014-11-14 18:09:48 +11:00
Rob Harrington	b320f71771	Adding revamp for signup confirmation by @summerscope	2014-11-14 17:59:56 +11:00
Rob Harrington	27d1886d53	Fix mailto link	2014-11-14 17:58:13 +11:00
Rob Harrington	15559b2388	Merge branch 'master' into pretty-emails	2014-11-14 16:54:50 +11:00
Rob Harrington	d9d6b7bee4	Adding filtering to Users and Enterprises report	2014-11-14 16:36:22 +11:00
Rob Harrington	79a83ee206	Adding users and enterprises report, controller action and template	2014-11-14 16:36:22 +11:00
Lynne Davis	15f29f4c8e	266: Adding ability to search by distribution	2014-11-12 18:52:25 +00:00
Lynne Davis	932d571d2c	266: Updating to incorporate Rohans suggestions. Searching on payment method name rather than id	2014-11-12 11:47:26 +00:00
Rob Harrington	7282c7174f	Moving alert box to top of section	2014-11-12 15:55:48 +11:00
Rob Harrington	7a719952fc	Adding informative messages about email confirmations to enterprise form	2014-11-12 15:20:52 +11:00
Rob Harrington	2c67066366	Add alert to enterprise edit page to remind user that confirmation email has been sent	2014-11-12 15:20:52 +11:00
Rob Harrington	ee2ee5dba7	Adding an enterprise welcome email	2014-11-12 15:20:51 +11:00
Paul Mackay	9b7fd1c16b	#275: small tweaks.	2014-11-09 11:19:26 +00:00
Paul Mackay	05437e2a56	#275: start on producer email.	2014-11-09 11:17:46 +00:00
Rob Harrington	66bbaabf79	Adding loading gif to shop page	2014-11-07 16:50:31 +11:00
summerscope	791cc9b301	Hide pricing table until language is sorted	2014-11-07 13:56:28 +11:00
summerscope	2166fbc8a0	Tweak wording for kirsten	2014-11-07 13:56:07 +11:00
summerscope	9f74e8ff03	Add caret to right on register buttons, kill commented out text	2014-11-07 12:05:35 +11:00
summerscope	4795de5ab0	Adding new partial into homepage	2014-11-07 08:49:09 +11:00
summerscope	9a2e510f2c	Add Producers register link to footer	2014-11-07 08:48:37 +11:00
summerscope	cd34aedbb9	New partial for producer register pricing table	2014-11-07 08:48:24 +11:00
Rob Harrington	898af0a55e	Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice	2014-11-06 21:19:21 +11:00
Rob Harrington	70c4b7082d	Split ent confirmation email out into layout and partial	2014-11-06 21:19:21 +11:00
Rohan Mitchell	4389389d44	Checkout: Display error when shipping or payment method is not selected	2014-11-06 18:29:49 +11:00