370 Commits

Author	SHA1	Message	Date
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
Rohan Mitchell	638e922ae2	Do not allow customer to purchase the obsolete master of a product	2014-03-20 10:56:46 +11:00
Will Marshall	51b6ac3e68	Fixing one regression bug	2014-03-18 17:03:09 +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	0cc108206b	Reworking the top details so it works in all pages	2014-03-14 17:06:03 +11:00
Will Marshall	a954f2c21a	Basic Darkswarm version of the Order Confirmation page	2014-03-14 16:11:40 +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
Will Marshall	9c655a855e	Redirecting to the shop page when a distributor is selected	2014-03-13 11:47:55 +11:00
Will Marshall	451e76b33f	Tweaking our paypal express plumbing further	2014-03-07 15:27:52 +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	84955d3647	Merging master	2014-03-06 16:53:03 +11:00
Will Marshall	d677116ea3	Overring before_address to conform to our new checkout as necessary	2014-03-06 16:24:08 +11:00
Rob H	200e3fef77	Merge branch 'master' into bom	2014-03-06 12:52:36 +11:00
Rohan Mitchell	637ccc113b	Do not show products that have no stock available to the current distribution	2014-03-05 13:54:02 +11:00
Rohan Mitchell	ec6f70c145	On product list view, only show variants that are a member of the current order cycle	2014-03-05 13:54:02 +11:00
Rob H	fc65eefcfd	Add basic order cycle API	2014-03-05 12:00:26 +11:00
Will Marshall	b5019f12b4	Fixing up a couple of bugs introduced to the old step workflow	2014-03-04 15:07:00 +11:00
Will Marshall	1d5addb06e	Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses	2014-02-28 13:41:02 +11:00
Will Marshall	86a8b926f3	Adding conditions to the autopopulator for shipping address	2014-02-28 11:53:45 +11:00
Will Marshall	3db601f362	Merge branch 'master' into checkout	2014-02-27 16:29:21 +11:00
Will Marshall	d6c71d5416	Fixing a nil bug in the referrer handling on login	2014-02-27 16:24:10 +11:00
Will Marshall	19fa7200f3	Fixing the login redirection issue	2014-02-27 14:47:56 +11:00
Rohan Mitchell	353d2a4d9c	Do not error when creating variant for product without non-unit option type	2014-02-27 11:28:07 +11:00
Will Marshall	85606b2a0d	Merge branch 'master' into checkout	2014-02-27 10:41:39 +11:00
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +11:00
Rohan Mitchell	adf4c0e387	Sort enterprises by name on enterprise fees admin page	2014-02-26 15:38:41 +11:00
Will Marshall	f5a3167fac	Patching up the form and update to get form submission working	2014-02-26 15:12:35 +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
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Will Marshall	adb58bc059	Moving from @order to current_order to keep DRY	2014-02-18 15:07:00 +11:00
Will Marshall	5c498735b0	Moving from new to edit	2014-02-14 14:26:31 +11:00
Will Marshall	2425de8c98	Basic form implementation	2014-02-13 11:40:52 +11:00
Will Marshall	871637c4af	NO CAN HAZ EMPTY CART PAGE	2014-02-12 12:31:37 +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	26e4adf7a6	Adding the routes, controller, new action and some tests	2014-02-07 13:53:36 +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
Rob H	00dfa62f43	Basic listing of orders on BOM page	2014-01-17 14:56:26 +08:00
Will Marshall	9624a3919a	Patching a bug in shop controller	2014-01-17 15:13:48 +11:00
Will Marshall	b6590000a4	Improving Product's has_stock, filtering Shop#products to in_stock products	2014-01-17 14:41:15 +11:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Rohan Mitchell	ef56574d82	Pass quantity to OrderPopulator	2014-01-08 11:37:38 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Rob H	177782fac5	Status message works when updating products with filters applied	2014-01-06 18:20:00 +08:00