raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
317 Commits 17 Branches 453 Tags
6d84cf76130b2e5345aba90ffebcb4aaafc751a1
Commit Graph

56 Commits

Author SHA1 Message Date
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises 
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
 2012-11-01 11:02:02 +11:00
Rohan Mitchell
fb9f59213f Distributors, product, suppliers and taxonomy specs pass 2012-11-01 08:15:50 +11:00
Rohan Mitchell
7dd42b7feb Fix use of pickup_address and url fields with enterprises, checkout spec passes 2012-10-31 17:10:21 +11:00
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +11:00
Rohan Mitchell
c5941d6cb5 Update distributor details when distributor is changed 2012-10-27 18:50:09 +11:00
Rohan Mitchell
773adca838 Display distributor details on product page when distributor is selected 2012-10-27 12:49:57 +11:00
Rohan Mitchell
13317347bb Display an explanation message on product page when no distributor is selected 2012-10-27 12:19:44 +11:00
Rohan Mitchell
36d342f216 Add view all suppliers page 2012-10-17 07:50:58 +11:00
Rohan Mitchell
d09123eb22 Do not show suppliers with no products in stock 2012-10-17 07:36:18 +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
3dd3d8030f Display CMS pages in menu 2012-10-11 17:00:34 +11:00
Rohan Mitchell
cab61ddb7c CMS content on home page 2012-10-11 16:21:33 +11:00
Rohan Mitchell
a686a820d9 Add distributor show page, redirect here after selecting distributor 2012-10-11 10:50:36 +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
58e5724f81 Display supplier details on supplier page 2012-10-11 10:50:36 +11:00
Rohan Mitchell
a1b5102476 Fix checkout totals, also amend factories for valid test shipping method data 2012-09-21 12:35:01 +10:00
Rohan Mitchell
3894ce946d Fix error on supplier page, add test to cover 2012-09-19 15:46:56 +10:00
Rohan Mitchell
eaca160367 Set line item shipping method when added to cart, update specs for changes to line item shipping method 2012-09-19 15:01:50 +10:00
Rohan Mitchell
b87c59c051 Default to blank distributor on add to cart to require user to select one 2012-09-13 15:29:04 +10:00
Rohan Mitchell
f3ffba378a Add a product with variants to the cart with max quantity for a group buy 2012-08-03 18:05:45 +10:00
Rohan Mitchell
77be0dd6eb Adding a product with a max quantity less than quantity results in max_quantity==quantity 2012-08-02 15:26:13 +10:00
Rohan Mitchell
40544eb27b Adding a product to cart that is not a group buy does not show max quantity field 2012-08-02 15:16:44 +10:00
Rohan Mitchell
c46613877c Add max quantity field to add to cart form, add end-to-end test for max_quantity 2012-08-02 14:45:55 +10:00
Rohan Mitchell
93867682bb Only show distributors in sidebar that have products 2012-08-02 11:33:36 +10:00
Rohan Mitchell
aa027f6e29 Display subtotal for delivery fees 2012-07-02 16:13:55 +10:00
Rohan Mitchell
8156da509e Display distributor next collection time in checkout process 2012-07-02 14:32:53 +10:00
Rohan Mitchell
cb56e9f658 Display delivery fee breakdown along with cart 2012-07-01 19:09:34 +10:00
Rohan Mitchell
86847d99da Make Leave Distributor link more intuitive 2012-07-01 11:33:40 +10:00
Rohan Mitchell
af05448dd8 For check payment method, display description after purchase for use with EFT 2012-06-29 15:27:30 +10:00
Rohan Mitchell
73e601315b Add acceptance spec for itemwise shipping fees 2012-06-29 11:50:43 +10:00
Rohan Mitchell
d859999bdc Checkout spec passes 2012-06-27 09:11:40 +10:00
Rohan Mitchell
c5270d6fa1 Set shipping address from distributor, fix zone init in checkout spec 2012-06-27 09:06:18 +10:00
Rohan Mitchell
e0e566e625 Display distributor information on checkout address page 2012-06-26 16:04:59 +10:00
Rohan Mitchell
0662e8f676 Show links to distributor home page, particularly when viewing product not available at current distributor 2012-06-26 08:12:35 +10:00
Rohan Mitchell
9258d47e55 When adding subsequent products, add valid products to cart 2012-06-26 07:52:45 +10:00
Rohan Mitchell
32dca81467 Update spec for markup change 2012-06-25 09:10:34 +10:00
Rohan Mitchell
f4108921ed When adding subsequent product to cart, do not allow the user to add a product from another distributor 2012-06-25 08:45:08 +10:00
Rohan Mitchell
4481ca83f9 OrdersController does not permit adding products with invalid distributors 2012-06-24 19:58:09 +10:00
Rohan Mitchell
a41c5d4735 Move distributor permissions onto order class, do not show links to change distributor if the action is invalid 2012-06-24 15:15:53 +10:00
Rohan Mitchell
d3c80e99fc Do not allow changing distributor after product added to cart at controller level 2012-06-24 14:54:48 +10:00
Rohan Mitchell
3219006423 Push several request specs down to controller level, replace with scenario. Set order's distributor when adding product to cart 2012-06-24 13:21:36 +10:00
Rohan Mitchell
b5082009ce Add pending specs for adding products to cart with distributor 2012-06-24 12:13:13 +10:00
Rohan Mitchell
b2f5e23fa4 Test selecting distributor when adding item to cart, for no/remote distributor selected 2012-06-24 11:41:10 +10:00
Rohan Mitchell
a91722a593 Display distributor choice on add to cart form 2012-06-24 11:28:06 +10:00
Rohan Mitchell
34f95ffb4a Split products by local/remote distributor: apply to products, search results and taxon pages 2012-06-24 09:21:44 +10:00
Rohan Mitchell
5411685c83 Split products by local/remote distributor: logic 2012-06-24 07:36:56 +10:00
Rohan Mitchell
5e6c4de34b Leave a distributor 2012-06-23 12:33:38 +10:00
Rohan Mitchell
4b118a26ff Show distributor-scoped product counts next to taxons 2012-06-22 13:40:43 +10:00
Rohan Mitchell
4911a06c9d Display current distributor in main nav bar 2012-06-22 11:46:40 +10:00
Rohan Mitchell
03b87225d0 Add spec for selecting a distributor, add distributor to order model, add controller method for selecting distributor 2012-06-22 11:25:32 +10:00