179 Commits

Author	SHA1	Message	Date
Will Marshall	0f6bd7049c	Starting to build out producers Angular page	2014-04-30 12:52:47 +10:00
Will Marshall	4ca148ee93	Starting on the producers controller	2014-04-30 12:05:53 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Will Marshall	f9b7b602da	Moving from darkswarm to home	2014-04-24 16:53:00 +10:00
Rohan Mitchell	b649d6ef69	Authorise access to OrderCycles API	2014-04-24 13:20:16 +10:00
Rohan Mitchell	3c8757034a	Enterprise user can soft-delete a variant. BUT, only its own variants.	2014-04-24 13:20:16 +10:00
Rohan Mitchell	7931a2e8da	Test managed products API access for all user types	2014-04-24 13:20:16 +10:00
Rohan Mitchell	6c86254a90	Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user	2014-04-24 13:20:16 +10:00
Rohan Mitchell	95a6e34523	Spec access denied to regular user when soft-deleting variants	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e6d988ff34	Nest variant soft delete route under product resource	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e28a450875	Add API call to soft-delete a variant	2014-04-24 13:20:16 +10:00
Will Marshall	9bb0abbe48	Merge branch 'master' into darkswarm_home	2014-04-24 10:52:33 +10:00
Will Marshall	b4da348e36	Patching a json test	2014-04-23 16:58:38 +10:00
Will Marshall	0479a0a55d	Fixing bugs, improving dates	2014-04-23 15:46:14 +10:00
Will Marshall	16251fe5ea	Merging with master	2014-04-23 14:43:39 +10:00
Will Marshall	2981412540	Adding some specs, next order cycle, better CSS	2014-04-23 14:38:41 +10:00
Rob H	b37a701d39	Merge branch 'api_fixes' into bom	2014-04-23 12:03:01 +10:00
Will Marshall	99d743f7cf	Some very basic specs	2014-04-18 16:35:06 +10:00
Will Marshall	c6395a686a	Adding flash notifications	2014-04-17 15:08:01 +10:00
Rob H	83e3172901	Add accessible action to order_cycles controller for listing order_cycles by enterprises invloved	2014-04-16 18:27:50 +10:00
Rob H	2eb21a024c	Tiny fixes to API orders controller spec	2014-04-16 18:24:17 +10:00
Rob H	c68aeb4c36	Only show orders I am distributing in the API	2014-04-16 14:54:50 +10:00
Will Marshall	6e35dc7168	Merging with master	2014-04-11 13:09:22 +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	e64bfe8ba3	Fix failing API Orders spec	2014-04-10 16:26:24 +10:00
Will Marshall	873de1d118	Able to submit Checkout form via Ajax	2014-04-09 15:31:15 +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	09d22f74ec	Renaming some methods in our experimental	2014-04-09 11:51:12 +10:00
Will Marshall	12b1a1b0e9	Switching our recover password form to Darkswarm	2014-03-28 16:02:31 +11:00
Rob H	771ccc6e76	Merge branch 'capybara-fails' into bom	2014-03-28 13:52:17 +11:00
Rob H	ab14bf70ab	Merge branch 'bpe_issues' into bom	2014-03-27 15:39:37 +11:00
Will Marshall	e48a25983a	Starting a working forgot password system	2014-03-27 15:11:11 +11:00
Will Marshall	2be9ad7dd0	Starting with our own passwords controller	2014-03-27 13:52:02 +11:00
Rob H	cd1086ce05	WIP: Bulk calculation box work with shared resources	2014-03-26 16:44:26 +11:00
Rohan Mitchell	ec0191806a	Update specs to explicitly specify exchange direction	2014-03-26 12:17:49 +11:00
Will Marshall	40d1563cd9	Adding our own user registrations controller, reworking sidebar a touch	2014-03-21 15:18:27 +11:00
Will Marshall	74fb266748	Adding some requirement filters to the Orders controller	2014-03-21 15:18:27 +11:00
Rob H	cbd3722380	Merge branch 'master' into bom	2014-03-21 13:47:50 +11:00
Rob H	f2729f9e80	Add more columns to BOM	2014-03-21 13:46:48 +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	90159325bf	Patching a test	2014-03-18 17:38:33 +11:00
Will Marshall	49789c865e	No longer copying old ship address from pickup, adding phone to custom shipping address	2014-03-18 16:47:28 +11:00
Will Marshall	3b27690c7c	Fixing two dud specs	2014-03-14 19:25:34 +11:00
Will Marshall	dc95d764fe	Fixing some edge cases in the addresses	2014-03-14 11:56:25 +11:00
Will Marshall	3370865a01	Adding group siblings to the shop page	2014-03-13 14:50:06 +11:00
Rohan Mitchell	0d97397084	Fix fragile specs (ordering)	2014-03-12 15:00:20 +11:00
Will Marshall	40c986892e	Patching the paypal test	2014-03-07 15:18:26 +11:00
Will Marshall	df435c0a38	Adding Paypal plumbing	2014-03-07 15:10:20 +11:00