David Cook
|
c915bb91cf
|
More tests for distributor enterprise user roles
|
2013-08-12 14:44:26 +10:00 |
|
Rohan Mitchell
|
d7cce918f5
|
Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees
|
2013-08-12 14:22:11 +10:00 |
|
Rohan Mitchell
|
f1485bf9c5
|
Remove shipping method from product distribution in factory.
|
2013-08-12 14:21:39 +10:00 |
|
Rohan Mitchell
|
af6b16ecc4
|
Admin can assign enterprise fees to product distributions
|
2013-08-12 11:05:00 +10:00 |
|
Rohan Mitchell
|
7ea1122833
|
Make spec naming consistent
|
2013-08-12 10:13:31 +10:00 |
|
Rohan Mitchell
|
14268b7be0
|
Create adjustment metadata when creating adjustment
|
2013-08-12 10:00:35 +10:00 |
|
Rohan Mitchell
|
149d48ff5a
|
Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation
|
2013-08-12 10:00:35 +10:00 |
|
alexs
|
653525e9b0
|
Updated the spec to reflect the field name change.
|
2013-08-11 17:19:17 +10:00 |
|
Rohan Mitchell
|
b065d7db36
|
When updating product distribution charge, skip line items that don't have a product distribution
|
2013-08-09 15:30:35 +10:00 |
|
Rohan Mitchell
|
b4a7ccf1b4
|
Adjustments on LineItems don't modify the order total. Make adjustments on Order instead.
|
2013-08-09 15:28:48 +10:00 |
|
Rohan Mitchell
|
513993324d
|
Clean up old adjustments when changing distributor
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
fd989e3a77
|
Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items.
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
239dd29511
|
Weight calculator will calculate against a single line item as well as an order
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
a338c974f8
|
Create line item adjustments for product distributions
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
8c9a3c8a91
|
Add Product#product_distribution_for
|
2013-08-09 15:26:57 +10:00 |
|
alexs
|
295d86affb
|
Removed the test that is believed to be incorrect and failing build.
|
2013-08-09 14:44:54 +10:00 |
|
alexs
|
4ff8e825e9
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-09 13:21:24 +10:00 |
|
alexs
|
39623d45d6
|
Tests for building full addresses.
|
2013-08-09 13:19:07 +10:00 |
|
alexs
|
3b4c02865f
|
Tests for logging in from the new landing page.
|
2013-08-09 13:16:58 +10:00 |
|
alexs
|
7c96c17c88
|
Tests for geo search.
|
2013-08-09 13:15:36 +10:00 |
|
alexs
|
1ca306e09e
|
Added RSpec matchers to test delegations.
|
2013-08-09 13:14:49 +10:00 |
|
Andrew Spinks
|
bc57364c7e
|
Add simple angular cart to the main page.
|
2013-08-08 18:31:56 +10:00 |
|
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 |
|
Andrew Spinks
|
7bd0582b50
|
remove pry call
|
2013-08-08 10:48:05 +10:00 |
|
alexs
|
28f94ae959
|
Stubbed out geolocation.
|
2013-08-07 18:03:41 +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
|
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
|
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
|
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 |
|
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 |
|
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
|
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
|
c64944d11a
|
Fix test
|
2013-07-30 17:32:53 +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 |
|