472 Commits

Author	SHA1	Message	Date
Rob Harrington	338ba74652	Only show enterprise partial when no enterprises exist	2014-10-17 17:15:49 +11:00
Rob Harrington	c59662758c	Add alerts for unconfirmed enterprises to overview page	2014-10-15 15:46:21 +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	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +10:00
Rafael Schouten	e9dd863462	Merge branch 'master' into payment_description ... Conflicts: app/views/spree/order_mailer/confirm_email.text.erb	2014-09-17 17:07:43 +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
Rafael Schouten	49476b17e8	fix typos and add missing helper	2014-09-16 16:10:48 +10:00
Rafael Schouten	1aa80e53b1	Merge branch 'master' into currency ... Conflicts: app/helpers/injection_helper.rb db/suburb_seeds.rb	2014-09-16 10:25:22 +10:00
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rohan Mitchell	e50bbeaefb	Edit product form shows permitted suppliers	2014-09-12 11:33:47 +10:00
Rob H	3d4e00a03c	Swtich API key injection over to helper	2014-09-11 17:07:05 +10:00
Rob H	9085741f3c	Removing enterprises form from user edit page	2014-09-11 15:19:23 +10:00
Rob H	8cc5c2246a	Hide 'Create New' enterprise link on dashboard when user has reached limit	2014-09-11 15:19:23 +10:00
Rafael Schouten	09a4c4e17e	add spree currency helper, fix some typos and specs	2014-09-11 11:47:55 +10:00
Rafael Schouten	c1971d015c	fix bug in mailer	2014-09-10 19:59:39 +10:00
Rafael Schouten	991d0029dd	add currency localisation	2014-09-08 00:06:53 +10:00
Rohan Mitchell	3a12f9a7c8	Extract bulk product edit interface into partials	2014-09-05 15:10:17 +10:00
Rohan Mitchell	4d766a29ab	Convert admin login nav to haml	2014-09-05 15:10:16 +10:00
Maikel Linke	7603ea867f	Store links to root_path instead of product_path	2014-09-05 15:10:12 +10:00
Maikel Linke	c5cfda5283	Adding login_nav partial from spree_auth_devise ... Preparing to change 'Store' link for Bugherd #443.	2014-09-05 15:10:12 +10:00
Rohan Mitchell	0fd496aa97	Extract bulk product edit interface into partials	2014-09-02 15:27:51 +10:00
Rohan Mitchell	818a0f8595	Convert admin login nav to haml	2014-09-02 13:45:11 +10:00
Maikel Linke	adf4f92ffb	Store links to root_path instead of product_path	2014-08-22 16:10:23 +10:00
Maikel Linke	ca7eb72688	Adding login_nav partial from spree_auth_devise ... Preparing to change 'Store' link for Bugherd #443.	2014-08-22 16:04:46 +10:00
Rohan Mitchell	e173c69ee3	Fix arrow position	2014-08-19 16:53:23 +10:00
Rohan Mitchell	3e97762f7e	Remove unused producer options on hub tab, make logic consistently ordered	2014-08-19 16:23:05 +10:00
Rohan Mitchell	5dc7d1ee11	For users without product management perms, show a cut-down admin dashboard	2014-08-19 16:02:11 +10:00
Rohan Mitchell	9451f3659c	Use pluralize helper, sentence case	2014-08-19 15:41:01 +10:00
Rohan Mitchell	e1a1b74f03	Extract dashboard enterprises table markup into partials	2014-08-19 14:49:20 +10:00
Rob H	c20369919c	Can change hub after changing pm type	2014-08-09 11:23:05 +10:00
Rob H	115d8e0d6e	Smoosh distributions up into cart item subtotal in order confirmation email	2014-08-08 17:50:00 +10:00
Rob H	f19af52556	WIP: angularised provider settings for payment method works on create (for admin only at this stage)	2014-08-08 17:47:50 +10:00
Rob H	d6aae0050f	Angularise payment method provider UI	2014-08-08 17:47:50 +10:00
Rob H	3b9cd3f46a	Make loading on BOM look more like BPE	2014-08-08 14:05:53 +10:00
Rob H	e6f7f26a95	Add loading gif to BPE, fiddle with interface	2014-08-08 14:05:53 +10:00
Rob H	32c8b9cdcd	Switch Taxons input over to category selection on BPE, clean up interface	2014-08-08 14:05:53 +10:00
Rob H	1e68052711	Moving update button to top of BPE	2014-08-08 14:05:53 +10:00
Rob H	d27908fd2f	Add ability to reset filters to BPE	2014-08-08 14:05:53 +10:00
Rob H	d9692312ac	WIP: swapping filters over to drop downs	2014-08-08 14:05:52 +10:00
Rob H	2f5b5e7ee5	Inject taxons into BPE	2014-08-08 14:05:52 +10:00
Rob H	aaddccfae4	Injecting producer information into BPE	2014-08-08 14:05:51 +10:00
Rob H	c139e2fab2	Remove 500 product warning	2014-08-08 14:05:51 +10:00
Rob H	27e992ebcb	Staggered loading of products in BPE	2014-08-08 14:05:51 +10:00
Rob H	b9f49344b4	BPE: Switch column toggle to dropdown, clean up specs	2014-08-08 14:05:51 +10:00