424 Commits

Author	SHA1	Message	Date
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
Rob H	9922dc6e79	Replace pagination with infinite scroll on BPE	2014-08-08 14:05:51 +10:00
Rob H	1abbc7fa86	Switch data injection for BPE over to AMS	2014-08-08 14:05:50 +10:00
Rohan Mitchell	e28e86a82c	Remove link from cart to old product page	2014-08-07 16:46:57 +10:00
summerscope	6515f0f096	Tweak labels to make page heading more consistent, give useful names to SHopping cart and Checkout pages	2014-08-06 13:34:06 +10:00
summerscope	d48b317d3b	Checkout page header update	2014-08-06 13:25:06 +10:00
Rohan Mitchell	5c5e7e8ed3	Hide checkout paypal button, remove unneeded frontend JS	2014-07-25 12:44:14 +10:00
Rohan Mitchell	3dd7b296be	Show order notes (special instructions) on report and confirmation email	2014-07-24 15:13:23 +10:00
Rob H	177472dad9	Add asterix to product category on new product form	2014-07-24 12:58:42 +10:00
Rob H	fa48fa24b5	Restricting links in hubs sidebar to left hand side of row	2014-07-24 11:41:47 +10:00
Rob H	3da2461af5	Require shipping methods to have at least one distributor	2014-07-04 14:05:44 +10:00
Rob H	29fde37ba3	Merge branch 'bug-herd' into working	2014-07-03 14:24:39 +10:00
Rohan Mitchell	aa5767cd30	Remove paypal image button from checkout, fix redirect to paypal	2014-06-27 11:52:36 +10:00
Rob H	083fda0ad0	Set columns on BPE error messages	2014-06-27 10:46:54 +10:00
Rob H	934f960336	Add display as to new product page	2014-06-26 15:27:24 +10:00
Will Marshall	b1f275dac8	Adding enterprises to cart to prevent errors being thrown	2014-06-25 14:38:16 +10:00
Will Marshall	b3f0cb1e74	Bunch of minor bugfixes	2014-06-24 17:14:01 +10:00
Will Marshall	1ed634239d	Major refactoring	2014-06-20 16:31:49 +10:00
Rob H	1a0a8ec160	Merge branch 'master' into working	2014-06-20 13:54:52 +10:00
Will Marshall	8bb5f75ea0	Temporary fix to get staging working	2014-06-20 13:51:21 +10:00
Rob H	a668a4fd55	Further tidy-up for order confirmation email	2014-06-20 12:21:33 +10:00
Rob H	2861191ab7	Merge branch 'sm-desc' into working	2014-06-20 09:43:58 +10:00
Rob H	bd13b2b3fc	Add shipping method description to confirmation email, cleanup	2014-06-19 17:52:25 +10:00
Will Marshall	ce1732db27	Adding taxon preview (big) to the admin UI	2014-06-19 14:18:52 +10:00
Will Marshall	5d71af7687	fixing issue 750	2014-06-19 12:10:26 +10:00
Rob H	004548a4fe	Rearrange shipping method edit page	2014-06-18 10:21:21 +10:00
Rob H	8412d740ff	Move distributors into sidebar for new & edit shipping methods screen	2014-06-12 16:10:30 +10:00
Rohan Mitchell	a6e3dd65fe	WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times	2014-06-11 20:39:34 +10:00
Rob H	8e960c817a	Merge branch 'master' into units	2014-06-11 12:43:40 +10:00
Rob H	44f4ee822c	Move dynamic placeholder logic to directive so that it can be used for master variants too	2014-06-11 12:41:51 +10:00
Rohan Mitchell	12809438ac	Orders and fulfilment report handles order cycles with nil opening or closing times	2014-06-11 10:33:59 +10:00
Rob H	6e04eeba07	Adding dynamic text to display as placeholder	2014-06-06 15:43:05 +10:00
Will Marshall	2545b06b2d	Adding first and last name read-only fields to credit card	2014-06-06 14:28:33 +10:00
Rob H	43c5c37326	Add fields for variant display name and display as to bpe	2014-06-06 10:10:41 +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	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