346 Commits

Author	SHA1	Message	Date
Will Marshall	f8d51c3105	Fixing intermittent spec failure	2014-06-26 15:43:33 +10:00
Will Marshall	9eb43e6c09	Removing visible scopes from enteprise distributors and producers	2014-06-26 15:26:15 +10:00
Will Marshall	1ed634239d	Major refactoring	2014-06-20 16:31:49 +10:00
Rohan Mitchell	4eee7d4901	Enterprise user can manage their enterprises' producer properties	2014-06-18 16:04:41 +10:00
Rohan Mitchell	92e3546a76	Retrieve properties for a product as a hash	2014-06-18 15:22:03 +10:00
Rohan Mitchell	0139c4bda2	Set producer property	2014-06-18 15:22:03 +10:00
Will Marshall	f7c71568df	Merge branch 'laura_and_will' ... Conflicts: app/models/spree/variant_decorator.rb db/schema.rb spec/models/spree/product_spec.rb spec/models/spree/variant_spec.rb	2014-06-13 12:42:14 +10:00
Will Marshall	7a062b0310	Reworking the variant display of units and names	2014-06-12 16:13:51 +10:00
Rohan Mitchell	836a08606c	Product and variant deletion removes the product or variant from any order cycles	2014-06-12 14:59:27 +10:00
Rohan Mitchell	083220089f	WIP: Delete ExchangeVariants when product is soft-deleted	2014-06-12 14:59:27 +10:00
Rohan Mitchell	e6c7acdff3	Add soft-delete method to variant	2014-06-12 14:59:26 +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	c09aeeee8f	Recalculate option values on variants when product variant unit is changed	2014-06-12 12:11:20 +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
Rob H	8e960c817a	Merge branch 'master' into units	2014-06-11 12:43:40 +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
Rob H	3240a4e08e	Use display_as as option value for variant when it is present	2014-06-04 17:23:11 +10:00
Will Marshall	df7ee03cbf	Adding presenters to the social media fields	2014-06-04 17:13:18 +10:00
Rob H	8d87cfbc35	Move option value naming logic into separate lib class	2014-06-04 14:54:42 +10:00
Rob H	bcfa1a8266	Fix spec to check validation of missing primary_taxon correctly	2014-05-30 20:06:40 +10:00
Rohan Mitchell	15d8299efb	Fix enterprises spec - primary taxons change	2014-05-30 15:28:53 +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
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
Rohan Mitchell	e6461ba01e	Fix enterprises spec - primary taxons change	2014-05-24 10:34:22 +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
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Rob H	ed3c23cd90	Split 'My Enterprises' dashboard item into Hubs and Producers	2014-05-22 15:28:25 +10:00
Rohan Mitchell	d7b4318aff	Find enterprise relationships involving any of a number of enterprises	2014-05-22 11:25:37 +10:00
Rohan Mitchell	f6bc1a82be	Enterprise user can manage enterprise relationships	2014-05-22 10:54:51 +10:00
Rohan Mitchell	1a854b89ec	Sort enterprise relationships by enterprise name	2014-05-21 11:29:11 +10:00
Rohan Mitchell	4f1b8d06e7	Construct enterprise relationships with a factory	2014-05-21 11:29:11 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
Will Marshall	9f169e6ef8	Adding a basic stub of the primary taxon	2014-05-16 10:23:31 +10:00
Will Marshall	eae12da24a	Adding distributors display to producers page	2014-05-15 12:20:17 +10:00
Will Marshall	575ce9fe01	Adding producers to home and distributors to producers	2014-05-15 12:02:58 +10:00
Rohan Mitchell	6c5172c567	Add EnterpriseRelationship. An Enterprise can find its relatives.	2014-05-14 15:50:25 +10:00
Will Marshall	f68a637609	Renaming Enterprise.active to Enterprise.visible	2014-04-30 12:09:22 +10:00
Will Marshall	563976c084	Adding an active scope and test to Enterprise	2014-04-30 12:02:11 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Rohan Mitchell	91d9b546d2	Merge branch 'foreign-keys'	2014-04-25 16:06:54 +10:00
Will Marshall	cf67b5fcac	Adding a taxon collection mechanism to Enterprise	2014-04-25 12:45:03 +10:00
Rohan Mitchell	85db8859bb	On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage	2014-04-24 15:51:39 +10:00