raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,570 Commits 19 Branches 453 Tags
27e992ebcbe3cbcf2dd4e4e10f4c991f0e2a14ca
Commit Graph

201 Commits

Author SHA1 Message Date
Rohan Mitchell
cfcc8c3fb2 Fix DistributionChangeValidator#variants_available_for_distribution: Do not show products distributed through a different order cycle 2013-06-21 10:34:39 +10:00
Rohan Mitchell
12fb43e268 DistributionChangeValidator returns an empty array when distributor and order cycle are both nil 2013-06-17 16:01:10 +10:00
Rohan Mitchell
705af41684 DistributionChangeValidator finds variants distributed by product distribution when order cycle is nil 2013-06-17 15:06:20 +10:00
Rohan Mitchell
be29974dd8 DistributionChangeValidator checks if an order can change to a specified new distributION 2013-06-17 15:00:19 +10:00
Rohan Mitchell
17103a8b0c Remove DistributionChangeValidator#can_change_distributor? method 2013-06-17 14:00:39 +10:00
Rohan Mitchell
661ce4e597 Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products 2013-06-04 10:26:13 +10:00
Rohan Mitchell
249e1e013f Slight wording change to confirmation email 2013-06-04 09:11:49 +10:00
Rohan Mitchell
fbac41b060 Add DistributionChangeValidator#available_order_cycles, analagous to available_distributors 2013-05-28 13:51:52 +10:00
Rohan Mitchell
11755346ce DistributionChangeValidator finds available order cycles for a product 2013-05-28 13:40:13 +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
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
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
6fd13212f5 Remove HTML entities from order confirmation email 2013-05-21 17:44:34 +10:00
Rohan Mitchell
c3b2f52b7a Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement 2013-05-20 21:16:43 +10:00
Rohan Mitchell
f19ef4ed07 Move save button back within form, fix failing test 2013-05-20 16:05:25 +10:00
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
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
06c285689e Order confirmation email contains distributor info 2013-04-29 11:14:00 +10:00
Rohan Mitchell
50f3455523 Fix gemspec 2013-04-26 16:55:30 +10:00
Rohan Mitchell
89b749fe95 Add terms and conditions to footer 2013-04-26 16:31:33 +10:00
Rohan Mitchell
92a7f19ff1 Add specs for enterprises distributor info as rich text feature 2013-04-26 15:43:13 +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
08161ece61 Remove sample defaces 2013-04-26 13:09:32 +10:00
Rohan Mitchell
1b6bf6ca2b Add distributor info field to enterprises 2013-04-26 12:31:19 +10:00
Rohan Mitchell
4900129511 Enable feature for local organics only 2013-04-26 12:31:11 +10:00
Rohan Mitchell
953fe22d4c Add new feature for rich text distributor info for enterprises 2013-04-26 12:27:15 +10:00
Rohan Mitchell
2379861c92 Shrink local organics local/remote product heading 2013-04-26 10:16:51 +10:00
Rohan Mitchell
f17907e06f Style local organics product details distributor heading 2013-04-26 09:56:16 +10:00
Rohan Mitchell
7911adab6a Update local organics product listing style 2013-04-26 09:47:20 +10:00
Rohan Mitchell
06364ec759 Increase local organics font size, change local products background colour 2013-04-26 09:42:50 +10:00
Rohan Mitchell
ea0df511cc Enlarge local organics sidebar font 2013-04-26 09:23:42 +10:00
Rohan Mitchell
9909261c8c Update local organics logo 2013-04-26 09:18:47 +10:00
Rohan Mitchell
4730ba0734 Restore display of admin top-right menu 2013-04-25 21:52:10 +10:00
Rohan Mitchell
cea2089768 Add empty admin.js, fixes asset not precompiled error 2013-04-25 15:50:41 +10:00
Rohan Mitchell
bea247e64d Only configure sass load paths if sass defined. Fixes production init. 2013-04-25 15:31:32 +10:00
Rohan Mitchell
8f6cc361cc Precompile all engine-specific assets 2013-04-22 18:34:11 +10:00
Rohan Mitchell
9e60e6269e Remove unneeded variables override file 2013-04-22 18:33:53 +10:00
Rohan Mitchell
3df2207664 Remove non-present files from gemspecs 2013-04-22 17:36:18 +10:00
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
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
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