e9_vendors 0.0.5 → 0.0.6

data/app/models/vendor_member.rb

@@ -1,20 +1,12 @@
 class VendorMember < ActiveRecord::Base
   include E9Vendors::Model
 
-  def self.add_vendor_proxy(proxy_association)
-    all.each {|member| member.vendor_proxies << proxy_association.build }
-  end
-
-  has_many :vendor_proxies, :dependent => :destroy do
-    def by_category
-      includes(:vendor => :vendor_categories)
-        .order('vendor_categories.position')
-        .group_by {|vd| vd.vendor.vendor_category.name }
-    end
-  end
+  has_many :vendor_proxies, :dependent => :destroy
   has_many :vendors, :through => :vendor_proxies
 
-  mount_uploader :logo, LogoUploader
-
   validates :name, :presence => true
+
+  def self.add_vendor_proxy(proxy_association)
+    all.each {|member| member.vendor_proxies << proxy_association.build }
+  end
 end

data/app/models/vendor_proxy.rb

@@ -4,10 +4,8 @@ class VendorProxy < ActiveRecord::Base
   belongs_to :vendor, :touch => true
   belongs_to :vendor_member, :touch => true
 
-  before_validation :populate_default_discount_code, :on => :create
+  before_validation :populate_default_discount_code
 
-  validates :discount_code,       :presence => true,                                 :on => :update
-  validates :discount_percentage, :numericality => { :greater_than_or_equal_to => 0, :less_than => 100 }
   validates :sales_email,         :email => { :allow_blank => true }
 
   delegate :name, :to => :vendor, :prefix => true
@@ -30,7 +28,7 @@ class VendorProxy < ActiveRecord::Base
   protected
 
   def populate_default_discount_code
-    self.discount_code = "V-#{self.vendor.id}-#{self.vendor_member.id}"
+    self.discount_code = self.discount_code.presence || "V-#{self.vendor.id}-#{self.vendor_member.id}"
   end
 
   def vendor_fallback(column)

data/lib/e9_vendors/version.rb

@@ -1,3 +1,3 @@
 module E9Vendors
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_vendors
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Travis Cox