Rohan Mitchell
c39bd6b59d
Remove shipping methods with the now-absent itemwise calculator
2013-08-14 11:27:16 +10:00
Andrew Spinks
0f1142fc30
Define class used in migration.
2013-08-14 10:49:55 +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
c011de539d
Update rake task for product distribution fees by enterprise fee
2013-08-13 09:11:25 +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
Rohan Mitchell
ba0b3bad85
Convert product distribution shipping methods to enterprise fees
2013-08-12 10:00:35 +10:00
Andrew Spinks
7fe1aab903
Simplest version of a cart that supports multiple orders.
2013-08-08 18:31:56 +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
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
Andrew Spinks
7fbb5b13fb
Fix line item cache migration to work across orders in the staging servers.
2013-08-07 12:44:05 +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
d8b7a05441
Add EnterpriseFee to ProductDistributions
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
17f9a4645a
Added login to the landing page.
2013-08-06 12:34:22 +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
0bb4f676e1
Add permissions to enterprise users so they can manage their own products.
2013-08-02 11:51:25 +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
122b9b5617
Make order cycle coordinator fees many-to-many
2013-07-30 11:34:10 +10:00
Andrew Spinks
7cb054f430
Merge branch 'master' into order-cycle-selection
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/spree/orders_controller_decorator.rb
app/models/enterprise.rb
app/models/spree/order_decorator.rb
app/views/spree/checkout/_other_available_distributors.html.erb
app/views/spree/products/_add_to_cart.html.haml
lib/open_food_web/distributor_change_validator.rb
spec/spec_helper.rb
2013-07-23 14:42:57 +10:00
Rohan Mitchell
fe61cddda6
Merge branch 'local-organics'
...
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/store/variables.css.scss
app/overrides/add_feedback_script.rb
app/views/spree/shared/_order_details_steps_data.html.erb
db/schema.rb
script/rails
spec/spec_helper.rb
2013-07-23 11:40:03 +10:00
Rob H
7941a61879
WIP (Spree Update): Update Spree 1.3.3, install and run migrations
2013-07-23 10:43:08 +10:00
alexs
40bd0e9c58
Fixed product seed.
2013-07-22 11:48:59 +10:00
Rohan Mitchell
cbeffaced1
Configure Travis, remove spork, add simplecov, add turbo sprokets.
...
Add travis config
(cherry picked from commit e3fdb12289719ef386bfd60935c8002b192538953a441cd7d9b030793f15cdc3ab09a172aa8fe5e572aa8fe5e5bd5533e2b15089d3bb223e6c56a638ed7bded642fa11ff89821e94f88c5e
2013-06-07 16:23:24 +10:00
Rohan Mitchell
1b6bf6ca2b
Add distributor info field to enterprises
2013-04-26 12:31:19 +10:00
Rohan Mitchell
dc54be992b
Require spree support file that provides a default shipping method for ProductDistributions when building from factory - fixes product seeds
2013-04-21 08:54:32 +10:00
Rohan Mitchell
63f3504b81
Add order cycle reference to orders
2013-03-08 15:15:15 +11:00
Rohan Mitchell
b030793f15
Fix migrations that fail because of coupling to changed/removed models
2013-02-24 19:09:43 +11:00
Rohan Mitchell
3982b2a690
Merge branch 'new-spree'
...
Conflicts:
Gemfile.lock
2013-02-20 15:24:27 +11:00
Andrew Spinks
5e2fbcb874
Add script to sanitize order and user data.
2013-02-10 16:54:39 +11:00
Rob H
c517469662
Added down method to remove_display_on_from_payment_methods migration
2013-02-07 22:54:07 +11:00
Rob H
1ead1dadaf
Upgrade database to Spree 1.3
2013-02-07 15:58:15 +11:00
Rob H
109d5cfe67
Upgrade database to Spree 1.2
2013-02-07 15:34:00 +11:00
Rob H
62d6745f02
Rollback all Spree 1.3 migrations (forgot db/schema.rb)
2013-02-07 15:24:59 +11:00
Rob H
bdea85d1b4
Rollback all Spree 1.3 migrations
2013-02-07 15:24:17 +11:00
Rob H
612017f143
WIP Upgrade to Spree 1.3
2013-02-05 15:01:45 +11:00
Rohan Mitchell
9a03a58d9e
Change exchange pickup time from datetime to string
2013-01-18 14:23:58 +11:00
Rohan Mitchell
6b97872a25
Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants
2012-11-26 11:03:44 +11:00
Rohan Mitchell
192d4993a1
Add EnterpriseFee model
2012-11-15 13:42:55 +11:00
Rohan Mitchell
80159e1ea7
Do not munge foreign keys when migrating to enterprises
2012-11-02 15:34:02 +11:00
Rohan Mitchell
c2133d70ac
Rename Enterprise is_supplier scope to is_primary_producer
2012-11-01 15:02:57 +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
13d6f7213e
Fix db seeds
2012-11-01 10:21:55 +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
f8c2c8bbed
Convert group buy unit size field from string to float
2012-11-01 08:02:11 +11:00
Rohan Mitchell
309179096b
Update supplier_id and distributor_id to point to newly created enterprises
2012-10-31 16:56:35 +11:00
