16954 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	34b694666c	Grey out inactive distributors	2012-06-26 08:24:32 +10:00
Rohan Mitchell	0662e8f676	Show links to distributor home page, particularly when viewing product not available at current distributor	2012-06-26 08:12:35 +10:00
Rohan Mitchell	f3d52825ae	Remove redirect_back_or_default, which was causing unexpected behaviour	2012-06-26 07:54:55 +10:00
Rohan Mitchell	9258d47e55	When adding subsequent products, add valid products to cart	2012-06-26 07:52:45 +10:00
Rohan Mitchell	a48a100bcc	Merge branch 'shop-by-distributor' v0.0.2	2012-06-25 09:10:50 +10:00
Rohan Mitchell	32dca81467	Update spec for markup change	2012-06-25 09:10:34 +10:00
Rohan Mitchell	6cd9bff29f	Convert most templates from erb to haml	2012-06-25 09:06:56 +10:00
Rohan Mitchell	a7df5a2f1e	Include jquery, add basic styling for add to cart form, split supplier and distributors in product details sidebar	2012-06-25 08:57:53 +10:00
Rohan Mitchell	f4108921ed	When adding subsequent product to cart, do not allow the user to add a product from another distributor	2012-06-25 08:45:08 +10:00
Rohan Mitchell	178f581452	When an item has been added to the cart, do not allow the user to select a distributor when adding a subsequent item	2012-06-25 07:25:31 +10:00
Rohan Mitchell	98bcc9ce71	When adding first product to cart, add the product and set the distributor even if the order has a different distributor set	2012-06-25 06:57:24 +10:00
Rohan Mitchell	df831a9128	Do not add the product to cart if the chosen distributor is different from the order's distributor	2012-06-24 20:14:07 +10:00
Rohan Mitchell	4481ca83f9	OrdersController does not permit adding products with invalid distributors	2012-06-24 19:58:09 +10:00
Rohan Mitchell	24ad4f53fc	Raise error if distributor changed illegally	2012-06-24 19:23:44 +10:00
Rohan Mitchell	a41c5d4735	Move distributor permissions onto order class, do not show links to change distributor if the action is invalid	2012-06-24 15:15:53 +10:00
Rohan Mitchell	7b92fcb614	Do not allow deselecting distributor after product added to cart at controller level	2012-06-24 14:56:27 +10:00
Rohan Mitchell	d3c80e99fc	Do not allow changing distributor after product added to cart at controller level	2012-06-24 14:54:48 +10:00
Rohan Mitchell	056733a426	Add controller spec for deselecting distributors	2012-06-24 13:48:55 +10:00
Rohan Mitchell	3219006423	Push several request specs down to controller level, replace with scenario. Set order's distributor when adding product to cart	2012-06-24 13:21:36 +10:00
Rohan Mitchell	fc5795173e	Do not add the product to cart if the user specifies a distributor that the product is not available at	2012-06-24 12:56:47 +10:00
Rohan Mitchell	99d6f0baa9	Require a distributor when adding a product to the cart	2012-06-24 12:13:33 +10:00
Rohan Mitchell	b5082009ce	Add pending specs for adding products to cart with distributor	2012-06-24 12:13:13 +10:00
Andrew Spinks	4faed954e6	use database truncation for javascript request tests.	2012-06-24 11:41:19 +10:00
Rohan Mitchell	b2f5e23fa4	Test selecting distributor when adding item to cart, for no/remote distributor selected	2012-06-24 11:41:10 +10:00
Rohan Mitchell	a91722a593	Display distributor choice on add to cart form	2012-06-24 11:28:06 +10:00
Rohan Mitchell	9be5dc41b9	Split products by local/remote distributor: style	2012-06-24 09:41:33 +10:00
Rohan Mitchell	34f95ffb4a	Split products by local/remote distributor: apply to products, search results and taxon pages	2012-06-24 09:21:44 +10:00
Rohan Mitchell	ebb624bdc3	Reload application files, routes and factories each spork run	2012-06-24 09:10:25 +10:00
Rohan Mitchell	32050bbba4	Split products by local/remote distributor: views and basic style	2012-06-24 07:37:25 +10:00
Rohan Mitchell	5411685c83	Split products by local/remote distributor: logic	2012-06-24 07:36:56 +10:00
Rohan Mitchell	5e6c4de34b	Leave a distributor	2012-06-23 12:33:38 +10:00
Rohan Mitchell	2cdf32590c	Fix indentation of markdown code blocks	2012-06-22 15:46:13 +10:00
Rohan Mitchell	d0422d20b0	Update setup instructions	2012-06-22 15:41:49 +10:00
Rohan Mitchell	9acdce06c3	Replace stock Rails README file with project-specific info	2012-06-22 15:31:24 +10:00
Rohan Mitchell	b9229f9166	DB seeds create some default taxonomies, suppliers, distributors and products, and are now idempotent	2012-06-22 15:15:20 +10:00
Rohan Mitchell	4b118a26ff	Show distributor-scoped product counts next to taxons	2012-06-22 13:40:43 +10:00
Rohan Mitchell	0c5162f9fb	Move distributor lookup code into current_distributor helper	2012-06-22 11:48:39 +10:00
Rohan Mitchell	4911a06c9d	Display current distributor in main nav bar	2012-06-22 11:46:40 +10:00
Rohan Mitchell	03b87225d0	Add spec for selecting a distributor, add distributor to order model, add controller method for selecting distributor	2012-06-22 11:25:32 +10:00
Rohan Mitchell	16ff9e9611	Set up spree controller testing environment	2012-06-22 11:00:44 +10:00
Rohan Mitchell	93e3f82392	Display product count next to taxons in sidebar	2012-06-21 16:15:40 +10:00
Rohan Mitchell	4c6486e66f	Product requires a supplier	2012-06-21 14:59:22 +10:00
Rohan Mitchell	65d39e5867	Display supplier/distributor search results	2012-06-21 07:31:33 +10:00
Rohan Mitchell	412eb4365e	Provide searching by supplier or distributor via spree searcher class	2012-06-20 17:44:58 +10:00
Rohan Mitchell	b0a8645738	Display suppliers and distributors in sidebar	2012-06-20 17:44:11 +10:00
Rohan Mitchell	d656898ecb	Disable filtering distributors using spree filters	2012-06-20 17:43:14 +10:00
Rohan Mitchell	f9d290f00d	Show product supplier and distributors on product details page	2012-06-20 16:28:09 +10:00
Rohan Mitchell	103aad467c	Tweak override names	2012-06-20 16:00:39 +10:00
Rohan Mitchell	a445216e6c	Add test for filtering by distributor	2012-06-20 15:19:26 +10:00
Rohan Mitchell	9adfe58086	Display distributor filter as links instead of checkboxes, style in the same way as taxonomy selectors	2012-06-20 15:05:54 +10:00