raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

113 Commits

Author SHA1 Message Date
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 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
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
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +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
1d1c27701d Add admin interface for enterprises 2012-10-31 14:25:00 +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
a3042118c7 Merge branch 'group-reports' 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb
 2012-10-26 17:14:49 +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
Rob H
81b33772fe Fixes to syntax and formatting for group-reports 2012-10-24 15:21:16 +11:00
Rohan Mitchell
9166829930 Add group buy unit size field 2012-10-18 11:56:21 +11:00
Rohan Mitchell
c05911fa10 Fix spree_creditcards table renamed in Spree 1.2 upgrade, remove old pending test 2012-10-11 10:50:37 +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
e74f9054ae Fix seeds: shipping and payment info created for successful checkout out of the box 2012-06-29 15:03:32 +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
5f9b823b9c Add basic payment information to db:seed - more work needed to make valid for checkout 2012-06-27 09:21:01 +10:00
Rohan Mitchell
ba3c02346d Extract distributor and supplier address to spree address model 2012-06-26 14:52:55 +10:00
Rohan Mitchell
b9229f9166 DB seeds create some default taxonomies, suppliers, distributors and products, and are now idempotent 2012-06-22 15:15:20 +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