300 Commits

Author	SHA1	Message	Date
Will Marshall	7a062b0310	Reworking the variant display of units and names	2014-06-12 16:13:51 +10:00
Rob H	9f681bd1ef	Use display_as as option value for variant when it is present	2014-06-12 12:57:56 +10:00
Rob H	1a91b5a728	Move option value naming logic into separate lib class	2014-06-12 12:55:53 +10:00
Rob H	f688461e84	Add fields for variant display name and display as to bpe	2014-06-12 11:49:53 +10:00
Rob H	2c78d537fa	Use display_as as option value for variant when it is present	2014-06-12 11:49:52 +10:00
Rob H	e9f2a8f2cd	Move option value naming logic into separate lib class	2014-06-12 11:49:52 +10:00
Will Marshall	4d7fa8b1bf	Removing payments when emptying order	2014-06-10 11:15:04 +10:00
Will Marshall	37f197205f	Removing shipping method from order when emptied	2014-06-06 16:39:53 +10:00
Rohan Mitchell	1d44cbf506	Show distribution charge on report	2014-06-06 09:47:16 +10:00
Rohan Mitchell	f8fa014796	LineItem.supplied_by_any	2014-06-06 09:47:15 +10:00
Rohan Mitchell	60711301c1	Initialise primary taxon in migration instead of in model callback	2014-06-03 11:29:54 +10:00
Rob H	f97ef0838c	Rollback variant_unit_change check, auto-set primary taxons where they exist	2014-05-30 19:20:15 +10:00
Rob H	bf4d83aecc	Fix master options_text display on front end	2014-05-30 18:39:41 +10:00
Rob H	66d6de9dfc	Merge master (with primary taxons restored)	2014-05-30 15:45:48 +10:00
Rob H	69376e7f4b	Merge in master	2014-05-30 15:10:13 +10:00
Will Marshall	1c31ac56ea	Adding primary taxon field to product ... Conflicts: db/migrate/20140522044009_add_primary_taxon_to_products.rb	2014-05-30 14:31:03 +10:00
Rob H	d9f7865572	Can add an image from redesigned new product page	2014-05-30 11:31:53 +10:00
Rohan Mitchell	e951f80070	Merge branch 'new-product-form' ... Conflicts: app/assets/javascripts/admin/admin.js.coffee	2014-05-24 17:14:32 +10:00
Rohan Mitchell	acbe49b8de	Revert primary taxons	2014-05-24 17:13:01 +10:00
Will Marshall	17f09d1852	Adding primary taxon field to product	2014-05-24 09:29:19 +10:00
Rohan Mitchell	ad1f852bdd	Revert "Adding primary taxon field to product" ... This reverts commit fd1e7ebaa3.	2014-05-24 09:07:57 +10:00
Will Marshall	fd1e7ebaa3	Adding primary taxon field to product	2014-05-23 15:59:06 +10:00
Rob H	ed3c23cd90	Split 'My Enterprises' dashboard item into Hubs and Producers	2014-05-22 15:28:25 +10:00
Rohan Mitchell	f6bc1a82be	Enterprise user can manage enterprise relationships	2014-05-22 10:54:51 +10:00
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