2668 Commits

Author	SHA1	Message	Date
Rohan Mitchell	1de0f85c73	Fix test fail	2013-09-09 10:41:28 +10:00
Rohan Mitchell	d32a8b56d0	When order cycle is selected, only show variants that are in it	2013-09-09 10:40:15 +10:00
alexs333	80bb55496b	Temporarily disabling some tests.	2013-09-05 14:18:40 +10:00
alexs333	999bc2697a	Implemented simlified shop flow.	2013-09-04 20:33:18 +10:00
David Cook	25b25b7681	New scope Order.not_state to filter out cancelled orders from reports	2013-08-30 17:07:17 +10:00
David Cook	bf3c5c6dd6	Merge branch 'master' into reports-completed-only ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2013-08-30 16:42:00 +10:00
Rohan Mitchell	cace60b187	Shipping methods are only shown at checkout if their distributor matches the order	2013-08-30 12:27:13 +10:00
Rohan Mitchell	911d8b8bbc	Shipping method has a distributor, admin can create and edit	2013-08-30 11:43:45 +10:00
Rohan Mitchell	9824e1b9c5	Make spec more precise and robust - query was finding outgoing instead of incoming exchange	2013-08-27 10:41:02 +10:00
Rohan Mitchell	6a5d819fa6	Enterprise manager can create an order	2013-08-27 10:05:55 +10:00
Rohan Mitchell	8a092697ee	Enterprise manager can clone an order cycle	2013-08-22 17:11:53 +10:00
Rohan Mitchell	f1fa90d7c3	Clone order cycles	2013-08-22 16:53:11 +10:00
Rohan Mitchell	f870e70560	Enterprise manager can edit and bulk edit enterprises they have access to	2013-08-22 11:40:33 +10:00
Rohan Mitchell	aab7176f2c	Enterprise manager can bulk edit products	2013-08-22 11:21:49 +10:00
Rohan Mitchell	31a078a53c	Enterprise manager can access enterprise fees for enterprises they manage - fixes fees on order cycles interface	2013-08-20 16:26:46 +10:00
Rohan Mitchell	562365311e	Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks	2013-08-19 14:38:51 +10:00
Rohan Mitchell	ba4d3d5d7d	Removing a product from cart removes its fees	2013-08-19 12:19:03 +10:00
Rohan Mitchell	7a75898b2b	Find exchanges going to/from any number of enterprises	2013-08-19 10:41:14 +10:00
Rohan Mitchell	e15e9a1476	Charge order cycle fees	2013-08-19 10:41:14 +10:00
Rohan Mitchell	dfd1a89975	Test whether exchanges are incoming	2013-08-19 10:41:14 +10:00
Rohan Mitchell	9563aad9fa	Find exchanges with a particular variant	2013-08-19 10:41:14 +10:00
Rohan Mitchell	1d23446c40	ProductDistribution validates_presence_of enterprise fee, check no longer required	2013-08-19 10:41:14 +10:00
Rohan Mitchell	591f6a8a57	Move ProductDistribution#clear_all_enterprise_fee_adjustments_for to EnterpriseFee class	2013-08-19 10:41:14 +10:00
Andrew Spinks	38522e2b74	Fix order cycle permissions for enterprise user.	2013-08-18 19:41:04 +10:00
Andrew Spinks	82726d032c	Add enterprise roles for order cycles.	2013-08-16 11:34:07 +10:00
Rohan Mitchell	552cecb2e0	Find incoming and outgoing exchanges	2013-08-16 10:22:29 +10:00
alexs	b8bc30d4ab	Fixed the test setup and added the text for the bug found in 'Enterprise.find_near'.	2013-08-15 17:34:51 +10:00
Andrew Spinks	9c6c4724be	Ensure line items only get created in correct orders when adding a product to a cart.	2013-08-14 10:49:55 +10:00
Andrew Spinks	d5791657f3	Support multiple orders when adding a product to a cart.	2013-08-14 10:49:55 +10:00
Andrew Spinks	dd3aaccf9f	When adding a variant to a cart, split into multiple orders depending on the distributors that it contains.	2013-08-14 10:49:55 +10:00
alexs	e90ccef337	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-13 11:40:54 +10:00
Rohan Mitchell	5f4313b588	Remove itemwise shipping calculator	2013-08-13 10:14:39 +10:00
Rohan Mitchell	7677f79f17	Remove the now-unused Product#shipping_method_for_distributor	2013-08-13 09:11:26 +10:00
Rohan Mitchell	94e49d4190	Remove line item specs for removed functionality	2013-08-13 09:11:26 +10:00
Rohan Mitchell	9aad44f093	Strip shipping method mechanics out of LineItem and Order	2013-08-13 09:11:25 +10:00
alexs	03b36bb14b	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-12 17:35:36 +10:00
alexs	f2f507c5c7	Suburb auto-complete functionality for the new landing page.	2013-08-12 17:34:56 +10:00
David Cook	c915bb91cf	More tests for distributor enterprise user roles	2013-08-12 14:44:26 +10:00
Rohan Mitchell	14268b7be0	Create adjustment metadata when creating adjustment	2013-08-12 10:00:35 +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	b065d7db36	When updating product distribution charge, skip line items that don't have a product distribution	2013-08-09 15:30:35 +10:00
Rohan Mitchell	b4a7ccf1b4	Adjustments on LineItems don't modify the order total. Make adjustments on Order instead.	2013-08-09 15:28:48 +10:00
Rohan Mitchell	513993324d	Clean up old adjustments when changing distributor	2013-08-09 15:27:52 +10:00
Rohan Mitchell	fd989e3a77	Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items.	2013-08-09 15:27:52 +10:00
Rohan Mitchell	239dd29511	Weight calculator will calculate against a single line item as well as an order	2013-08-09 15:27:52 +10:00
Rohan Mitchell	a338c974f8	Create line item adjustments for product distributions	2013-08-09 15:27:52 +10:00
Rohan Mitchell	8c9a3c8a91	Add Product#product_distribution_for	2013-08-09 15:26:57 +10:00
alexs	4ff8e825e9	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-09 13:21:24 +10:00
alexs	39623d45d6	Tests for building full addresses.	2013-08-09 13:19:07 +10:00
alexs	7c96c17c88	Tests for geo search.	2013-08-09 13:15:36 +10:00