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

Allow removing customer codes

Browse Source
This commit is contained in:
Maikel Linke
2016-06-10 18:14:19 +10:00
parent ee0a226388
commit db3637fe84
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee
View File

@@ -14,11 +14,13 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, Custo
$scope.customers = data
$scope.checkForDuplicateCodes = ->
customers = $scope.findByCode(this.customer.code)
if (customers.length > 1)
this.duplicate = true
else
this.duplicate = false
delete this.customer.code unless this.customer.code
this.duplicate = $scope.isDuplicateCode(this.customer.code)
$scope.isDuplicateCode = (code) ->
return false unless code
customers = $scope.findByCode(code)
customers.length > 1
$scope.findByCode = (code) ->
if $scope.customers

7
app/models/customer.rb
View File

@@ -5,8 +5,9 @@ class Customer < ActiveRecord::Base
belongs_to :user, class_name: Spree.user_class
before_validation :downcase_email
before_validation :empty_code
validates :code, uniqueness: { scope: :enterprise_id, allow_blank: true, allow_nil: true }
validates :code, uniqueness: { scope: :enterprise_id, allow_nil: true }
validates :email, presence: true, uniqueness: { scope: :enterprise_id, message: I18n.t('validation_msg_is_associated_with_an_exising_customer') }
validates :enterprise_id, presence: true
@@ -20,6 +21,10 @@ class Customer < ActiveRecord::Base
email.andand.downcase!
end
def empty_code
self.code = nil if code.blank?
end
def associate_user
self.user = user || Spree::User.find_by_email(email)
end