3352 Commits

Author	SHA1	Message	Date
Rob Harrington	258573f5a6	Remove obsolete text version of user signup_confirmation	2014-11-26 18:58:26 +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	8f27c643f1	Move override for cart line item into existing view replacement	2014-11-26 16:08:53 +11:00
Rob Harrington	a8dde3bbb9	Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry	2014-11-26 15:16:53 +11:00
Rob Harrington	f5acf36771	Hiding enterprise shop url in ent welcome email, as that may bot actually make sense	2014-11-26 14:50:19 +11:00
Rob Harrington	f6b0863279	Make cost breakdowns consistent throughout checkout	2014-11-26 13:07:40 +11:00
Rob Harrington	c4961d2502	Whitespace crusader	2014-11-26 11:59:22 +11: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	49d5cb2f05	Do not show Override Variants tab - hide this until feature is ready	2014-11-21 13:49:09 +11:00
Rohan Mitchell	0b030a85ff	Incrementally load products	2014-11-21 13:49:09 +11:00
Rohan Mitchell	001bf999d0	Extract Spree API authorisation to service	2014-11-21 13:49:09 +11:00
Rohan Mitchell	824b00743e	Extract fetch-by-page from BPE to service	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	7069b30e71	Add indexer service (equivalent of Dereferencer, but named more accurately)	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	f9b4c07219	Add initial VariantOverride model with price lookup	2014-11-21 13:49:09 +11:00
Rob Harrington	5e3f1e4a3b	Adding bugsnag notifier to work out what is happening with bug when adding variants to order	2014-11-21 12:37:56 +11:00
Rob Harrington	04b065e28a	Orders page doesn't crash when orders have no distributor	2014-11-21 10:15:40 +11:00
Rohan Mitchell	5eb40261a8	Port clone products specs to BulkProducts service specs	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	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	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
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