352 Commits

Author	SHA1	Message	Date
Rohan Mitchell	3dbc2e0382	Merge branch 'master' into folklabs-producer-emails	2015-05-29 17:36:11 +10:00
Continuous Integration	c14de4e97f	Auto-merge from CI [skip ci]	2015-05-29 14:29:23 +10:00
Maikel Linke	19448a182e	Add permalink field to enterprise groups	2015-05-28 11:27:39 +10:00
Rob Harrington	e931f4b31f	Merge branch 'master' into require_standard_variant	2015-05-22 12:22:54 +10:00
Rob Harrington	63f3ede766	Prepare master variants for duplication as standard variant by ensuring they have a unit value and that the product has a variant unit	2015-05-22 12:22:05 +10:00
Rob Harrington	1559b4e30a	Adding customer reference to orders	2015-05-13 12:44:37 +10:00
Rob Harrington	ed941e211d	Don't require a code on customer	2015-05-13 12:44:37 +10:00
Rob Harrington	4c5e75c3f9	Adding acts-as-taggable-on gem	2015-05-13 12:44:36 +10:00
Lynne Davis	521834bd76	Populate the line item unit value, when line_item created and update old data in migration	2015-05-09 19:10:55 +01:00
Lynne Davis	f7ade48e86	Update DB schema to store updatable weight on items sold	2015-05-09 19:10:55 +01:00
Rohan Mitchell	1531c476e3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb	2015-05-08 13:45:31 +10:00
Rohan Mitchell	f5b45fa0ba	Merge branch 'master' into folklabs-producer-emails	2015-05-01 09:51:01 +10:00
Rohan Mitchell	6b1c125b03	Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails ... Conflicts: Gemfile.lock app/controllers/admin/order_cycles_controller.rb app/views/admin/order_cycles/edit.html.haml app/views/admin/order_cycles/show.rep db/schema.rb spec/controllers/admin/order_cycles_controller_spec.rb	2015-04-29 14:42:17 +10:00
Rob Harrington	992fb2347d	Merging master branch into require_standard_variant	2015-04-29 14:30:49 +10:00
Rohan Mitchell	c3f99d7540	Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country	2015-04-29 14:07:58 +10:00
Rob Harrington	bdf462926d	Ensure that producer properties have a position	2015-04-24 13:05:01 +10:00
Rob Harrington	1f293bb787	Adding inherits properties flag to products	2015-04-22 21:02:06 +10:00
Rob Harrington	a75a76840d	Merging master into require_standard_variant	2015-04-17 21:18:24 +10:00
Rohan Mitchell	9bbc151cae	Admin can set enterprises to charge or not charge sales tax	2015-04-17 13:41:38 +10:00
Rob Harrington	7596270154	A few more changes to tidy up standard variant migration	2015-04-17 11:25:18 +10:00
Rob Harrington	5d9e861ee4	Working migration to complete deprecation of master variants	2015-04-17 11:25:18 +10:00
Rob Harrington	447a5481a3	WIP: Building migration to duplicate master variants	2015-04-17 11:25:18 +10:00
Rohan Mitchell	61cb2514cd	Add Delayed::Job	2015-04-16 16:54:43 +10:00
Paul Mackay	d4cf44a6dd	Use COUNTRY_CODE instead of COUNTRY in application.yml.	2015-03-29 17:06:05 +01:00
Rohan Mitchell	c36272ead6	Switch to update_column, which will not run geocoding callback of Enterprise	2015-03-25 11:37:10 +11:00
Rohan Mitchell	c6ddf36856	Make migration reversible	2015-03-25 11:35:59 +11:00
Paul Mackay	fcfb1aeb87	#440: Try removing validation from update (to prevent geocoding).	2015-03-23 14:24:16 +00:00
Paul Mackay	e39d2eb113	#440: Reset Enterprise columns before querying them.	2015-03-23 13:47:44 +00:00
Rohan Mitchell	c85d5b86eb	Fix temperature_controlled migration - NOT NULL requires default value	2015-03-12 12:22:51 +11:00
Rohan Mitchell	a5716cf2c2	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-03-12 12:15:22 +11:00
Rohan Mitchell	dfb855bd14	Record the tax included in shipping.	2015-03-05 10:44:27 +11:00
Rohan Mitchell	9395f6c808	Record the tax included in adjustments. TaxRate adjustments consist of 100% tax.	2015-03-05 10:44:26 +11:00
Rohan Mitchell	61c08997a1	EnterpriseFee has a TaxCategory	2015-03-05 10:44:22 +11:00
Paul Mackay	ca665dc6bc	Merge master into producer-emails.	2015-03-04 19:09:43 +00:00
Lynne Davis	b26c46d7db	Removing default false from temp_controlled - shipping categories	2015-03-03 16:39:55 +11:00
Lynne Davis	72a568ffad	Adding not null to temp_controlled field of shipping_categories	2015-03-03 16:33:49 +11:00
Lynne Davis	f2a35e219e	Updating migration on customers table with extra validation	2015-03-03 16:01:42 +11:00
Lynne Davis	87b1ab9a1a	LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report	2015-03-03 16:01:42 +11:00
Maikel Linke	a522242e7a	dealing with invalid live data in migration	2015-02-21 18:43:03 +11:00
Rohan Mitchell	f8ca24c5cd	Index enterprise_groups address_id	2015-02-20 14:56:16 +11:00
Maikel Linke	a7b723af93	owner index for enterprise groups	2015-02-19 13:23:50 +11:00
Maikel Linke	718a5911a3	code style and cleanup	2015-02-19 10:48:39 +11:00
Maikel Linke	903bd21577	Merge remote-tracking branch 'origin/master' into group-pages-merge ... Conflicts: README.markdown db/schema.rb	2015-02-13 15:42:36 +11:00
Maikel Linke	87686848bc	make group contact fields not null	2015-02-13 15:39:44 +11:00
Maikel Linke	91b35d068c	Adding owner to groups ... Groups have owners and users own groups. The owners are displayed and changable on the group's page by admin users.	2015-02-02 15:58:34 +11:00
Rob Harrington	9163b0c1ad	Adding missing equals sign to test for equality in permalink migration	2015-01-28 11:37:02 +11:00
Maikel Linke	87b092fdf7	Adding addresses to existing groups and make them changable	2015-01-22 12:10:54 +11:00
Rob Harrington	42d6695264	Fix permalink migration to handle blank auto-generated permalinks and fixed down migration	2015-01-22 10:19:45 +11:00
Rob Harrington	9f0aeb5adf	Adding unique permalink to enterprises	2015-01-22 10:19:41 +11:00
Maikel Linke	650e35c13e	Adding contact information to groups backend	2015-01-21 16:11:55 +11:00