708 Commits

Author	SHA1	Message	Date
Rob H	44ad7584f0	BPUR: can update available_on	2013-07-23 10:37:50 +10:00
Rob H	344a084494	BPUR: can update supplier	2013-07-23 10:37:50 +10:00
Rob H	3c57680303	WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet	2013-07-23 10:37:50 +10:00
Rob H	731127d55c	WIP: Bulk Product Update Rewrite: initial acceptance testing	2013-07-23 10:37:50 +10:00
Andrew Spinks	4cdd858f48	Disable order cycles in the front end by default.	2013-07-22 17:16:55 +10:00
Rohan Mitchell	6ceb8e9ee7	Restore change: render checkout distributor details from partial	2013-07-22 11:23:48 +10:00
Rohan Mitchell	568837aa53	Revert "On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME" ... This reverts commit b7f7766893.	2013-07-22 11:22:20 +10:00
David Cook	3007549aa5	use .length instead of .count which produced unexpected results	2013-06-28 17:02:26 +10:00
David Cook	a63b8908bb	Moved inline style to stylesheet	2013-06-21 16:12:56 +10:00
David Cook	7121860416	new view to display all distributors	2013-06-21 10:53:24 +10:00
David Cook	b0e4bef75e	rename sidebar collection variables to avoid clash, fix count to be distinct	2013-06-21 10:42:42 +10:00
Rohan Mitchell	69019859da	Refactor views	2013-06-20 15:14:23 +10:00
Rohan Mitchell	17103a8b0c	Remove DistributionChangeValidator#can_change_distributor? method	2013-06-17 14:00:39 +10:00
Rohan Mitchell	b5479380b6	Refactor alternative distributors at checkout form, fixing indentation and removed double negatives	2013-06-17 11:41:35 +10:00
Rohan Mitchell	6d22f56c86	Distribution selection form is not shown when there are products in the cart. ... This form doesn't filter options based on which can supply the products in the cart, so don't show it in those circumstances.	2013-06-17 11:29:36 +10:00
David Cook	7ce7107c6c	Add meaningfull ids and classnames	2013-06-14 17:37:44 +10:00
Rohan Mitchell	f91e1144e0	Name blank order cycle option	2013-06-04 11:11:13 +10:00
Rohan Mitchell	661ce4e597	Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products	2013-06-04 10:26:13 +10:00
Rohan Mitchell	cb703c2a66	Do not give order cycle choice when there is only one option	2013-05-28 16:35:39 +10:00
Rohan Mitchell	54fe63e7f3	User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor	2013-05-28 16:20:58 +10:00
Rohan Mitchell	1f9f5efb79	Add first product to cart with order cycle choice	2013-05-28 14:06:52 +10:00
Rohan Mitchell	0e08829a29	Rename DistributorChangeValidator to DistributionChangeValidator in preparation for expansion to include order cycles	2013-05-28 12:32:52 +10:00
Rohan Mitchell	796be2ee6d	Refactor add to cart form into partials and helpers	2013-05-27 11:25:09 +10:00
David Cook	423bd52fd6	rename _count vars to _total	2013-05-22 14:03:51 +10:00
vagrant	4e7f966429	add suppliers scope, limit by 5, test	2013-05-22 13:07:30 +10:00
Rohan Mitchell	3b2508dad3	On local organics checkout, remove distributor change, move save button to top right	2013-05-20 15:29:13 +10:00
Rohan Mitchell	b7f7766893	On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME	2013-05-18 19:54:27 +10:00
Rohan Mitchell	a1f189627b	Only show UserVoice feedback button on Eaterprises deployment	2013-04-29 16:34:19 +10:00
Rohan Mitchell	63768df3d7	Replace distributor info box on product details and checkout pages with rich text field	2013-04-26 13:30:21 +10:00
Rohan Mitchell	fb999732ee	Rename enterprises admin extended description to profile info, add distributor info field	2013-04-26 13:10:32 +10:00
Rohan Mitchell	f17907e06f	Style local organics product details distributor heading	2013-04-26 09:56:16 +10:00
Rohan Mitchell	9f6d1a2f18	Order cycle reports are precise to time of day, not just date	2013-04-25 21:22:26 +10:00
Rohan Mitchell	ff9200ebb8	Display order cycle distributors on product details page	2013-04-12 13:18:40 +10:00
Rohan Mitchell	ad32147576	Display correct product splitting criteria	2013-04-05 14:30:35 +11:00
Rohan Mitchell	f8ebb0c715	Rename split partial and update overrides	2013-04-05 11:34:03 +11:00
Rohan Mitchell	7cc24f7340	Handle the case where we're viewing a product from a remote distributor that we can change to	2013-04-05 10:28:08 +11:00
Rohan Mitchell	dfa94b88aa	Display distributor and order cycle choice	2013-03-08 15:18:52 +11:00
Rohan Mitchell	fcb1701d36	WIP Add hub and order cycle display stub with failing tests	2013-03-08 15:18:52 +11:00
Rohan Mitchell	e1b2490259	Selecting an order cycle highlights valid distributor choices	2013-03-08 15:17:23 +11:00
Rohan Mitchell	74e2b70d3a	Without JS, select distributor, highlighting local order cycle choices	2013-03-08 15:17:22 +11:00
Rohan Mitchell	34cb8bab26	View order cycle and distributor choices	2013-03-08 15:15:15 +11:00
Rohan Mitchell	8b5aea42b8	Add deface for order cycle selection	2013-03-08 15:15:15 +11:00
Rob H	046eb256ff	Fix issues causing enterprise fee tests to break	2013-02-15 14:10:56 +11:00
Rob H	2cdf458d6a	Move additional of tabs to main nav bar to defaces, rather than overriding view directly	2013-02-14 15:42:47 +11:00
Rob H	2a07d61e81	Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue	2013-02-07 15:09:25 +11:00
Rob H	99b4530db2	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-07 13:07:14 +11:00
Rob H	4b254a5529	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-06 11:25:26 +11:00
Rob H	612017f143	WIP Upgrade to Spree 1.3	2013-02-05 15:01:45 +11:00
Rohan Mitchell	f2f3bbd3ed	Merge branch 'order-cycles-exchange-products' ... Conflicts: Gemfile.lock	2013-01-22 10:40:56 +11:00
Rohan Mitchell	83e3c6815d	Merge branch 'checkout-changes' ... Conflicts: .rvmrc app/helpers/application_helper.rb	2013-01-22 10:30:51 +11:00