21845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	661b7da110	Booleanise all the logic	2013-04-05 14:14:12 +11:00
Rohan Mitchell	f95c6a2386	Extract stub building into private method	2013-04-05 14:11:31 +11:00
Rohan Mitchell	e735a709bf	SplitProductsByDistribution deals with order cycles, and is tested by stubs	2013-04-05 14:05:30 +11:00
Rohan Mitchell	3aa48907a6	Add per-product tests for membership of distributor or order cycle	2013-04-05 12:45:01 +11:00
Rohan Mitchell	cf4fe269d1	Add specs for splitting products by various distribution options	2013-04-05 11:41:37 +11:00
Rohan Mitchell	f8ebb0c715	Rename split partial and update overrides	2013-04-05 11:34:03 +11:00
Rohan Mitchell	a11f36e121	Provide pry in test env when we're not building with Travis	2013-04-05 11:30:26 +11:00
Rohan Mitchell	11ac0a1277	Fix order cycle selection on products page	2013-04-05 11:26:47 +11:00
Rohan Mitchell	b3976bfbd0	Rename SplitProductsByDistributor to SplitProductsByDistribution	2013-04-05 11:08:19 +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	c681750698	Move distributor/OC browsing into its own acceptance spec	2013-03-27 11:58:38 +11:00
Rohan Mitchell	f6c76ef8ad	Update pry	2013-03-27 11:57:42 +11:00
Rob H	5544ccb94e	Merge branch 'master', remote-tracking branch 'origin'	2013-03-27 10:42:05 +11:00
Rohan Mitchell	3e6c56a638	Add turbo sprockets for faster asset precompile	2013-03-16 13:08:14 +11:00
Rohan Mitchell	1d7cf4436a	Add comments linking areas concerned with separating products by distributor and order cycle	2013-03-15 17:02:54 +11:00
Rohan Mitchell	81b65efb29	Update selenium-webdriver	2013-03-15 16:58:22 +11:00
Rohan Mitchell	a9a58db137	Add spec for viewing product counts when both a distributor and an order cycle are selected, scope Spree::Product.with_order_cycles_outer joins to avoid clash when using both in_distributor and in_order_cycle in the same query	2013-03-15 12:17:29 +11:00
Rohan Mitchell	f349628202	Test that products by ProductDistribution are not shown	2013-03-15 11:41:58 +11:00
Rohan Mitchell	5089d3bb22	Add simplecov	2013-03-11 10:57:14 +11:00
Rohan Mitchell	bcd545c13f	Alias spree_variants join to avoid name clash when loading products for home page	2013-03-08 17:21:18 +11:00
Rohan Mitchell	955f313abc	Remove require for queries_product_distribution	2013-03-08 16:59:47 +11:00
Rohan Mitchell	711f769bcd	Remove QueriesProductDistribution - replaced by Product and Enterprise scopes	2013-03-08 16:57:54 +11:00
Rohan Mitchell	c9d1573049	Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors	2013-03-08 16:56:58 +11:00
Rohan Mitchell	b25dcaa92b	Enterprise.active_distributors doesn't show distributors from inactive order cycles	2013-03-08 16:54:22 +11:00
Rohan Mitchell	2a890f80f4	Enterprise.active_distributors doesn't show distributors of out of stock products	2013-03-08 16:48:35 +11:00
Rohan Mitchell	13abf9ada7	Enterprise.active_distributors doesn't show distributors of unavailable products	2013-03-08 16:46:25 +11:00
Rohan Mitchell	cd61bad0b9	Enterprise.active_distributors doesn't show distributors of deleted products	2013-03-08 16:43:45 +11:00
Rohan Mitchell	00d7fcbfb6	Enterprise.active_distributors finds active distributors by order cycles	2013-03-08 16:39:42 +11:00
Rohan Mitchell	977344e279	Rewrite scope with outer join	2013-03-08 16:31:54 +11:00
Rohan Mitchell	98cad56e7c	Enterprise.active_distributors finds active distributors by product distributions	2013-03-08 16:23:45 +11:00
Rohan Mitchell	4b642f8c90	Convert to 1.9 hash syntax	2013-03-08 15:18:53 +11:00
Rohan Mitchell	43843f05b1	WIP: Add edge case tests	2013-03-08 15:18:53 +11:00
Rohan Mitchell	d02e8fece5	WIP: Spec that no duplicates are shown	2013-03-08 15:18:53 +11:00
Rohan Mitchell	dd3c72199a	WIP: Add spec for in_order_cycle	2013-03-08 15:18:53 +11:00
Rohan Mitchell	6d6390b886	WIP: Spec in_supplier_or_distributor	2013-03-08 15:18:53 +11:00
Rohan Mitchell	5c64e18360	WIP: Refactor tests - positive and negative into single cases for easier managability	2013-03-08 15:18:53 +11:00
Rohan Mitchell	29a9526b3f	WIP: Add spec for in_distributor	2013-03-08 15:18:53 +11:00
Rohan Mitchell	8e1c9e7bcc	WIP: Add notes, put in Spree module, write in_supplier scope spec	2013-03-08 15:18:53 +11:00
Rohan Mitchell	69392100f9	Push QueriesProductDistribution.products_available_for back to model	2013-03-08 15:18:53 +11:00
Rohan Mitchell	e326e590db	Implement and use scopes for finding products by distributor via order cycle or product distribution	2013-03-08 15:18:53 +11:00
Rohan Mitchell	265336b70c	When looking up distributors for sidebar, include both those in ProductDistributions and in OrderCycles	2013-03-08 15:18:53 +11:00
Rohan Mitchell	1285d507eb	Revert "Create order cycles where needed by tests" ... This reverts commit b82e0007c9b0322e85e5597634628024e839d102. Conflicts: spec/factories.rb spec/features/consumer/order_cycles_spec.rb	2013-03-08 15:18:53 +11:00
Rohan Mitchell	884dbd5de6	Keep old methods available for product distribution queries	2013-03-08 15:18:52 +11: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	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	c0431c614f	Clean up specs, add spec for selecting both hub and OC	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	a5c706d694	In test, create a global shipping method, which is required when creating orders	2013-03-08 15:18:52 +11:00
Rohan Mitchell	666f110d47	Load distributor list from those in an active order cycle	2013-03-08 15:17:23 +11:00