276 Commits

Author	SHA1	Message	Date
Will Marshall	9f169e6ef8	Adding a basic stub of the primary taxon	2014-05-16 10:23:31 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rohan Mitchell	4480c75494	Fix "undefined method 'association_class' for nil:NilClass" error when creating Migs payment gateway	2014-05-02 14:25:32 +10:00
Rohan Mitchell	c9aefa507a	Remove chili	2014-05-02 14:25:32 +10:00
Rob H	de369ae32b	WIP: Can manage taxons in BPE	2014-05-02 10:28:33 +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	4cbe434573	Remove trailing relations on destruction for EnterpriseFee and Variant	2014-04-24 13:20:15 +10:00
Rob H	b37a701d39	Merge branch 'api_fixes' into bom	2014-04-23 12:03:01 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Will Marshall	171c8c6ed1	Merging in with master	2014-04-16 16:16:15 +10:00
Rob H	2b283405e7	Only admin and users of distributors can access admin orders	2014-04-13 10:09:17 +10:00
Rohan Mitchell	8ad7cac639	Do not need to protect here, since we're clearing all unit option values earlier in this method	2014-04-11 19:08:55 +10:00
Rohan Mitchell	47ac097eb7	Do not show deleted variants on shopfront	2014-04-11 19:08:55 +10:00
Will Marshall	9cb56c61ae	Patching a bug in which carts get emptied	2014-04-11 17:32:39 +10:00
Will Marshall	2e0485c064	Getting the entire order into localStorage: one bug with radio boxes	2014-04-11 17:24:32 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Will Marshall	093004a460	Clearing the cart when order cycle is changed	2014-04-09 15:40:41 +10:00
Rohan Mitchell	a91ea933cc	Destroy adjustment metadata when adjustment is destroyed	2014-04-09 15:02:41 +10:00
Will Marshall	5c999fd9cf	Adding a signup confirmation email	2014-04-04 12:36:33 +13:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Rohan Mitchell	da6ba04780	Update variant weight from unit value when unit is weight	2014-03-28 15:34:26 +11:00
Rohan Mitchell	71273dfc7f	Refactor Product to use exchanges.incoming instead of sender/receiver roles	2014-03-26 16:36:09 +11:00
Rohan Mitchell	4aace221ea	Enterprise user can reorder product properties and update product images	2014-03-20 11:41:08 +11:00
Will Marshall	c6f1d43dbd	Reworking the shipping confirmation	2014-03-19 16:09:45 +11:00
Will Marshall	abf1b17fe9	Taking payment methods with no distributor out of circulation	2014-03-19 12:03:39 +11:00
Will Marshall	1ba720481f	Finally fixing the same as billing address checkbox?	2014-03-13 11:41:46 +11:00
Rohan Mitchell	356099a49a	When product unit changed, remove option types from master as well as other variants	2014-03-12 12:35:52 +11:00
Rohan Mitchell	68eaa61732	Enterprise user can delete product images	2014-03-12 12:35:51 +11:00
Will Marshall	57eb65f721	Adding an accessor for requires shipping address	2014-03-12 12:07:41 +11:00
Will Marshall	84955d3647	Merging master	2014-03-06 16:53:03 +11:00
Will Marshall	12f39ce511	Patching up some more address bugs	2014-03-06 16:46:56 +11:00
Will Marshall	cc3fb27490	Restoring the old checkout, but NOW our new checkout is broken	2014-03-06 16:16:00 +11:00
Will Marshall	56646ca5e3	Getting some form state into the Order	2014-03-06 10:26:51 +11:00
Rohan Mitchell	07caf99488	Enterprise user can delete product properties	2014-03-05 16:52:06 +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	17debd9fad	On product list view, do not show variants that are out of stock	2014-03-05 13:54:02 +11:00
Rohan Mitchell	8234812157	Do not include master when outputting variants for oc/d	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
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	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	11fb6c96a1	Charge per-order fees on orders exactly once	2014-02-26 14:34:30 +11:00
Rohan Mitchell	75c8da1774	Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees	2014-02-26 12:07:38 +11:00
Will Marshall	04ac6f466c	Forcing the class of Country	2014-02-21 15:15:06 +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
Rohan Mitchell	701896be95	BPE: Add variant and save it to server. Edit the saved variant.	2014-02-13 11:52:44 +11:00
Rohan Mitchell	4aa43cfbe0	Set the master unit value for a product without variants	2014-02-12 13:57:49 +11:00