alexs
|
d3842b2d8d
|
Further compressed the landing page image to make it really light.
|
2013-08-15 11:34:48 +10:00 |
|
Andrew Spinks
|
d5791657f3
|
Support multiple orders when adding a product to a cart.
|
2013-08-14 10:49:55 +10:00 |
|
Andrew Spinks
|
dd3aaccf9f
|
When adding a variant to a cart, split into multiple orders depending on the distributors that it contains.
|
2013-08-14 10:49:55 +10:00 |
|
Andrew Spinks
|
59fce8a964
|
Show line items for each order in multi-cart.
|
2013-08-14 10:49:55 +10:00 |
|
Andrew Spinks
|
0a39fb87a5
|
Fix multi-cart association and add some temporary multi-cart support into the current front end.
|
2013-08-14 10:49:54 +10:00 |
|
David Cook
|
015dbc5c01
|
Only show active or complete order cycles, ordered by cycle close date
|
2013-08-13 16:47:23 +10:00 |
|
alexs
|
e90ccef337
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-13 11:40:54 +10:00 |
|
David Cook
|
6c4ace8d14
|
Ensure that all PaymentMethod-derived classes also allow distributor_id
|
2013-08-13 10:57:36 +10:00 |
|
David Cook
|
98d520f0e3
|
Filter PaymentMethods by distributor
|
2013-08-13 10:55:52 +10:00 |
|
David Cook
|
1621e4c4a4
|
Add distributor to PaymentMethod
|
2013-08-13 10:55:51 +10:00 |
|
Rohan Mitchell
|
f3447f2898
|
Remove shipping method field from product distributions
|
2013-08-13 10:14:51 +10:00 |
|
Rohan Mitchell
|
5f4313b588
|
Remove itemwise shipping calculator
|
2013-08-13 10:14:39 +10:00 |
|
Rohan Mitchell
|
7677f79f17
|
Remove the now-unused Product#shipping_method_for_distributor
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
7e30b664f2
|
Add enterprise fees relation to enterprise
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
9aad44f093
|
Strip shipping method mechanics out of LineItem and Order
|
2013-08-13 09:11:25 +10:00 |
|
alexs
|
03b36bb14b
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-12 17:35:36 +10:00 |
|
alexs
|
f2f507c5c7
|
Suburb auto-complete functionality for the new landing page.
|
2013-08-12 17:34:56 +10:00 |
|
David Cook
|
c645ad25a7
|
Add more order privileges for distributor enterprise users
|
2013-08-12 14:44:26 +10:00 |
|
Rohan Mitchell
|
af6b16ecc4
|
Admin can assign enterprise fees to product distributions
|
2013-08-12 11:05:00 +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
|
efc5943f57
|
Increase compression for landing page images.
|
2013-08-11 17:38:25 +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
|
4ff8e825e9
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-09 13:21:24 +10:00 |
|
alexs
|
b5cc2ab4cf
|
Added postcode search that redirect to page with map view.
|
2013-08-09 13:20:22 +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
|
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
|
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 |
|