Rohan Mitchell
|
46fd94eded
|
Fix minor test fail
|
2013-05-28 13:01:48 +10:00 |
|
Rohan Mitchell
|
1b25364160
|
Cherry-pick c3b2f52: Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement
Conflicts:
app/models/enterprise.rb
lib/open_food_web/distribution_change_validator.rb
|
2013-05-28 13:01:07 +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
|
02561ee252
|
With order cycle distribution, show error message when adding a product to cart with no distribution chosen
|
2013-05-28 11:54:46 +10:00 |
|
Rohan Mitchell
|
881bceb4d1
|
Fill in some missing / incorrect test cases for add to cart
|
2013-05-27 18:40:06 +10:00 |
|
Rohan Mitchell
|
7b332d0f53
|
Re-group add to cart specs
|
2013-05-27 18:12:59 +10:00 |
|
Rohan Mitchell
|
a2abcaf7bd
|
Push product_compatible_with_current_order and available_distributors_for down to DistributorChangeValidator, add tests
|
2013-05-27 13:50:33 +10:00 |
|
Rohan Mitchell
|
612e6aed2c
|
Include order cycle distributions in distributor choice when adding product to cart
|
2013-05-27 13:12:29 +10:00 |
|
Rohan Mitchell
|
a21783c814
|
Allow changing distributor when there are alternate distributors available that can service the cart's order
|
2013-05-27 13:11:30 +10:00 |
|
Rohan Mitchell
|
e3a419993c
|
Work around order cycles not having fees / shipping methods yet - notify bugsnag and provide an undefined shipping method
|
2013-05-27 13:00:12 +10:00 |
|
Rohan Mitchell
|
796be2ee6d
|
Refactor add to cart form into partials and helpers
|
2013-05-27 11:25:09 +10:00 |
|
Rohan Mitchell
|
ff9200ebb8
|
Display order cycle distributors on product details page
|
2013-04-12 13:18:40 +10:00 |
|
Rohan Mitchell
|
6e7ee6481d
|
Fetch enterprises that are distributing a product via a product or order cycle distribution
|
2013-04-12 10:13:04 +10:00 |
|
Rohan Mitchell
|
32629a27e7
|
Remove explicit class specification
|
2013-04-05 16:57:53 +11:00 |
|
Rohan Mitchell
|
f66ff0f8b1
|
Rename Enterprise#available_variants to distributed_variants to remove ambiguity between supplied/distributed variants
|
2013-04-05 16:51:51 +11:00 |
|
Rohan Mitchell
|
5649a50e28
|
Add tests around Enterprise#available_variants, make it also show variants distributed via an order cycle
|
2013-04-05 16:49:27 +11:00 |
|
Rohan Mitchell
|
3cceb0a7b0
|
Ignore app/public
|
2013-04-05 16:48:38 +11:00 |
|
Rohan Mitchell
|
02b524bfce
|
Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle
|
2013-04-05 15:00:42 +11:00 |
|
Rohan Mitchell
|
990931e006
|
Test splitting the product listing by local/remote order cycle
|
2013-04-05 14:32:23 +11:00 |
|
Rohan Mitchell
|
ad32147576
|
Display correct product splitting criteria
|
2013-04-05 14:30:35 +11:00 |
|
Rohan Mitchell
|
0874f12797
|
Controllers provide current order cycle for product splitting
|
2013-04-05 14:30:11 +11:00 |
|
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 |
|
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
|
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 |
|