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

84 Commits

Author SHA1 Message Date
Rohan Mitchell
93db813b3a Make current_producers helper more resilient 2014-03-27 10:25:05 +11:00
Rohan Mitchell
20745825bf Fix finding producers for shopfront, moving to SQL-land in the process. Woo. 2014-03-26 12:56:58 +11:00
Will Marshall
74fb266748 Adding some requirement filters to the Orders controller 2014-03-21 15:18:27 +11:00
Will Marshall
dc8418cb4c Removing the taxonomy spec, with a comment about some possibly redundant spree overrides 2014-03-19 14:29:46 +11:00
Will Marshall
0cc108206b Reworking the top details so it works in all pages 2014-03-14 17:06:03 +11:00
Rohan Mitchell
f7d8d866eb Show two linebreaks for end of block level tags, strip whitespace from end of string 2014-03-12 13:52:13 +11:00
Rohan Mitchell
011668c0b6 Display line breaks in order confirmation email distributor info 2014-03-12 13:34:34 +11:00
Will Marshall
3db601f362 Merge branch 'master' into checkout 2014-02-27 16:29:21 +11:00
Rohan Mitchell
3196e28d88 Admin can assign units to a product 2014-02-27 11:29:39 +11:00
Will Marshall
a0abd9c95a Merge branch 'master' into checkout 2014-02-26 15:52:37 +11:00
Will Marshall
b6b5c2889e Reworking checkout to use f_form_for, show validation, better controller layout 2014-02-21 14:31:03 +11:00
Rohan Mitchell
3f9f24157c Do not show unit value or description when product does not have a unit-related option type 2014-02-19 12:07:53 +11:00
Rohan Mitchell
7b80518621 On admin variant edit page, do not show option values for unit-related option types 2014-02-19 11:29:26 +11:00
Will Marshall
cec0ad8a83 Adding ze boilerplate 2014-02-07 13:55:25 +11:00
Will Marshall
c4c5f3a8c7 Merging from master 2013-12-17 14:18:21 +11:00
Rohan Mitchell
124b6df75d Show undated order cycles on index page 2013-12-13 14:51:43 +11:00
Will Marshall
ec72e9137a We can now hit the index page 2013-12-05 15:07:46 +11:00
Will Marshall
4543e08872 Renaming everything to Shop 2013-12-05 13:40:05 +11:00
Will Marshall
f525b7aea1 Adding the distributors controller 2013-12-04 15:58:25 +11:00
Rohan Mitchell
94c33e5f45 Colour order cycle rows based on their status 2013-11-22 11:31:04 +11:00
Will Marshall
317b2f1ced Helperizing some of the order cycles stuff 2013-11-08 15:19:27 +11:00
Will Marshall
f0d335a454 Fixing up the failing spec for distributor changes, reworking a method to SharedHelper 2013-11-07 11:47:05 +11:00
Will Marshall
406f8033fe Partialising the _distributor render 2013-11-06 15:36:39 +11:00
Will Marshall
b8fcfbd72b Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125 2013-11-01 14:48:23 +11:00
Rohan Mitchell
32889715f0 Grey out hubs that have no products available for distribution and are not in an order cycle 2013-10-30 16:09:18 +11:00
Rohan Mitchell
57f7d489ff Rename OpenFoodWeb namespace to OpenFoodNetwork 2013-10-18 17:29:55 +11:00
Rohan Mitchell
de8d7bd66e Clean up payment methods form 2013-10-17 11:08:25 +11:00
Rohan Mitchell
30bc45370b When order cycle expires mid-order, clear the order cycle and display a message 2013-09-30 16:56:11 +10:00
Rohan Mitchell
19349c805f Destroy supplied products when a supplier is destroyed 2013-09-23 14:58:26 +10:00
Rohan Mitchell
803594b4d7 Confirm change hub when it would empty cart 2013-09-23 10:07:25 +10:00
Rohan Mitchell
a929312979 Add scope: OrderCycle.with_distributor 2013-09-17 09:54:21 +10:00
Rohan Mitchell
64a3a309f5 Change 'pick-up date' to 'available on', provide absolute dates in options 2013-09-10 09:16:23 +10:00
Rohan Mitchell
7b5eca3a50 Fix error when generating checkout email when distributor_info is nil 2013-08-20 09:19:23 +10:00
Rohan Mitchell
0458f7a6bb Summarise distribution fees in checkout after cart page 2013-08-19 17:02:02 +10:00
Andrew Spinks
82726d032c Add enterprise roles for order cycles. 2013-08-16 11:34:07 +10:00
Rohan Mitchell
60956e9789 Display sum of distribution fees at cart by adjustment, not shipping methods 2013-08-13 09:11:25 +10:00
Rohan Mitchell
ec3e00c128 Refactor LineItem and clients for new fields 2013-08-06 13:47:17 +10:00
Andrew Spinks
1add182757 Feature toggle order cycles. 2013-07-23 15:57:43 +10:00
Andrew Spinks
7cb054f430 Merge branch 'master' into order-cycle-selection 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/spree/orders_controller_decorator.rb
	app/models/enterprise.rb
	app/models/spree/order_decorator.rb
	app/views/spree/checkout/_other_available_distributors.html.erb
	app/views/spree/products/_add_to_cart.html.haml
	lib/open_food_web/distributor_change_validator.rb
	spec/spec_helper.rb
 2013-07-23 14:42:57 +10:00
Andrew Spinks
4cdd858f48 Disable order cycles in the front end by default. 2013-07-22 17:16:55 +10:00
Rohan Mitchell
2ddc5b4e4a Move strip_html to main app, fixes context-sensitive chili feature spec fail 2013-07-22 16:21:32 +10:00
Rohan Mitchell
6d22f56c86 Distribution selection form is not shown when there are products in the cart. 
This form doesn't filter options based on which can supply the products in the cart,
so don't show it in those circumstances.
 2013-06-17 11:29:36 +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
1f9f5efb79 Add first product to cart with order cycle choice 2013-05-28 14:06:52 +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
612e6aed2c Include order cycle distributions in distributor choice when adding product to cart 2013-05-27 13:12:29 +10:00
Rohan Mitchell
796be2ee6d Refactor add to cart form into partials and helpers 2013-05-27 11:25:09 +10:00
Rohan Mitchell
b3976bfbd0 Rename SplitProductsByDistributor to SplitProductsByDistribution 2013-04-05 11:08:19 +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