raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 18 Branches 451 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

1343 Commits

Author SHA1 Message Date
Andrew Spinks
ac37dff946 Add controller for cart and beginnings of an API. 2013-08-08 18:31:56 +10:00
Andrew Spinks
7fe1aab903 Simplest version of a cart that supports multiple orders. 2013-08-08 18:31:56 +10:00
alexs
f45ed42bdb Skeleton for the search results. 2013-08-08 11:42:45 +10:00
alexs
7f74b85040 Markup tweak. 2013-08-07 19:26:21 +10:00
alexs
8efc95e095 Separated Foundation powered site from the Spree powered content (for now). 2013-08-07 19:25:48 +10:00
alexs
1992675794 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-07 14:09:30 +10:00
alexs
ef39d0ce31 Geocoded Spree addresses 2013-08-07 14:01:27 +10:00
David Cook
c247c2d3ea WIP: Allow distributor enterprise user to access their orders 2013-08-07 09:19:28 +10:00
alexs
3f82147024 Merge branch 'master' of github.com:eaterprises/openfoodweb 
Conflicts:
	db/schema.rb
 2013-08-06 18:32:53 +10:00
alexs
82ea8adfe3 Added list of geocoded suburbs. 2013-08-06 18:31:08 +10:00
Rohan Mitchell
cfb8c05cb5 Remove association that's already added by Spree's calculated_adjustments 2013-08-06 13:47:17 +10:00
Rohan Mitchell
d8b7a05441 Add EnterpriseFee to ProductDistributions 2013-08-06 13:47:17 +10:00
Rohan Mitchell
ec3e00c128 Refactor LineItem and clients for new fields 2013-08-06 13:47:17 +10:00
alexs
57e185af78 Merge branch 'landing_page' 2013-08-06 12:35:06 +10:00
alexs
17f9a4645a Added login to the landing page. 2013-08-06 12:34:22 +10:00
David Cook
fd8fc480dc Always show supplier form for enterprise user again (list is now filtered according to enterprise_roles) 2013-08-06 10:56:31 +10:00
alexs
24d559cd3a Merge branch 'master' into landing_page 
Conflicts:
	db/schema.rb
	db/seeds.rb
 2013-08-05 17:08:39 +10:00
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +10:00
David Cook
a2b612e723 Add clone and destroy product access for enterprise users 2013-08-05 15:21:20 +10:00
Andrew Spinks
e75021d7bd Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way. 2013-08-02 18:13:42 +10:00
Andrew Spinks
9d32a5775a Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products. 2013-08-02 16:08:10 +10:00
Andrew Spinks
0bb4f676e1 Add permissions to enterprise users so they can manage their own products. 2013-08-02 11:51:25 +10:00
Andrew Spinks
46474ea4cc Prevent order cycle validations on orders when feature toggled off. 2013-08-01 15:01:47 +10:00
Andrew Spinks
65617e0e77 Add enterprise roles for a user and wire up interface. 2013-08-01 10:32:50 +10:00
Andrew Spinks
4f5679aac3 Add EnterpriseRole model and link up to users and enterprises. 2013-08-01 10:32:49 +10:00
Rohan Mitchell
4a893fd548 Style 2013-07-30 13:49:38 +10:00
Rohan Mitchell
4a0e35deef Clear coordinator fees when coordinator changes 2013-07-30 13:46:30 +10:00
Rohan Mitchell
d64bcf0e94 Remove coordinator fees 2013-07-30 11:55:21 +10:00
Rohan Mitchell
24b957dc57 Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees. 2013-07-30 11:34:10 +10:00
Rohan Mitchell
dc7f8986a0 Click to add coordinator fee 2013-07-30 11:34:10 +10:00
Rohan Mitchell
ae0f82b479 Display only coordinator fees belonging to the selected coordinator 2013-07-30 11:34:10 +10:00
Rohan Mitchell
43474d6408 Display coordinator fees on admin edit order cycle 2013-07-30 11:34:10 +10:00
Rohan Mitchell
13a1809d6c Load enterprise fees in controllers 2013-07-30 11:34:10 +10:00
Rohan Mitchell
93e7ac53ad Add EnterpriseFee service for order cycles admin 2013-07-30 11:34:10 +10:00
Rohan Mitchell
f613da30d0 Output order cycle coordinator fees in JSON 2013-07-30 11:34:10 +10:00
Rohan Mitchell
a19a43da79 Add blank enterprise fees in js rather than in controller 2013-07-30 11:34:10 +10:00
Rohan Mitchell
122b9b5617 Make order cycle coordinator fees many-to-many 2013-07-30 11:34:10 +10:00
Andrew Spinks
d107786614 Make sure the payment details are shown prominently in the checkout screen. 2013-07-29 16:29:27 +10:00
Rohan Mitchell
36a124c10e Fix merge issues: DCV name change and application controller var name issues. 2013-07-29 11:49:43 +10:00
Rohan Mitchell
7640eb497a Merge branch 'supplied-active-products-on-hand' 
Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb
 2013-07-29 11:05:42 +10:00
Andrew Spinks
5adab948c9 Re-instate old order checkout behaviour. 2013-07-26 14:30:54 +10:00
Andrew Spinks
6c18c5c65f Fix bulk product edit so that it works with products with a blank available_on field. 2013-07-25 13:51:37 +10:00
Andrew Spinks
39536b2a13 And another dependency getting lost. 2013-07-24 17:52:15 +10:00
Andrew Spinks
54a79bc6ab Fix other dependency injection problems in bpe angular code after magnification. 2013-07-24 17:47:48 +10:00
Andrew Spinks
24414036b9 Attempt to fix bulk product angular dependency injection which breaks on minification. 2013-07-23 18:16:39 +10:00
Rohan Mitchell
dd97768947 Merge branch 'move-save-checkout-button' 
Conflicts:
	spec/features/consumer/checkout_spec.rb
 2013-07-23 17:03:00 +10:00
Rohan Mitchell
638d7b1c33 Stylistic changes, extract commented code to private method 2013-07-23 17:02:06 +10:00
Rohan Mitchell
2f83cecc23 Merge branch 'add-capture-order-shortcut-deface' 
Conflicts:
	spec/support/request/authentication_workflow.rb
 2013-07-23 16:55:33 +10:00
Rohan Mitchell
d83e8cb3ba Remove commented out code, clean up comments and style 2013-07-23 16:51:22 +10:00
Rohan Mitchell
1dd92d0133 Move deface to a partial 2013-07-23 16:50:42 +10:00