raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
610 Commits 19 Branches 453 Tags
02561ee252fa054c5db3d46c604d70ebe030074d
Commit Graph

47 Commits

Author SHA1 Message Date
Rob H
99b4530db2 WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name 2013-02-07 13:07:14 +11:00
Rob H
612017f143 WIP Upgrade to Spree 1.3 2013-02-05 15:01:45 +11:00
Rohan Mitchell
1d357af708 Disable Jirafe and UserVoice outside of production -> test speedup 2013-01-09 09:14:43 +11:00
Rohan Mitchell
9a9bef5304 Report filtering on completion date, not creation date 2012-11-09 20:31:08 +11:00
Rohan Mitchell
c2133d70ac Rename Enterprise is_supplier scope to is_primary_producer 2012-11-01 15:02:57 +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
d927906934 Update admin views, tests pass 2012-11-01 08:36:40 +11:00
Rohan Mitchell
5ac904005b Merge branch 'order-cycle-reports' 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb
 2012-10-31 10:18:11 +11:00
Rohan Mitchell
a3042118c7 Merge branch 'group-reports' 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb
 2012-10-26 17:14:49 +11:00
Rob H
d74591afe6 Fixes to reports controller and addition of order cycles reports 2012-10-26 13:44:13 +11:00
Rohan Mitchell
784969097d Move 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
Rob H
81b33772fe Fixes to syntax and formatting for group-reports 2012-10-24 15:21:16 +11:00
Rob H
3b855a866a Merge branch 'grouper-reports' into group-reports 2012-10-22 11:35:56 +11:00
Rob H
ddb01e4ccb WIP: Create report grouper, write reports for bulk co-ops and payments 2012-10-21 13:12:48 +11:00
Rohan Mitchell
9166829930 Add group buy unit size field 2012-10-18 11:56:21 +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
7432cb416e Andand all the html_safes 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
c07a33d88c Edit long description field in admin for suppliers and distributors 2012-10-11 10:50:36 +11:00
Rob H
5803da9c55 Syntax fixes for group buy report classes and tests 2012-10-10 15:13:15 +11:00
Rob H
9737f21bb8 WIP: Write body of group buy report 2012-10-10 13:46:51 +11:00
Rohan Mitchell
3f15fc0b52 Set default admin orders view to sort with most recent orders first 2012-09-14 13:27:33 +10:00
Rohan Mitchell
9110dc6414 Fix form local var naming for admin shared address form 2012-08-02 15:33:39 +10:00
Rohan Mitchell
361a87f580 Add group buy option to new/edit product in admin 2012-08-02 13:42:47 +10:00
Andrew Spinks
2826f62497 Add extra details to the order report. 2012-07-20 20:25:53 +10:00
Andrew Spinks
7e9a84087e cleaning up order report 2012-07-19 22:48:42 +10:00
Andrew Spinks
58e9cd3eeb fix distributor name in report 2012-07-15 21:00:10 +10:00
Andrew Spinks
54559c4a5f first cut at orders report. 2012-07-15 20:48:10 +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
6f581fce43 Admin can edit next collection date/time when editing an individual distributor 2012-07-02 14:36:45 +10:00
Rohan Mitchell
718e54f933 Add distributor next_collection_at field, bulk edit in admin backend 2012-07-02 14:24:52 +10:00
Rohan Mitchell
c09d4c98c8 Product distributions now editable 2012-06-28 15:38:26 +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
4b9c0f01e2 Update admin backend for supplier/distributor address extraction 2012-06-26 14:54:35 +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
c9effe5926 Add seperate address fields - don't become too attached to spree. 2012-04-29 17:31:47 +10:00
Andrew Spinks
e4fd20b807 Add default supplier view and relationship to address. 2012-04-29 16:32:38 +10:00
Andrew Spinks
7ea0f73398 begin adding suppliers 2012-04-22 14:51:24 +10:00
Andrew Spinks
4ad11c1faf delete and edit distributors 2012-04-22 13:01:56 +10:00
Andrew Spinks
48c6f4d7cc default states to current zone. 2012-04-22 12:10:35 +10:00
Andrew Spinks
088febfe7b dont barf on distributors without a country. 2012-04-09 10:37:35 +10:00
Andrew Spinks
f7372a80c2 add distributor to checkout 2012-04-09 09:56:37 +10:00
Andrew Spinks
3f1ed0ca06 make distributors work in spree admin framework. 2012-04-07 12:10:44 +10:00
Andrew Spinks
0a6852616d added distributors. 2012-03-31 19:16:57 +11:00