raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,079 Commits 18 Branches 452 Tags
9563aad9fa01ac206b752fa28a0ff594dcd55e32
Commit Graph

50 Commits

Author SHA1 Message Date
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
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
e1b2490259 Selecting an order cycle highlights valid distributor choices 2013-03-08 15:17:23 +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
f2f3bbd3ed Merge branch 'order-cycles-exchange-products' 
Conflicts:
	Gemfile.lock
 2013-01-22 10:40:56 +11:00
Rohan Mitchell
83e3c6815d Merge branch 'checkout-changes' 
Conflicts:
	.rvmrc
	app/helpers/application_helper.rb
 2013-01-22 10:30:51 +11:00
Rob H
f7890bd94d Fixes following code review for checkout changes 2013-01-18 19:17:55 +11:00
Rohan Mitchell
074d5715e7 Only provide distributors as coordinating enterprises. Order by name. 2013-01-18 14:26:56 +11:00
Rohan Mitchell
7c5dcd6a90 Change angular_ prefix to ng_ 2012-11-26 10:03:20 +11:00
Rohan Mitchell
59af447739 Fix ? 2012-11-26 09:44:42 +11:00
Rohan Mitchell
d502705362 Raise an error when using unsupported nested angular_fields_for 2012-11-24 07:50:09 +11:00
Rohan Mitchell
52ebe2c495 Provide proper names for angular select fields, add angular hidden field 2012-11-22 16:38:25 +11:00
Rohan Mitchell
b7bd21e498 Full-text search of form 2012-11-22 12:15:39 +11:00
Rohan Mitchell
873937db47 angular_collection_select 2012-11-22 11:45:55 +11:00
Rohan Mitchell
e64a86f5be angular_select 2012-11-22 11:27:51 +11:00
Rohan Mitchell
ad76e66944 angular_options_for_select 2012-11-22 11:24:05 +11:00
Rohan Mitchell
216125c7a1 Start building some selects 2012-11-22 11:03:28 +11:00
Rohan Mitchell
d6802d9ae5 Generate text field with custom form builder - AngularFormBuilder 2012-11-22 09:53:26 +11:00
Rohan Mitchell
6247bd2541 Display admin table of enterprise fees with enterprise, fee type and name columns 2012-11-15 15:03:12 +11:00
Rohan Mitchell
78bdbcbe6f Rename DistributorsHelper to EnterprisesHelper 2012-11-01 10:07:55 +11:00
Rohan Mitchell
d1b9ce92f6 Move distributors helper out of spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
15e91f7743 WIP Move non-admin non-Spree controllers out of Spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
927970d1a9 Viewing another products listing page does not display home page content 2012-10-12 09:39:49 +11:00
Rohan Mitchell
e1d4ee318c Fix issues with elRTE - sprites and functionality now work for link and image functions 2012-10-11 12:00:30 +11:00
Rohan Mitchell
0b830a7845 Suppliers and distributors long description editable with WYSIWYG editor from CMS and displayed as HTML 2012-10-11 10:50:36 +11:00
Rohan Mitchell
a8758f1271 Fix OrdersHelper for upgraded spree 2012-09-21 16:36:50 +10:00
Rohan Mitchell
7492522066 Improve clarity of various totals (items, shipping, grand total) on checkout page 2012-09-14 15:35:22 +10:00
Rohan Mitchell
aa027f6e29 Display subtotal for delivery fees 2012-07-02 16:13:55 +10:00
Rohan Mitchell
258559f9d0 Update the price on the product details page in real time when the variant or the quantity are changed 2012-07-01 10:07:08 +10:00
Rohan Mitchell
3ad575cb5f Display variant price differences as absolute, not relative values 2012-06-26 09:54:00 +10:00
Rohan Mitchell
4b118a26ff Show distributor-scoped product counts next to taxons 2012-06-22 13:40:43 +10:00
Rohan Mitchell
0c5162f9fb Move distributor lookup code into current_distributor helper 2012-06-22 11:48:39 +10:00
Rohan Mitchell
93e3f82392 Display product count next to taxons in sidebar 2012-06-21 16:15:40 +10:00
Andrew Spinks
b6ca20beee new rails 3.1.4 app 2012-03-27 10:10:26 +11:00