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
|
7d2e6c57bc
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-08 11:43:26 +10:00 |
|
alexs
|
f45ed42bdb
|
Skeleton for the search results.
|
2013-08-08 11:42:45 +10:00 |
|
Andrew Spinks
|
7bd0582b50
|
remove pry call
|
2013-08-08 10:48:05 +10:00 |
|
alexs
|
44e06fe7fc
|
Added search stuff to the least of assets to precompile.
|
2013-08-08 10:43:21 +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
|
97ff668029
|
Fixed the finder ('all' finder was used in seed test instead of singular one).
|
2013-08-07 19:24:57 +10:00 |
|
alexs
|
28f94ae959
|
Stubbed out geolocation.
|
2013-08-07 18:03:41 +10:00 |
|
alexs
|
1992675794
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-07 14:09:30 +10:00 |
|
alexs
|
999ba2cf56
|
Added more real australian addresses to seed data as well some enterprises that use those addresses.
|
2013-08-07 14:07:55 +10:00 |
|
alexs
|
00743fada8
|
Added foundation gem to the right group.
|
2013-08-07 14:06:40 +10:00 |
|
alexs
|
ef39d0ce31
|
Geocoded Spree addresses
|
2013-08-07 14:01:27 +10:00 |
|
Andrew Spinks
|
7fbb5b13fb
|
Fix line item cache migration to work across orders in the staging servers.
|
2013-08-07 12:44:05 +10:00 |
|
David Cook
|
c247c2d3ea
|
WIP: Allow distributor enterprise user to access their orders
|
2013-08-07 09:19:28 +10:00 |
|
David Cook
|
577b114662
|
Add distributor and supplier users to load_sample_data task
|
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
|
f1dbc03401
|
Use correct amount for order total in spec
|
2013-08-06 13:47:17 +10:00 |
|
Rohan Mitchell
|
8fdf0b6ff9
|
Fix payment not being captured due to being to small to cover order's distribution fee
|
2013-08-06 13:47:17 +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 |
|
Rohan Mitchell
|
be1127b414
|
Migrate line item shipping_method cache to distribution_fee/shipping_method_name
|
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
|
27c17d6b07
|
Test that enterprise user can't access other enterprises' products
|
2013-08-06 11:22:44 +10:00 |
|
David Cook
|
0a7c5d4992
|
Add cancan ability tests on enterprise user roles
|
2013-08-06 11:12:37 +10:00 |
|
David Cook
|
7a92d99817
|
Remove unnecessary test on editing product (now tested under cancan abilities)
|
2013-08-06 11:12:06 +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 |
|
David Cook
|
2347acc2c1
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-06 09:23:30 +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 |
|
David Cook
|
c40d694a15
|
Output correct task name
|
2013-08-05 15:20:35 +10:00 |
|
Andrew Spinks
|
b0d9596489
|
Fix bug with available on translation - seemed to be getting overridden.
|
2013-08-05 10:00:47 +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
|
269294612d
|
Add product tests for an enterprise user.
|
2013-08-02 14:01:45 +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
|
5bccd38b5e
|
Fix tests - don't have feature toggle overrides on when running tests!
|
2013-08-01 15:37:42 +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
|
287bd57a4e
|
Fix loading of initial data to ensure there is an itemwise shipping method.
|
2013-08-01 10:52:06 +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 |
|
Andrew Spinks
|
5810503068
|
Move test data seeding into separate rake task. Add new role to seeds file.
|
2013-08-01 10:31:58 +10:00 |
|
Rohan Mitchell
|
c64944d11a
|
Fix test
|
2013-07-30 17:32:53 +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 |
|