raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

1970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
3db23393d2 Scope admin css to admin section, add simple styling for front-end 2013-04-22 16:23:30 +10:00
Rohan Mitchell
27d7a2c6c2 Remove example deface, update README with licence 2013-04-22 16:14:52 +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
a90f060b28 Add local organics logo 2013-04-22 10:49:37 +10:00
Rohan Mitchell
3bd766eab9 Update local organics feature readme 2013-04-22 10:32:23 +10:00
Rohan Mitchell
3d8d8ecd49 Move assets deface to correct directory 2013-04-22 10:32:09 +10:00
Rohan Mitchell
a4bdea4d5c Add chili feature for local organics 2013-04-22 10:29:05 +10:00
Rohan Mitchell
cbef31f619 Install chili for feature toggles 2013-04-22 10:24:17 +10:00
Rohan Mitchell
dc54be992b Require spree support file that provides a default shipping method for ProductDistributions when building from factory - fixes product seeds 2013-04-21 08:54:32 +10:00
Rohan Mitchell
8f682a6d07 Unicorn handle forked db connections - fixes PG::Error SSL SYSCALL error: EOF detected 2013-04-19 09:52:16 +10:00
Rohan Mitchell
c5e8ac6fd1 Newrelic unicorn compatibility 2013-04-19 09:39:54 +10:00
Rohan Mitchell
3e2d31d432 spree-last-address repo deleted - use mirror 
Conflicts:

	Gemfile
	Gemfile.lock
 2013-04-19 09:27:40 +10:00
Rohan Mitchell
4ce7525748 Configure newrelic for performance monitoring 2013-04-19 09:20:59 +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
fa11ff8982 Remove more spork-specific things, remove unused cuc config from zeus 2013-04-05 15:25:46 +11:00
Rohan Mitchell
ed7bded642 Remove spork 2013-04-05 15:16:54 +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
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