34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	7e2c979c96	WIP: Extracting BulkProducts-specific specs to their own file	2014-11-21 08:41:41 +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	356a03ac4e	WIP: Extract bulk product edit product management to BulkProducts service ... Conflicts: app/assets/javascripts/admin/bulk_product_update.js.coffee	2014-11-21 08:41:41 +11:00
Rohan Mitchell	f117c0cd24	Make spree_current_user available to serializers as 'scope'	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
Rohan Mitchell	021cca4fca	Stylistic changes	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	b64b48f26e	Removing obsolete MailerHelper reference	2014-11-20 20:16:34 +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	b941ffabeb	Update README for Figaro config, add Maikel to credits	2014-11-20 16:20:07 +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	1f42d32151	Remove naughty pry	2014-11-20 15:45:50 +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	2e84a8f626	Pull layout and roadie style inlining out into spree's base mailer so it applies to all mailers	2014-11-20 15:05:19 +11:00
Rob Harrington	ac6a043f40	Add roadie-rails to help with inlining styles for emails	2014-11-20 14:56:35 +11:00
Rob Harrington	fe0bb49baf	WIP: Adding templates for different order confirmation emails	2014-11-20 12:06:53 +11:00
Rob Harrington	20341ecbc1	Send bugsnag notification when order confirmation email fails	2014-11-20 12:04:51 +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
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
Lynne Davis	b81bf60dc2	267: Cont. Didn't realise commit -a doesn't add a file	2014-11-18 19:30:44 +00:00
Lynne Davis	cc0da142b7	267: Adding to new product form ability to add shipping category to record frozen/chilled	2014-11-18 19:28:49 +00:00
Paul Mackay	375bdc0586	#275: Change report format. Improved mailer.	2014-11-16 07:14:29 +00:00
Lynne Davis	03b59eae75	266: Updating with rohans suggestions to tidy up and 'rubify' the code. Thanks for the tips Rohan!	2014-11-14 15:56:07 +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	ffb915ccc5	Orders page doesn't crash when orders have no distributor	2014-11-14 16:48:33 +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
Rob Harrington	66a3410087	WIP: Adding new report to ability spec	2014-11-14 16:36:22 +11:00
Rob Harrington	65a5960fcc	WIP: Add route for User and Enterprise report	2014-11-14 16:36:22 +11:00
Lynne Davis	cc3959467d	285: Report downlaod naming - Updating to the cleaner suggestions of Rohan. Note to self, don't be lazy :-)	2014-11-13 10:30:00 +00:00
Rohan Mitchell	43bac4079f	Show hubs that are not ready for checkout so that we can view SEFH - Sample :/	2014-11-13 15:21:02 +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
Rohan Mitchell	43ddac84b0	I like nice code	2014-11-12 16:25:45 +11:00
Rohan Mitchell	2ca2d53273	Do not include perftools gem by default - it breaks Travis	2014-11-12 16:25:45 +11:00
Rohan Mitchell	4e655d7866	Uncouple migrations from models	2014-11-12 16:25:45 +11: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