Commit Graph

17514 Commits

Author SHA1 Message Date
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
cc2e8694f0 Move LineItem update to source of change (order update). On empty cart, re-instanciate shipping method adjustment, fixing no shipping fees after empty cart bug. 2013-05-20 15:01:04 +10:00
Rohan Mitchell
571dfd9e9f Regroup OrderController methods - actions / callbacks / utils 2013-05-20 14:56:39 +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
d65dda4dc5 When order distributor changes, update line item shipping method 2013-05-18 19:21:01 +10:00
Rohan Mitchell
a1f189627b Only show UserVoice feedback button on Eaterprises deployment 2013-04-29 16:34:19 +10:00
Rohan Mitchell
da3267a302 Add OpenFoodWeb logo to footer 2013-04-29 16:20:26 +10:00
Rohan Mitchell
234b2d26e9 Add MiGS payment gateway 2013-04-29 15:37:48 +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
3dd4e074fc Split spree variable changes into per-feature files, add an eaterprises feature for default layout 2013-04-22 16:12:50 +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
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
3aa48907a6 Add per-product tests for membership of distributor or order cycle 2013-04-05 12:45:01 +11:00
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