389 Commits

Author	SHA1	Message	Date
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	590ac6aa6d	Put orders and fulfilment report in grid layout	2014-06-06 09:47:15 +10:00
Rohan Mitchell	566afc0b75	Merge branch 'laura_and_will'	2014-06-05 11:42:02 +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
Rohan Mitchell	37c780ed70	WIP: Send credit card details to server on checkout	2014-06-04 16:20:48 +10:00
summerscope	62e8a913fa	Merge branch 'laura_and_will' into icon_font	2014-06-04 11:09:37 +10:00
Rob H	69376e7f4b	Merge in master	2014-05-30 15:10:13 +10:00
summerscope	00ac80bdbb	Add new icons	2014-05-30 12:56:56 +10:00
summerscope	a54b3f7849	Adding new icon for refresh	2014-05-30 12:39:44 +10:00
summerscope	9a962f7445	Add new icons to checkout & back to cart buttons	2014-05-30 12:35:54 +10:00
Will Marshall	65d11ce552	Removing some unnecessary	2014-05-29 15:41:27 +10:00
Rohan Mitchell	2a630a855a	Move primary taxon field into Rob's new product form	2014-05-29 09:28:08 +10:00
Rohan Mitchell	09ce8697af	Only trigger taxon search AJAX when column visible - fixes deadlocks in specs	2014-05-28 16:55:04 +10:00
Rohan Mitchell	e951f80070	Merge branch 'new-product-form' ... Conflicts: app/assets/javascripts/admin/admin.js.coffee	2014-05-24 17:14:32 +10:00
Rohan Mitchell	acbe49b8de	Revert primary taxons	2014-05-24 17:13:01 +10:00
Will Marshall	2db63540ee	Adding primary taxon	2014-05-24 10:27:57 +10:00
Rohan Mitchell	7ac33beb65	Revert "Adding primary taxon" ... This reverts commit 58112fb105.	2014-05-24 09:07:55 +10:00
Will Marshall	58112fb105	Adding primary taxon	2014-05-23 16:01:24 +10:00
Rob H	f8776fecff	Move enterprises dashboard controller	2014-05-22 15:46:26 +10:00
Rob H	371240652c	Change 'Overview' menu item to 'Dashboard'	2014-05-22 15:30:11 +10:00
Rob H	ed3c23cd90	Split 'My Enterprises' dashboard item into Hubs and Producers	2014-05-22 15:28:25 +10:00
summerscope	d874855aa1	Update styling on empty cart	2014-05-20 16:40:23 +10:00
Will Marshall	ef91f8d17f	Redirecting if cart is empty and activating the empty cart link	2014-05-20 16:05:28 +10:00
summerscope	0957edee5d	Styling for shopping cart page	2014-05-20 15:50:03 +10:00
Rob H	31334be615	Tidy up of new dashboard, add 'CREATE NEW' button at top right	2014-05-14 11:31:42 +10:00
Rob H	c98d2e71d8	Add scroll pane to admin dashboard	2014-05-09 17:20:53 +10:00
Rob H	05e01d02c4	Merge branch 'master' into ent-makeover	2014-05-09 15:58:17 +10:00
Rob H	01c5822fcc	Add basic dashboard to admin section	2014-05-09 15:48:58 +10:00
Rohan Mitchell	87179669a6	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 11:34:52 +10:00
Rohan Mitchell	967d4c81ab	Cache expensive options_text call	2014-05-08 20:55:43 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Rob H	6ba0d6c5f9	WIP: Split out admin angularjs	2014-05-02 21:38:39 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rob H	de369ae32b	WIP: Can manage taxons in BPE	2014-05-02 10:28:33 +10:00
Rob H	56204d4ea6	Upgrade Admin AngularJS	2014-05-01 13:01:52 +10:00
Rob H	43106d5db8	Add explanation to top of BOM	2014-04-24 15:10:45 +10:00
Rob H	b59aa53158	Add edit order button to BOM	2014-04-24 13:49:28 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rohan Mitchell	aa1c28b163	Move enterprises api controller out of spree namespace	2014-04-11 19:08:55 +10:00
Will Marshall	96913ad922	Changing the order confirmation text with Kirsten	2014-04-11 13:33:13 +10:00
Rob H	ff531f0e18	Producers can only list line items which contain products they supply	2014-04-11 09:39:01 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Rob H	6228cc0c55	BOM: Add order cycle column	2014-04-10 15:34:23 +10:00
Rob H	5c7d36ba9b	BOM: interface cleanup and adding 'Clear All' button for filters	2014-04-10 15:29:09 +10:00
Rob H	645b6d5a8f	BOM: change datetimepickers to datepickers	2014-04-10 10:51:55 +10:00
Rob H	c5d5f5a9e6	BOM: view information about max quantities ordered	2014-04-10 10:33:57 +10:00
Will Marshall	fcb04481c4	Fixing a nil chain bug	2014-04-08 17:55:09 +10:00