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
2,534 Commits 21 Branches 450 Tags
86dee82acbba966ef799e00aadce0077f2fd2b43
Commit Graph

123 Commits

Author SHA1 Message Date
Will Marshall
c69a4a5f1a Adding social media links 2014-05-22 12:12:10 +10:00
Will Marshall
0958602418 Starting on migrations and admin forms 2014-05-20 12:18:27 +10:00
Rohan Mitchell
6c5172c567 Add EnterpriseRelationship. An Enterprise can find its relatives. 2014-05-14 15:50:25 +10:00
Will Marshall
f68a637609 Renaming Enterprise.active to Enterprise.visible 2014-04-30 12:09:22 +10:00
Will Marshall
c33fa03736 Merging into master 2014-04-29 10:35:05 +10:00
Rohan Mitchell
c35112a40c Migration works without countries or states (ie. in CI) 2014-04-25 16:18:30 +10:00
Will Marshall
22b87cc236 Adding active flag to enterprises 2014-04-25 16:17:37 +10:00
Rohan Mitchell
8dd9260163 Do not add dummy distributor to orders without one - they don't need it 2014-04-24 13:20:16 +10:00
Rohan Mitchell
f7658ad250 Add foreign keys, sanitising data first 2014-04-24 13:20:15 +10:00
Rohan Mitchell
3d0b24cc97 Add missing foreign key indexes 2014-04-09 15:02:41 +10:00
Rohan Mitchell
ac92d0919a Add incoming boolean field to Exchange, determine exchange direction from this field rather than sender/receiver roles 2014-03-26 11:19:35 +11:00
Will Marshall
25916caeb4 Starting on Angular models for Checkout, pretties 2014-02-13 16:14:11 +11:00
Will Marshall
7f58007c45 Adding some fields to Shipping Methods 2014-02-13 16:12:42 +11:00
Will Marshall
2bb004ebaa Adding notes field to products 2014-02-04 14:11:32 +11:00
Will Marshall
aec5894c70 Adding a promo image to enterprises 2014-01-21 16:32:55 +11:00
Will Marshall
0ddef9626e First working image upload for enterprise logos 2014-01-16 15:47:38 +11:00
Rohan Mitchell
29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
 2014-01-14 15:34:05 +11:00
Rohan Mitchell
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00
Rob H
530d38c7d0 Add basic pagination informaion to BPE 2013-12-22 16:58:48 +08:00
Rohan Mitchell
0bae3e58b8 Add product units and amount fields to product and variant models, add validations 2013-12-05 15:16:51 +11:00
Will Marshall
f0d335a454 Fixing up the failing spec for distributor changes, reworking a method to SharedHelper 2013-11-07 11:47:05 +11:00
Rohan Mitchell
647e1d196c Position enterprise groups 2013-10-30 14:46:49 +11:00
Rohan Mitchell
e78815c2d3 Create models for EnterpriseGroups 2013-10-30 10:42:32 +11:00
Rohan Mitchell
8d0f192ca7 Update states to match 2013-10-30 10:42:23 +11:00
Rohan Mitchell
6161114750 Standardise on Australia having ID 12, as staging and prod servers do 2013-10-30 10:34:29 +11:00
Rohan Mitchell
34607ff556 Rename misc items from openfoodweb to openfoodnetwork 2013-10-18 17:43:59 +11:00
Rohan Mitchell
93cb845ee2 DB and model changes to make ShippingMethod distributor habtm 2013-10-17 11:15:43 +11:00
Rohan Mitchell
bf02dd0caa Set countries and states in test to mirror id configuration provided by seed 2013-10-11 15:11:50 +11:00
Rohan Mitchell
da9e756d9f Fix migration for envs without distributors 2013-09-19 11:32:00 +10:00
Rohan Mitchell
08941ae22b Data integrity 2013-09-19 11:22:55 +10:00
Rohan Mitchell
d1979a70a1 Fix migration - dependency on modified model relations 2013-09-16 14:26:43 +10:00
David Cook
4f9c7fb601 Remove distributor_id from payment method and update tests 2013-09-13 16:58:19 +10:00
David Cook
107c6978c2 Create many-to-many relationship between payment method and distributor 2013-09-13 10:25:25 +10:00
Rohan Mitchell
911d8b8bbc Shipping method has a distributor, admin can create and edit 2013-08-30 11:43:45 +10:00
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