raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 19 Branches 453 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

140 Commits

Author SHA1 Message Date
Rob H
2786791c39 Change location of checkout delivery page cms from /delivery to /distribution 2012-11-21 16:14:56 +11:00
Rob H
b34d9da8e5 Add cms field to cart page to explain cart, located at cms path: /cart 2012-11-21 16:00:51 +11:00
Rohan Mitchell
bcc2ef99fd Ensure that AUTH_TOKEN var is set in tests, since spree's admin JS errors without it 2012-11-21 11:49:59 +11:00
Rob H
573ba9c8d4 Merge remote-tracking branch 'origin/master' into checkout-changes 2012-11-16 16:10:51 +11:00
Rohan Mitchell
ec74396659 Add enterprise fees to admin configurations menu 2012-11-15 13:58:51 +11:00
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
34588e6141 Remove old supplier and distributor routes, models, controllers, views, specs 2012-11-01 09:55:45 +11:00
Rohan Mitchell
1d1c27701d Add admin interface for enterprises 2012-10-31 14:25:00 +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
Rob H
7da595afbd Add cms field to top of delivery page of checkout, located at cms path: /delivery 2012-10-26 19:29:55 +11:00
Rob H
01569c2550 Change button text on Payments page to 'Process My Order' 2012-10-26 16:47:42 +11:00
Rohan Mitchell
784969097d Move admin non-Spree controllers out of Spree namespace 2012-10-25 10:45:39 +11:00
Rob H
ff029b8903 Add feedback bar to all pages on the front end 2012-10-24 18:26:21 +11:00
Rohan Mitchell
28fc16ac66 Create links between Spree and CMS admin sections 2012-10-11 12:50:59 +11:00
Rohan Mitchell
356ae40c7b Display product descriptions as HTML in checkout 2012-09-13 13:05:12 +10:00
Rohan Mitchell
361a87f580 Add group buy option to new/edit product in admin 2012-08-02 13:42:47 +10:00
Rohan Mitchell
1e471e5e22 Name all form-containing partials with _form, tweak admin new product form 2012-07-02 16:28:31 +10:00
Rohan Mitchell
cb56e9f658 Display delivery fee breakdown along with cart 2012-07-01 19:09:34 +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
474c049f0d Set up basic form for admin editing product distributions (not yet functional) 2012-06-28 15:13:26 +10:00
Rohan Mitchell
e0e566e625 Display distributor information on checkout address page 2012-06-26 16:04:59 +10:00
Rohan Mitchell
f75b9bb176 Swap order of continue shopping and empty cart buttons 2012-06-26 10:58:09 +10:00
Rohan Mitchell
cb6ac2064d Rearrange buttons on cart checkout form 2012-06-26 10:50:50 +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
32050bbba4 Split products by local/remote distributor: views and basic style 2012-06-24 07:37:25 +10:00
Rohan Mitchell
f9d290f00d Show product supplier and distributors on product details page 2012-06-20 16:28:09 +10:00
Rohan Mitchell
103aad467c Tweak override names 2012-06-20 16:00:39 +10:00
Rohan Mitchell
423ab26a1a Show product filters in sidebar on all pages 2012-06-20 14:15:58 +10:00
Rohan Mitchell
b89562823b Add distributors to admin product forms 2012-06-19 10:39:08 +10:00
Andrew Spinks
5088363c84 add supplier to product on admin views. 2012-04-29 18:35:14 +10:00
Andrew Spinks
7ea0f73398 begin adding suppliers 2012-04-22 14:51:24 +10:00
Andrew Spinks
48c6f4d7cc default states to current zone. 2012-04-22 12:10:35 +10:00
Andrew Spinks
f075c50926 disable distributors in checkout - broken states. 2012-04-09 10:50:56 +10:00
Andrew Spinks
2e9e441ba1 fix bug with states screwing up when using deface. 2012-04-09 10:31:47 +10:00
Andrew Spinks
f7372a80c2 add distributor to checkout 2012-04-09 09:56:37 +10:00
Andrew Spinks
b2b8bd0112 add selector for distributor in checkout. Not saving relation as yet. 2012-04-07 16:34:27 +10:00
Andrew Spinks
3f1ed0ca06 make distributors work in spree admin framework. 2012-04-07 12:10:44 +10:00