143 Commits

Author	SHA1	Message	Date
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
Will Marshall	5790392430	Bypassing the stage check on the Paypal callbacks	2014-03-07 14:10:49 +11:00
Will Marshall	e5cea07d9e	Splitting out shopping spec, starting on Paypal plumbing	2014-03-07 13:18:53 +11:00
Will Marshall	d00ade8137	Splitting out shopping spec, starting on Paypal plumbing	2014-03-07 13:18:30 +11:00
Rob H	b6bd07abd3	BOM: show name from billing address	2014-03-07 12:56:39 +11:00
Will Marshall	84955d3647	Merging master	2014-03-06 16:53:03 +11:00
Will Marshall	cc3fb27490	Restoring the old checkout, but NOW our new checkout is broken	2014-03-06 16:16:00 +11:00
Rob H	43a4a3dd5a	Alter on_hand counts for products to fix broken specs	2014-03-06 13:14:06 +11:00
Rob H	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00
Rob H	1635e7338e	Add ditributors and suppliers to OC show API	2014-03-05 12:17:08 +11:00
Rob H	fc65eefcfd	Add basic order cycle API	2014-03-05 12:00:26 +11:00
Will Marshall	b6b5c2889e	Reworking checkout to use f_form_for, show validation, better controller layout	2014-02-21 14:31:03 +11:00
Will Marshall	5c498735b0	Moving from new to edit	2014-02-14 14:26:31 +11:00
Will Marshall	b11533a629	Renaming ShopController to Shop::ShopController	2014-02-07 16:52:18 +11:00
Will Marshall	7af1d72ef9	Working login and signup forms for checkout, specs, redirect back to checkout on success	2014-02-07 16:07:18 +11:00
Will Marshall	cec0ad8a83	Adding ze boilerplate	2014-02-07 13:55:25 +11:00
Will Marshall	f3edd15fa7	Switching to using new prices on shop page	2014-02-05 14:57:24 +11:00
Will Marshall	e5c90e80f5	Adding sorting	2014-02-04 14:44:32 +11:00
Rob H	9373dcea3d	Merge branch 'master' into bom	2014-01-31 12:32:23 +08:00
Will Marshall	60bf431008	Stripping HTML from description, since we seem to occasionally get some	2014-01-22 11:55:57 +11:00
Rob H	1744cc9548	Orders API retrieves order number	2014-01-19 18:41:16 +08:00
Rob H	e2d9e9c4eb	BOM API collects distributor for orders	2014-01-18 11:50:36 +08:00
Rob H	3f5930032b	Add more detailed tests for output of orders API	2014-01-18 11:35:47 +08: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	ef00927885	Adding a nice little JSON/controller test	2014-01-17 14:48:38 +11:00
Rob H	cfbf4d5bc4	Adding attributes to Order Managment API	2014-01-17 10:35:40 +08:00
Rob H	11499178cb	Set up API for Bulk Order Management (BOM)	2014-01-16 11:56:11 +08:00
Will Marshall	cdd64d438a	Adding another trivial sort to a test	2014-01-16 13:23:57 +11:00
Rohan Mitchell	c08c42b087	Fix inconsistent test fails - insignificant ordering	2014-01-08 15:11:46 +11:00
Rohan Mitchell	c42d741d3d	Remove browse product specs for removed feature	2014-01-08 14:41:06 +11:00
Rohan Mitchell	4a74c2624c	Remove specs for removed features	2014-01-08 14:15:06 +11:00
Rohan Mitchell	4f7fdd430f	Update failing controller spec - order needs distributor set	2014-01-08 11:58:53 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Will Marshall	dd1b3311d7	Removing all the old order populator stuff	2014-01-06 15:23:21 +11:00
Will Marshall	49c2cc3696	Getting in the tab navigation	2013-12-20 14:23:14 +11:00
Will Marshall	751e98443f	Removing LOADS of code	2013-12-19 16:47:27 +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