34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	666036756e	fixup docs etc	2014-09-10 19:50:32 +10:00
Rafael Schouten	dc266e066f	another few class names	2014-09-10 19:43:14 +10:00
Rafael Schouten	44e9cf5ade	add currency spec file and update some class names	2014-09-10 18:22:33 +10:00
Rohan Mitchell	69d1111c73	Fix expected payment amount	2014-09-10 17:00:51 +10:00
Rohan Mitchell	32a2e793ad	When deleting enterprise relationships, delete dependent permissions	2014-09-10 14:49:15 +10:00
Rohan Mitchell	c297b7014a	Charge customers for their shipping fee	2014-09-10 14:01:36 +10:00
Rohan Mitchell	4168ea054b	For body content, cloak the home page only. JS should be cached after that.	2014-09-10 12:12:46 +10:00
Rohan Mitchell	b49eb8fe03	Hide angular templates on page load	2014-09-10 11:50:30 +10:00
Rob H	78a70292ac	Moved attributes are actually delcared in the right place for Enterprise Serializer	2014-09-08 15:39:17 +10:00
Rob H	dfa837cac6	Moved cached properties which should not be cached	2014-09-08 15:01:34 +10:00
Rob H	b49a4cbc4f	Fix intermittent failing spec	2014-09-08 11:11:07 +10:00
Rob H	3ee0cf46e0	Merge branch 'working' into merging	2014-09-08 10:12:31 +10:00
Rob H	36891c73cb	Merge branch 'master' into merging	2014-09-08 10:09:51 +10:00
Rob H	a968aa9b91	Removing float:left which weirdly breaks specs	2014-09-08 10:09:00 +10:00
Rafael Schouten	991d0029dd	add currency localisation	2014-09-08 00:06:53 +10:00
Rob H	5fb4110328	Adding distributor and producer checkboxes to enterprise index	2014-09-07 21:04:53 +10:00
Rob H	6540bb8efc	Adding select field for enterprise type to index when super admin	2014-09-07 19:51:14 +10:00
Rob H	b8fadb50ae	Special Instructions in checkout are actually wired up	2014-09-06 12:00:27 +10:00
Rob H	9dc2b248c7	Bulk management permissions make more sense	2014-09-06 09:37:34 +10:00
Rob H	ee4a1925fe	Bulk Order Management works with navigation helper override	2014-09-06 00:34:27 +10:00
Rob H	780df6bfe0	Hide 'profile type' form element for non super-admin users	2014-09-05 18:38:43 +10:00
Rob H	58dcdbd9c4	Restricting ability to change enterprise type at the controller level	2014-09-05 18:30:15 +10:00
summerscope	2e8ec3df18	Tweak placeholder messages for big inputs	2014-09-05 18:07:50 +10:00
summerscope	6271b83fad	Tweak placeholder messages for big inputs	2014-09-05 18:07:28 +10:00
summerscope	778cf0326b	Changing placeholder for	2014-09-05 18:04:02 +10:00
summerscope	94e3946d52	producer list view styling	2014-09-05 17:54:16 +10:00
summerscope	0b74242f49	make classes more generic for more use-cases	2014-09-05 17:53:52 +10:00
summerscope	bb82fc4b20	move generic things into active table	2014-09-05 17:53:27 +10:00
summerscope	6e10c416e2	hub view styling	2014-09-05 17:53:14 +10:00
summerscope	ab44046658	skinny view producers remove unnecessary spacer element	2014-09-05 17:52:36 +10:00
summerscope	a9619a6dca	Changes to markup on producer page to adjust layout	2014-09-05 17:50:50 +10:00
Rob H	20bfcd6e48	Switching enterprise relationships form around	2014-09-05 17:11:57 +10:00
summerscope	60ac3f29a5	Producers page WIP	2014-09-05 16:41:00 +10:00
summerscope	adb8b6b02f	Styling for help icon	2014-09-05 16:40:59 +10:00
summerscope	b3f97479d3	Hide profile filter from search for the mo	2014-09-05 16:40:59 +10:00
Rob H	097367a9f8	Map modals for 'profile' enterprises do not display shopping options	2014-09-05 16:28:08 +10:00
Rob H	1e1ddedfb2	Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend	2014-09-05 16:18:45 +10:00
Rob H	428e4c63d4	Profile hubs don't show up in hubs list	2014-09-05 16:18:25 +10:00
summerscope	0d0ffa1cd0	Making CTA links consistent with modals, adding in logic to force space holding for producer fat view	2014-09-05 15:47:41 +10:00
summerscope	a092e97294	Adding a little bit of spacing between each row for active table	2014-09-05 15:47:14 +10:00
summerscope	26bd1000de	Changing placeholder for search input	2014-09-05 15:28:50 +10:00
summerscope	59adae5c9c	Working on space placeholders for fat view	2014-09-05 15:28:32 +10:00
Rob H	233532a85f	Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend	2014-09-05 15:14:48 +10:00
summerscope	99fb9c1966	Adding in markup and styling for new layout of hubs list view	2014-09-05 15:10:17 +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
Rohan Mitchell	c43c35601b	Set product.largeImage in JS, use for product modal	2014-09-05 15:10:16 +10:00
Rohan Mitchell	fe1c60ba47	Enterprise manager can edit products from enterprises it has manage_products permission on	2014-09-05 15:10:16 +10:00