raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 455 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

4351 Commits

Author SHA1 Message Date
Rohan Mitchell
a19e697556 Add header to admin enterprises page 2012-11-27 13:46:59 +11:00
Rohan Mitchell
5103ce64ba Output new order cycle as JSON 2012-11-27 10:51:22 +11:00
Rohan Mitchell
d5310452b6 Admin list order cycles 2012-11-27 10:13:12 +11:00
Rohan Mitchell
7a6d930706 Merge branch 'enterprise-fees' 2012-11-26 10:13:48 +11:00
Rohan Mitchell
7c5dcd6a90 Change angular_ prefix to ng_ 2012-11-26 10:03:20 +11:00
Rohan Mitchell
6106f1b469 Calculator type change works, enterprise fee tests pass 2012-11-26 09:45:06 +11:00
Rohan Mitchell
c46b858563 Don't render teh bits we dont wants 2012-11-23 17:20:52 +11:00
Rohan Mitchell
5e0a5654ff Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled. 2012-11-23 17:02:58 +11:00
Rob H
58a79e9b0c Minor changes to order confirm email 2012-11-23 16:06:25 +11:00
Rob H
ee482d520c Replace order information display for Confirm and Complete stages of checkout 2012-11-23 10:51:14 +11:00
Rob H
3d025bb709 WIP Replace order information display for Confirm and Complete stages of checkout 2012-11-23 09:26:27 +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
fd0cc93e68 Add delete link 2012-11-22 16:19:10 +11:00
Rohan Mitchell
2a645d04ae Move presentation to presenter, display calculator fields 2012-11-22 14:37:38 +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
58917fe378 Convert enterprise select and name entry into form fields 2012-11-22 08:58:08 +11:00
Rohan Mitchell
dd155532f8 Add angular include, basic controller for listing enterprise fees, display fee ids using angular 2012-11-21 14:59:02 +11:00
Rohan Mitchell
63ba5d13a3 Add representative, output enterprise fees as JSON 2012-11-21 14:58:29 +11:00
Rohan Mitchell
fa2addd025 Delete enterprise fee 2012-11-21 12:17:19 +11:00
Rohan Mitchell
77b78f5bbb Edit enterprise fee 2012-11-21 11:50:37 +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
Rohan Mitchell
a4d10ab4e0 Create new enterprise fee, display errors when present 2012-11-21 09:47:51 +11:00
Rob H
cbfb896ca4 Change 'Delivery Fees' to 'Distribution Costs' in cart 2012-11-17 11:46:43 +11:00
Rob H
59ca8f4513 Add cms field to cart page to explain delivery fees, located at cms path: /cart-delivery-fees 2012-11-16 18:32:02 +11:00
Rob H
573ba9c8d4 Merge remote-tracking branch 'origin/master' into checkout-changes 2012-11-16 16:10:51 +11:00
Rohan Mitchell
98143ffe5b Add calculator to EnterpriseFee, test passes for listing enterprise fees 2012-11-16 16:07:40 +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
03764881c8 Generalise EnterpriseSet to ModelSet 2012-11-15 14:29:38 +11:00
Rohan Mitchell
ec74396659 Add enterprise fees to admin configurations menu 2012-11-15 13:58:51 +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
8748a65031 Show role on admin enterprises listing page 2012-11-01 11:22:13 +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
682c09f516 Remove use of old Distributor model, fix before all not cleaning db 2012-11-01 10:05:39 +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
d927906934 Update admin views, tests pass 2012-11-01 08:36:40 +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
1d1c27701d Add admin interface for enterprises 2012-10-31 14:25:00 +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
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
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
01569c2550 Change button text on Payments page to 'Process My Order' 2012-10-26 16:47:42 +11:00