Commit Graph

25135 Commits

Author SHA1 Message Date
Rohan Mitchell
54fe63e7f3 User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor 2013-05-28 16:20:58 +10:00
Rohan Mitchell
1f9f5efb79 Add first product to cart with order cycle choice 2013-05-28 14:06:52 +10:00
Rohan Mitchell
9ef7da1339 Add OrderCycle#distributed_variants 2013-05-28 14:01:04 +10:00
Rohan Mitchell
fbac41b060 Add DistributionChangeValidator#available_order_cycles, analagous to available_distributors 2013-05-28 13:51:52 +10:00
Rohan Mitchell
fb5c050b48 Refactor DistributionChangeValidator#available_distributors specs 2013-05-28 13:44:17 +10:00
Rohan Mitchell
11755346ce DistributionChangeValidator finds available order cycles for a product 2013-05-28 13:40:13 +10:00
Rohan Mitchell
3bedfc3d1d Add OrderCycle distributing_product scope 2013-05-28 13:27:52 +10:00
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
David Cook
0f8cd4705a Regenerate favicon.ico from higher quality image 2013-05-24 10:14:40 +10:00
David Cook
731cf33f86 Add new favicon.ico file with size 16, 32 and 64 2013-05-22 16:21:13 +10:00
David Cook
423bd52fd6 rename _count vars to _total 2013-05-22 14:03:51 +10:00
vagrant
4e7f966429 add suppliers scope, limit by 5, test 2013-05-22 13:07:30 +10:00
vagrant
aa85d20173 add suppliers scope, limit by 5, test 2013-05-22 13:06:24 +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
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
Andrew Spinks
174d7fac6f Increase unicorn timeout so that reports can run over long date range. 2013-05-05 18:42:42 +10:00
Andrew Spinks
df7dd557b5 Update CMS configuration take S3 details from the spree config. 3.1.2 2013-05-05 14:20:57 +10:00
Andrew Spinks
88508c254b Install db2fog for S3 database backups
Conflicts:

	Gemfile.lock
2013-05-05 14:19:56 +10:00
Andrew Spinks
6777a3ce58 Update CMS configuration take S3 details from the spree config. 2013-05-05 14:10:11 +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
e20e4950bb Install db2fog for S3 database backups 2013-04-29 11:31:01 +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