raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 19 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

352 Commits

Author SHA1 Message Date
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
4f5679aac3 Add EnterpriseRole model and link up to users and enterprises. 2013-08-01 10:32:49 +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
Rohan Mitchell
cbeffaced1 Configure Travis, remove spork, add simplecov, add turbo sprokets. 
Add travis config
(cherry picked from commit e3fdb12289)

Only build on Ruby 1.9.3
(cherry picked from commit 719ef386bf)

Exclude pry from CI build
(cherry picked from commit d60935c800)

Conflicts:

	Gemfile

Attempt 2
(cherry picked from commit 2b19253895)

Conflicts:

	Gemfile.lock

Configure travis for postgres
(cherry picked from commit 3a441cd7d9)

Fix migrations that fail because of coupling to changed/removed models
(cherry picked from commit b030793f15)

Set up xvfb for Travis
(cherry picked from commit cdc3ab09a1)

Add a failing test to test travis
(cherry picked from commit 72aa8fe5e5)

Revert "Add a failing test to test travis"

This reverts commit 72aa8fe5e5.
(cherry picked from commit bd5533e2b1)

Add simplecov
(cherry picked from commit 5089d3bb22)

Conflicts:

	Gemfile.lock

Add turbo sprockets for faster asset precompile
(cherry picked from commit 3e6c56a638)

Remove spork
(cherry picked from commit ed7bded642)

Conflicts:

	spec/spec_helper.rb

Remove more spork-specific things, remove unused cuc config from zeus
(cherry picked from commit fa11ff8982)

Ensure order decorator is required, fix test fragility
(cherry picked from commit 1e94f88c5e)
 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
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
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
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
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
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
Rohan Mitchell
b9a072b61a Make sure enterprises have a valid address after pickup address field has been removed 2012-10-31 14:32:47 +11:00
Rohan Mitchell
04d8648c6d Remove pickup address and use single address field for supplier and distributor roles within enterprise 2012-10-28 18:03:19 +11:00
Rohan Mitchell
ff24149195 Combine suppliers and distributors into enterprises table 2012-10-28 12:59:50 +11:00
Rohan Mitchell
c46019d68c WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
9166829930 Add group buy unit size field 2012-10-18 11:56:21 +11:00
Rohan Mitchell
d080aa49d5 Add long description field to distributors and suppliers 2012-10-11 10:50:36 +11:00
Rohan Mitchell
b35fb618f3 Add base install of Comfortable Mexican Sofa 2012-10-11 10:50:36 +11:00
Rohan Mitchell
568d948cbe Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method. 2012-10-05 12:09:53 +10:00
Rohan Mitchell
5402590d5f Add debug output on line item migration for lost data 2012-09-19 15:08:05 +10:00
Rohan Mitchell
85f18cfb12 Rob: Replace LineItem shipping_method method with relation 2012-09-19 14:27:28 +10:00
Rohan Mitchell
3794c00856 Upgrade Rails to 3.2.8 and Spree to 1.1.3 2012-09-14 10:20:52 +10:00
Rohan Mitchell
330c62716c Add fields for group buy feature 2012-08-02 13:15:17 +10:00
Rohan Mitchell
718e54f933 Add distributor next_collection_at field, bulk edit in admin backend 2012-07-02 14:24:52 +10:00
Rohan Mitchell
82dd485e01 Install spree_paypal_express gem 2012-06-29 14:40:20 +10:00
Rohan Mitchell
1d5e4d22e7 Add pending spree migrations 2012-06-29 14:34:19 +10:00
Rohan Mitchell
3f08c2a9b0 Convert distributors_products join table into ProductDistribution explicit join model 2012-06-27 11:55:10 +10:00
Rohan Mitchell
ba3c02346d Extract distributor and supplier address to spree address model 2012-06-26 14:52:55 +10:00
Rohan Mitchell
03b87225d0 Add spec for selecting a distributor, add distributor to order model, add controller method for selecting distributor 2012-06-22 11:25:32 +10:00
Rohan Mitchell
3b075a7c14 Change product-distributor relation to *..* 2012-06-18 19:43:30 +10:00
Rohan Mitchell
82ca7112c2 Remove distributor association from orders and from the checkout process 2012-06-18 17:01:08 +10:00
Andrew Spinks
04e4523f6b upgrade to spree 1.1 2012-05-20 16:28:14 +10:00
Andrew Spinks
c9effe5926 Add seperate address fields - don't become too attached to spree. 2012-04-29 17:31:47 +10:00
Andrew Spinks
e4fd20b807 Add default supplier view and relationship to address. 2012-04-29 16:32:38 +10:00
Andrew Spinks
7ea0f73398 begin adding suppliers 2012-04-22 14:51:24 +10:00
Andrew Spinks
48c6f4d7cc default states to current zone. 2012-04-22 12:10:35 +10:00
Andrew Spinks
f7372a80c2 add distributor to checkout 2012-04-09 09:56:37 +10:00