Rohan Mitchell
|
f8ebb0c715
|
Rename split partial and update overrides
|
2013-04-05 11:34:03 +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
|
1d7cf4436a
|
Add comments linking areas concerned with separating products by distributor and order cycle
|
2013-03-15 17:02:54 +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
|
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
|
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
|
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
|
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
|
666f110d47
|
Load distributor list from those in an active order cycle
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
3aa44c3e9a
|
Setting a remote distributor clears the order cycle, and vice versa
|
2013-03-08 15:17:23 +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
|
72a9286457
|
Add helper to generate a local/remote class for order cycle selection
|
2013-03-08 15:17:22 +11:00 |
|
Rohan Mitchell
|
456dfcf6db
|
Style distribution choice, add compass for border radius mixin
|
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
|
fe824c2d4e
|
Add order cycle active and inactive scopes
|
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 |
|
Rohan Mitchell
|
63f3504b81
|
Add order cycle reference to orders
|
2013-03-08 15:15:15 +11:00 |
|
Rob H
|
055c07a466
|
Add before_payment method to checkout controller (fixes issues with spree_paypal_express)
|
2013-02-20 14:04:10 +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
|
9e9199643e
|
Remove unneeded :partial from override
|
2013-02-14 15:35:50 +11:00 |
|
Rob H
|
c956706d78
|
Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test
|
2013-02-14 15:12:50 +11:00 |
|
Rob H
|
a3746c6c59
|
Add analytics helper to Enterprises Controller
|
2013-02-14 12:10:31 +11:00 |
|
Rob H
|
1d4fbe865b
|
Finished revision of defaces
|
2013-02-09 00:40:34 +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
|
3507c5414d
|
Changed Sass variable: back to our green colour following upgrade
|
2013-02-07 09:25:29 +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 |
|
Rohan Mitchell
|
662aaf75bf
|
When editing an order cycle, distributor collection details are loaded
|
2013-01-22 09:34:07 +11:00 |
|
Rob H
|
f7890bd94d
|
Fixes following code review for checkout changes
|
2013-01-18 19:17:55 +11:00 |
|
Rob H
|
6a45e8be3b
|
Make tests pass after changes to checkout broke them all
|
2013-01-18 15:29:36 +11:00 |
|