10 Commits

Author	SHA1	Message	Date
Maikel Linke	17f168ed06	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances ... Applied code conventions. Conflicts: config/locales/en.yml	2016-03-30 13:30:44 +11:00
Maikel Linke	02cbad2697	Remove duplicate lines from merging	2016-03-09 18:49:35 +11:00
Emmanuel	5e081ce3ee	Translations of validation messages in app/models	2015-12-21 10:11:08 +01:00
Rob Harrington	34f5cfb6b5	Completed orders require a customer, add association logic	2015-05-13 12:44:38 +10:00
Rob Harrington	ed941e211d	Don't require a code on customer	2015-05-13 12:44:37 +10:00
Rob Harrington	5b3c9842e4	Adding acts_as_taggable to customer model	2015-05-13 12:44:36 +10:00
Rohan Mitchell	7f6c02ca29	Add User#customer_of to look up customers	2015-04-16 10:59:15 +10:00
Lynne Davis	2a8ba0bf42	Fixing merge conflicts after rebase	2015-03-03 16:12:07 +11:00
Lynne Davis	39c5f8febe	Updating Customer model with validations	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