2778 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	92eca72f4f	Fixing a couple of paths and clearing localStorage when changing distributor	2014-06-06 14:04:48 +10:00
Will Marshall	c32776c6b8	Disabling maps in production	2014-06-06 14:04:47 +10:00
Will Marshall	54cdc545a4	adding distributor id to localStorage	2014-06-06 14:04:47 +10:00
Will Marshall	afabda788e	Adding the close	2014-06-06 14:04:47 +10:00
Will Marshall	74b9810d22	Removing image from about us	2014-06-06 14:04:47 +10:00
Will Marshall	c09ffa832c	Fixing gmaps	2014-06-06 14:04:47 +10:00
Will Marshall	ebe40d3b3d	New icon	2014-06-06 14:04:46 +10:00
Will Marshall	f881197a74	New icons and some more enterprise data	2014-06-06 14:04:46 +10:00
Will Marshall	ddb5150e77	Automatically resizing to fit	2014-06-06 14:04:46 +10:00
Will Marshall	6f2e841100	Adding modals for the map	2014-06-06 14:04:46 +10:00
Will Marshall	c9c1b4709b	Basic but hacky way to get events out of map	2014-06-06 14:04:46 +10:00
Will Marshall	82ab14a33e	Starting on on the map	2014-06-06 14:04:45 +10:00
Rohan Mitchell	634af96a66	Update reports controller spec for multi-order-cycle params	2014-06-06 09:47:16 +10:00
Rohan Mitchell	1d44cbf506	Show distribution charge on report	2014-06-06 09:47:16 +10:00
Rohan Mitchell	1a7b32d1ff	Show hub and customer name on total row	2014-06-06 09:47:16 +10:00
Rohan Mitchell	673293f273	Add extra shipping columns	2014-06-06 09:47:16 +10:00
Rohan Mitchell	13e2da42eb	Add producer column, remove Packed? and Shipped? columns	2014-06-06 09:47:16 +10:00
Rohan Mitchell	1fab8c1e01	In orders and fulfilment reports, rename distributor -> hub and supplier -> producer	2014-06-06 09:47:16 +10:00
Rohan Mitchell	e5f0818065	Order and fulfilment reports can filter by multiple hubs, producers and order cycles	2014-06-06 09:47:16 +10:00
Rohan Mitchell	f8fa014796	LineItem.supplied_by_any	2014-06-06 09:47:15 +10:00
Rohan Mitchell	590ac6aa6d	Put orders and fulfilment report in grid layout	2014-06-06 09:47:15 +10:00
summerscope	3ae1eb863d	Update behaviour on Place Order Now button so it is disabled but not hidden when unavailable	2014-06-05 16:20:14 +10:00
summerscope	7b1756fc98	Fix column layout issue for checkout page making content expand beyond page boundaries	2014-06-05 16:19:35 +10:00
summerscope	68311ca699	Remove Facebook icon which appeared here - unnecessary.	2014-06-05 15:53:23 +10:00
summerscope	2984cada53	Remove Admin link from left menu as this now lives in the drop-down menu for logged in users under Cog icon to right.	2014-06-05 15:51:23 +10:00
Rohan Mitchell	05c62634fc	Further overlapping elements fixes	2014-06-05 14:49:41 +10:00
Rohan Mitchell	2bedc431e8	Fix spec fragility - overlapping elements error	2014-06-05 13:43:41 +10:00
Rohan Mitchell	566afc0b75	Merge branch 'laura_and_will'	2014-06-05 11:42:02 +10:00
Rohan Mitchell	f28d9f9d9b	Fix distributor logo spec - Add a logo	2014-06-05 11:38:27 +10:00
Rohan Mitchell	4a7609a835	Basic styling for checkout credit card form	2014-06-05 11:17:53 +10:00
Will Marshall	fc02e7857a	Merge branch 'master' into laura_and_will ... Conflicts: app/views/shopping_shared/_contact.html.haml	2014-06-04 17:24:30 +10:00
Will Marshall	69e5459afd	Finishing off the merge with localStorage refactoring with sekrets	2014-06-04 17:22:10 +10:00
summerscope	039108a07d	Styling label on taxons on fat view of active table for hubs (add a little padding to right)	2014-06-04 17:16:47 +10:00
Will Marshall	3c21ce8d99	Returning to the basic flash for now	2014-06-04 17:13:19 +10:00
Will Marshall	cd09f70ed3	Compacting down our flash messages	2014-06-04 17:13:19 +10:00
Will Marshall	874afb2d7e	Hiding image if not present	2014-06-04 17:13:18 +10:00
Will Marshall	5bd7485ca6	Restoring the image	2014-06-04 17:13:18 +10:00
Will Marshall	df7ee03cbf	Adding presenters to the social media fields	2014-06-04 17:13:18 +10:00
Will Marshall	d384b18d1b	Adding social media data to producers biatch	2014-06-04 17:13:18 +10:00
Will Marshall	a6a4d28072	Fixing up bugs in the Checkout form	2014-06-04 17:13:18 +10:00
Will Marshall	2c43d5960d	Patching up url formatting, still need to normalize this on backend	2014-06-04 17:12:17 +10:00
Will Marshall	d944c31d77	Showing a loading products thing	2014-06-04 17:12:16 +10:00
Will Marshall	59c433881e	Making the auto-closing more granular on checkout	2014-06-04 17:12:16 +10:00
summerscope	3d64f883a0	Fix issue with double up columns - delete duplicate	2014-06-04 17:12:05 +10:00
summerscope	825ec1bb63	Adding in icons to home hubs fat and skinny views	2014-06-04 17:09:50 +10:00
summerscope	8d24301c26	Changing shop link to correct /shop	2014-06-04 16:57:21 +10:00
Rohan Mitchell	fc3402bbd0	Determine whether to send card field attributes by payment method type	2014-06-04 16:55:27 +10:00
summerscope	c2a2f2b3b8	Adding icon for producers. Remove styling summary-header to distinguish between product and producer	2014-06-04 16:51:43 +10:00
summerscope	cb5948047b	Adding new icons into producer modal. Making it pretty	2014-06-04 16:50:51 +10:00
summerscope	54a70d9b08	Adding new icons into hubs fat view. Making it pretty	2014-06-04 16:50:26 +10:00