raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-26 01:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
290 Commits 17 Branches 454 Tags
34588e6141fcbeda949c8461e151ae3217a17dd4
Commit Graph

290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
34588e6141 Remove old supplier and distributor routes, models, controllers, views, specs 2012-11-01 09:55:45 +11:00
Rohan Mitchell
d927906934 Update admin views, tests pass 2012-11-01 08:36:40 +11:00
Rohan Mitchell
58d227e76a Home controller and product model specs pass 2012-11-01 08:28:40 +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
1b89331aa4 Update capybara and selenium-webdriver for compatibility with firefox 16 2012-10-31 17:09:26 +11:00
Rohan Mitchell
309179096b Update supplier_id and distributor_id to point to newly created enterprises 2012-10-31 16:56:35 +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
a8f4178894 Update orders controller for enterprises 2012-10-31 16:33:38 +11:00
Rohan Mitchell
b9a072b61a Make sure enterprises have a valid address after pickup address field has been removed 2012-10-31 14:32:47 +11:00
Rohan Mitchell
1d1c27701d Add admin interface for enterprises 2012-10-31 14:25:00 +11:00
Rohan Mitchell
077098e6c1 Refactor libs to use enterprise instead of supplier and distributor 2012-10-29 14:57:03 +11:00
Rohan Mitchell
04d8648c6d Remove pickup address and use single address field for supplier and distributor roles within enterprise 2012-10-28 18:03:19 +11:00
Rohan Mitchell
4c2debba7e Model specs pass 2012-10-28 18:00:15 +11:00
Rohan Mitchell
abe3feb996 Integrate functionality from distributor into enterprise 2012-10-28 17:46:45 +11:00
Rohan Mitchell
c700d9e71b Create enterprise model, integrate functionality from supplier 2012-10-28 13:24:26 +11:00
Rohan Mitchell
ff24149195 Combine suppliers and distributors into enterprises table 2012-10-28 12:59:50 +11:00
Rohan Mitchell
09b60908b8 Fix links to admin distributor edit and delete 2012-10-25 12:20:20 +11:00
Rohan Mitchell
d1b9ce92f6 Move distributors helper out of spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
784969097d Move admin non-Spree controllers 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
c46019d68c WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
aa336d9b9f Merge branch 'feedback' 0.2.7 2012-10-25 10:34:27 +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
51850be83e Update spree_paypal_express to handle blank states from paypal 0.2.6 2012-10-24 16:19:53 +11:00
Rohan Mitchell
32db258db0 Use spree_heroku with support for staging env 2012-10-24 13:11:40 +11:00
Rob H
4c0109bccc Merge branch 'master', remote-tracking branch 'origin' 2012-10-22 11:15:23 +11:00
Rob H
f83a5b0ba8 Merge branch 'master', remote-tracking branch 'origin' 2012-10-22 10:45:35 +11:00
Rohan Mitchell
87a89324d9 Update repo in readme, add Rob to creds 2012-10-19 17:02:09 +11:00
Rohan Mitchell
4fc7295b97 Use S3 configuration from environment vars instead of s3.yml 2012-10-19 16:40:18 +11:00
Rohan Mitchell
5b025a6cba Make group_buy_unit_size accessible 2012-10-18 15:15:54 +11:00
Rohan Mitchell
9166829930 Add group buy unit size field 2012-10-18 11:56:21 +11:00
Rohan Mitchell
8c7a02ec10 Fix image uploads with CMS 2012-10-18 11:13:40 +11:00
Rohan Mitchell
f4f250675c Use eaterprises spree_paypal_express with Bugsnag notification of paypal gateway errors 0.2.5 2012-10-18 10:30:35 +11:00
Rohan Mitchell
394a269df2 Update Spree, fixes paypal password blanking bug. Update spree_paypal_express, fixes nil state error on checkout. 2012-10-18 10:17:52 +11:00
Rohan Mitchell
41dcc85ad1 Update version of spree_paypal_express for debugging 2012-10-17 15:26:06 +11:00
Rohan Mitchell
9be9d75cb5 Update version of spree_paypal_express for debugging 2012-10-17 15:10:04 +11:00
Rohan Mitchell
11483a77e8 Update bugsnag and spree_paypal_express for paypal error debugging 0.2.4 2012-10-17 08:42:33 +11:00
Rohan Mitchell
ba895ed486 Display CMS content for suppliers page 2012-10-17 07:54:12 +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
642f58551c Use spree_paypal_express from RohanM with debugging for nil state from paypal address error 0.2.3 2012-10-16 10:34:11 +11:00
Rohan Mitchell
9fbcd8c01b Display CMS pages with Spree's layout 0.2.2 2012-10-12 10:21:21 +11:00
Rohan Mitchell
927970d1a9 Viewing another products listing page does not display home page content 0.2.1 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
015b7f88b0 Add tests for CMS admin security 2012-10-11 13:17:05 +11:00
Rohan Mitchell
28fc16ac66 Create links between Spree and CMS admin sections 2012-10-11 12:50:59 +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
48497266da Precompile CMS assets 2012-10-11 11:06:52 +11:00