3834 Commits

Author	SHA1	Message	Date
Will Marshall	6e622ffb37	Changing the logo to go back to the home page	2014-01-17 16:36:28 +11:00
Will Marshall	1e88c0a6f1	Adding max quantity for group buy to ze form	2014-01-17 16:32:32 +11:00
Will Marshall	f7f4fbf503	Displaying prices better	2014-01-17 16:32:32 +11:00
Rohan Mitchell	87cf596a30	For a product with one or more on_demand variants, don't show 'On demand' at the product level	2014-01-17 16:12:07 +11:00
Rohan Mitchell	4518e30849	Display infinite on_hand as read-only	2014-01-17 16:12:07 +11:00
Rohan Mitchell	ea028ddd01	Fix invalid JSON for on_demand products/variants with infinite on_hand	2014-01-17 16:12:07 +11:00
Rob H	15c0350c29	Add product name as proxy for variant_unit_text to Order Managment API	2014-01-17 12:09:31 +08:00
Will Marshall	f5777bc7a1	Making our form on_demand and count_on_hand aware	2014-01-17 15:07:43 +11:00
Rob H	cfbf4d5bc4	Adding attributes to Order Managment API	2014-01-17 10:35:40 +08:00
Will Marshall	6f5ff0ab2c	Making a light grey option	2014-01-16 16:49:50 +11:00
Will Marshall	939b216c12	Changing text to N/A	2014-01-16 16:31:46 +11:00
Will Marshall	dac287f67a	Removing distributors and farmers, curse them	2014-01-16 16:28:10 +11:00
Will Marshall	b6d796e3bc	Getting in ze test for previous commit	2014-01-16 16:25:41 +11:00
Rob H	4e9ae7549e	Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page	2014-01-16 13:20:07 +08:00
Will Marshall	d68551c6eb	Patching an issue with quantity fields showing for products with variants	2014-01-16 16:09:03 +11:00
Will Marshall	0ddef9626e	First working image upload for enterprise logos	2014-01-16 15:47:38 +11:00
Rob H	11499178cb	Set up API for Bulk Order Management (BOM)	2014-01-16 11:56:11 +08:00
Rob H	ee2da3e008	Toggle new view controls on BPE	2014-01-10 00:26:54 +08:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Will Marshall	533a987684	Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom	2014-01-08 15:20:33 +11:00
Rohan Mitchell	eda4f241e2	Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests	2014-01-08 11:39:05 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Will Marshall	8e0a7d9072	Pretties, fixing the email validation issue with admin authentication steps	2014-01-07 11:04:40 +11:00
Will Marshall	9677ec7159	Starting to build mixins	2014-01-06 16:27:41 +11:00
Will Marshall	dd1b3311d7	Removing all the old order populator stuff	2014-01-06 15:23:21 +11:00
Rob H	49b9b8f635	Add messages to BPE interface for cases when 0 or > 500 products are found	2014-01-05 19:17:50 +08:00
Rob H	2e56d7a551	Can remove filters from BPE	2014-01-05 17:53:32 +08:00
Rob H	6445275530	Basic layout changes for BPE page	2014-01-05 00:37:36 +08:00
Rob H	a6d7044dfd	WIP: Adding basic UI for applying hard filtering to BPE	2014-01-04 19:21:10 +08:00
Rob H	687332d2b0	Add loading splash to BPE	2014-01-04 15:50:26 +08:00
Rob H	c6222f2180	BPE pagination works with filtering	2014-01-02 15:22:10 +08:00
Rob H	2df0545819	Fix some outstanding updating issues in BPE	2013-12-23 23:09:19 +08:00
Rob H	ffbfbffb28	WIP: Add basic page nav controls to BPE	2013-12-23 09:22:31 +08:00
Rob H	06995bd3c6	Add controls to alter the number of products displayed for BPE	2013-12-22 17:31:27 +08:00
Rob H	530d38c7d0	Add basic pagination informaion to BPE	2013-12-22 16:58:48 +08:00
Will Marshall	49c2cc3696	Getting in the tab navigation	2013-12-20 14:23:14 +11:00
Will Marshall	0db7eae7f8	Getting images working	2013-12-20 11:49:08 +11:00
Will Marshall	985cebb44a	Massaging the form to push orders to the cart: some refactoring still required	2013-12-19 15:51:51 +11:00
Will Marshall	1048bab303	Patching up some edge cases	2013-12-19 14:20:16 +11:00
Will Marshall	b3a4d826b8	Dumping OrderCycle data via :javascript tags instead of ng-init, Angularising the selector stuff	2013-12-18 17:05:47 +11:00
Will Marshall	6d124b3275	Failing tests, forcing the orders close text to change	2013-12-18 16:12:06 +11:00
Will Marshall	21d99c8e56	Directing our form to the order populator	2013-12-18 15:17:08 +11:00
Will Marshall	4b7605212e	Adding text trunctation in Angular	2013-12-18 14:45:32 +11:00
Will Marshall	adbfdafff3	Lots of styling improvements	2013-12-18 13:13:58 +11:00
Will Marshall	a3dfe1b147	Working on the HTML structure, variants etc	2013-12-18 12:26:34 +11:00
Will Marshall	e23b33ab48	Adding variants display	2013-12-18 11:35:25 +11:00
Will Marshall	f146610a93	Fixing a recursion bug in Angular	2013-12-17 15:52:21 +11:00
Will Marshall	7ea9cf6862	Adding price to serializer	2013-12-17 15:45:06 +11:00
Will Marshall	67fcf0f534	Fixing up the feature specs	2013-12-17 15:26:49 +11:00
Will Marshall	c4c5f3a8c7	Merging from master	2013-12-17 14:18:21 +11:00