170 Commits

Author	SHA1	Message	Date
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Will Marshall	28230f0436	Adding a current user service, refactoring various consequences of this change:	2014-04-25 16:59:46 +10:00
Will Marshall	dbf15c03d3	Refactoring how we change window.location	2014-04-25 12:13:50 +10:00
Will Marshall	22dc8cbfa0	Unbreaking karma karma lama	2014-04-25 12:04:15 +10:00
Rohan Mitchell	d16d970952	BPE uses soft-delete	2014-04-24 13:20:16 +10:00
Rob H	b37a701d39	Merge branch 'api_fixes' into bom	2014-04-23 12:03:01 +10:00
Rob H	2532248e6f	Fix failing javascript tests	2014-04-17 15:27:15 +10:00
Will Marshall	c6395a686a	Adding flash notifications	2014-04-17 15:08:01 +10:00
Will Marshall	2e0485c064	Getting the entire order into localStorage: one bug with radio boxes	2014-04-11 17:24:32 +10:00
Will Marshall	c8012e7045	Improving panel workflow, moving back to simple format for Order service	2014-04-11 16:43:21 +10:00
Will Marshall	6e35dc7168	Merging with master	2014-04-11 13:09:22 +10:00
Will Marshall	5f62cb7ddb	Working with ngForm and subcontrollers. Also fixing bulk order specs	2014-04-10 16:32:08 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Will Marshall	621e58f67a	First stab at a DRY implementation	2014-04-10 12:54:18 +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	36a4e34dff	Preprocessing order attributes, returning path	2014-04-09 15:04:17 +10:00
Will Marshall	b5550c048a	Starting on JSON checkout, moving Order properties to Order.order	2014-04-09 14:33:45 +10:00
Will Marshall	e641d2a788	Starting to add inline validation and behaviour to checkout	2014-04-08 18:09:03 +10:00
Will Marshall	8495c13063	Patching local storage; authentication actions	2014-04-08 18:09:02 +10:00
Will Marshall	a4cba99de6	Starting to rework checkout Login links	2014-04-08 18:09:02 +10:00
Will Marshall	8084262efe	Patching a test and removing our duped Angular libs	2014-04-08 18:09:02 +10:00
Will Marshall	5ac5b74f01	Setting up a Rake task for Jasmine/Karma	2014-04-08 18:09:02 +10:00
Will Marshall	195f62dba1	Basics in place, about to rework karma config	2014-04-08 18:09:02 +10:00
Rohan Mitchell	9687e8867e	Fix order cycle failing to save after a failing submit to server	2014-04-08 18:06:49 +10:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Rohan Mitchell	98d599e5f7	Fix order cycle failing to save after a failing submit to server	2014-04-02 11:38:59 +11:00
Will Marshall	e1465352d0	Improving the navigation by moving it all to a service, adding a generic icon	2014-03-28 16:02:31 +11:00
Rohan Mitchell	fddfdf8050	Select all supplied products on order cycle admin page	2014-03-28 15:34:26 +11:00
Rob H	ab14bf70ab	Merge branch 'bpe_issues' into bom	2014-03-27 15:39:37 +11:00
Rob H	0c2e215fef	BOM: Add a method to check that all selected variants have a unit_value	2014-03-27 14:11:19 +11:00
Rob H	a260a3fa56	BOM: Fixed bug causing Order Cycles filter to break in some cases	2014-03-27 13:32:26 +11:00
Will Marshall	17bb1f9d25	Getting the tests working once more	2014-03-27 13:01:05 +11:00
Will Marshall	0690fcda48	Reworking the way the Sidebar works	2014-03-27 11:54:25 +11:00
Rohan Mitchell	3104d285ca	Order cycle admin JS uses exchanges.incoming instead of role	2014-03-27 09:30:53 +11:00
Rob H	cd1086ce05	WIP: Bulk calculation box work with shared resources	2014-03-26 16:44:26 +11:00
Rob H	cbd3722380	Merge branch 'master' into bom	2014-03-21 13:47:50 +11:00
Rob H	7302d0552e	Fixing js specs	2014-03-21 13:11:04 +11:00
Will Marshall	dbc8e1bcf1	Reworking the tests for the new app	2014-03-20 16:58:57 +11:00
Rob H	ed0b7da20f	BOM page has a fancy calculation box for managing group buys	2014-03-20 14:40:24 +11:00
Will Marshall	fc4f108724	Adding tests and views to handle changing shipping prices	2014-03-14 12:59:37 +11:00
Rob H	c86cfe092f	BOM: Add bulk delete action	2014-03-14 09:37:28 +11:00
Rob H	9a291e28ec	Add bulk action checkboxes to BOM	2014-03-12 18:25:51 +11:00
Rohan Mitchell	4d8a23346c	Fix bug: Unselecting product variant unit in BPE doesn't save	2014-03-12 12:35:52 +11:00
Rob H	641796ed64	BOM: and quick search	2014-03-06 16:32:23 +11:00
Rob H	200e3fef77	Merge branch 'master' into bom	2014-03-06 12:52:36 +11:00
Rob H	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00
Rohan Mitchell	922d817748	Product list view: For product with variants, show product price as min(variant prices)	2014-03-05 16:16:42 +11:00
Rob H	9f19e91e90	Merge branch 'master' into bom	2014-03-05 10:15:39 +11:00
Rob H	2a713245a8	BOM: date filter refactor and works with pending changes	2014-03-05 10:14:35 +11:00