58 Commits

Author	SHA1	Message	Date
Rohan Mitchell	ec0191806a	Update specs to explicitly specify exchange direction	2014-03-26 12:17:49 +11:00
Rob H	ea3bd86318	Make enterprise factory get it own address	2014-03-07 12:14:09 +11:00
Rohan Mitchell	0bae3e58b8	Add product units and amount fields to product and variant models, add validations	2013-12-05 15:16:51 +11:00
Rohan Mitchell	e78815c2d3	Create models for EnterpriseGroups	2013-10-30 10:42:32 +11:00
Rohan Mitchell	761bafe375	Rename text labeling from open food web to open food network	2013-10-18 17:46:05 +11:00
Rohan Mitchell	57f7d489ff	Rename OpenFoodWeb namespace to OpenFoodNetwork	2013-10-18 17:29:55 +11:00
Rohan Mitchell	93cb845ee2	DB and model changes to make ShippingMethod distributor habtm	2013-10-17 11:15:43 +11:00
David Cook	4f9c7fb601	Remove distributor_id from payment method and update tests	2013-09-13 16:58:19 +10:00
Rohan Mitchell	911d8b8bbc	Shipping method has a distributor, admin can create and edit	2013-08-30 11:43:45 +10:00
David Cook	b2878ddc40	Payment Method must belong to a Distributor	2013-08-21 15:14:01 +10:00
Rohan Mitchell	fb33b853dd	Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5	2013-08-20 10:47:56 +10:00
David Cook	5f7cbe3882	Ensure distributor is set on payment method factories	2013-08-19 16:19:18 +10:00
Rohan Mitchell	a9b70e67df	Change to using flat rate per item calculators - per-order is confusing when used against line items	2013-08-19 14:38:51 +10:00
Rohan Mitchell	6c24c0ef68	Make specs more resilient and less context-sensitive	2013-08-19 11:10:00 +10:00
Rohan Mitchell	80d6e3b87f	Do not charge for distributor fees for a distributor you're not checking out with	2013-08-19 10:41:14 +10:00
Rohan Mitchell	290607b5bf	CrUD for order cycle exchange fees	2013-08-16 10:22:29 +10:00
Rohan Mitchell	b5d324ec8c	Drop itemwise shipping method use in tests	2013-08-13 09:11:25 +10:00
Rohan Mitchell	f1485bf9c5	Remove shipping method from product distribution in factory.	2013-08-12 14:21:39 +10:00
Rohan Mitchell	af6b16ecc4	Admin can assign enterprise fees to product distributions	2013-08-12 11:05:00 +10:00
Rohan Mitchell	149d48ff5a	Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation	2013-08-12 10:00:35 +10:00
Rohan Mitchell	a338c974f8	Create line item adjustments for product distributions	2013-08-09 15:27:52 +10:00
Rohan Mitchell	8fdf0b6ff9	Fix payment not being captured due to being to small to cover order's distribution fee	2013-08-06 13:47:17 +10:00
Rohan Mitchell	ec3e00c128	Refactor LineItem and clients for new fields	2013-08-06 13:47:17 +10:00
Rohan Mitchell	43474d6408	Display coordinator fees on admin edit order cycle	2013-07-30 11:34:10 +10:00
Rohan Mitchell	2f83cecc23	Merge branch 'add-capture-order-shortcut-deface' ... Conflicts: spec/support/request/authentication_workflow.rb	2013-07-23 16:55:33 +10:00
Rohan Mitchell	d83e8cb3ba	Remove commented out code, clean up comments and style	2013-07-23 16:51:22 +10:00
David Cook	0ad7cde198	Add factory for an order with items and valid distributor	2013-07-12 16:42:33 +10:00
Rohan Mitchell	ebf1c8602f	Write new query for Product#in_distributor that queries order cycles instead of product_distributions	2013-03-08 15:18:52 +11:00
Rohan Mitchell	624a2799aa	Create order cycles where needed by tests	2013-03-08 15:18:52 +11:00
Rohan Mitchell	662aaf75bf	When editing an order cycle, distributor collection details are loaded	2013-01-22 09:34:07 +11:00
Rohan Mitchell	31ea8540ea	Test editing an order cycle - all data is displayed	2013-01-10 15:02:56 +11:00
Rohan Mitchell	cfa96c7615	Each order cycle may not have duplicate exchanges between the same enterprises	2012-11-30 16:37:29 +11:00
Rohan Mitchell	47c28e65a7	Add detailed order cycle factory, add methods to report on order cycle suppliers, distributors and products/variants exchanged	2012-11-27 10:09:40 +11:00
Rohan Mitchell	6b97872a25	Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants	2012-11-26 11:03:44 +11:00
Rohan Mitchell	98143ffe5b	Add calculator to EnterpriseFee, test passes for listing enterprise fees	2012-11-16 16:07:40 +11:00
Rohan Mitchell	6247bd2541	Display admin table of enterprise fees with enterprise, fee type and name columns	2012-11-15 15:03:12 +11:00
Rohan Mitchell	192d4993a1	Add EnterpriseFee model	2012-11-15 13:42:55 +11:00
Rohan Mitchell	c2133d70ac	Rename Enterprise is_supplier scope to is_primary_producer	2012-11-01 15:02:57 +11:00
Rohan Mitchell	34588e6141	Remove old supplier and distributor routes, models, controllers, views, specs	2012-11-01 09:55:45 +11:00
Rohan Mitchell	4c2debba7e	Model specs pass	2012-10-28 18:00:15 +11:00
Rohan Mitchell	abe3feb996	Integrate functionality from distributor into enterprise	2012-10-28 17:46:45 +11:00
Rohan Mitchell	c700d9e71b	Create enterprise model, integrate functionality from supplier	2012-10-28 13:24:26 +11:00
Rohan Mitchell	c46019d68c	WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace	2012-10-25 10:45:39 +11:00
Rohan Mitchell	3dd3d8030f	Display CMS pages in menu	2012-10-11 17:00:34 +11:00
Rohan Mitchell	cab61ddb7c	CMS content on home page	2012-10-11 16:21:33 +11:00
Rohan Mitchell	a686a820d9	Add distributor show page, redirect here after selecting distributor	2012-10-11 10:50:36 +11:00
Rohan Mitchell	0b830a7845	Suppliers and distributors long description editable with WYSIWYG editor from CMS and displayed as HTML	2012-10-11 10:50:36 +11:00
Rohan Mitchell	a1b5102476	Fix checkout totals, also amend factories for valid test shipping method data	2012-09-21 12:35:01 +10:00
Rohan Mitchell	eaca160367	Set line item shipping method when added to cart, update specs for changes to line item shipping method	2012-09-19 15:01:50 +10:00
Rohan Mitchell	3794c00856	Upgrade Rails to 3.2.8 and Spree to 1.1.3	2012-09-14 10:20:52 +10:00