Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

2017-11-07 10:32:48 +06:30
parent 8f69caff2d b48625e25e
commit 4fa0705f1c
19 changed files with 309 additions and 21 deletions
--- a/app/models/commission.rb
+++ b/app/models/commission.rb
@@ -9,7 +9,7 @@ class Commission < ApplicationRecord
  has_many :product_commissions

  # validations
-  validates_presence_of :commission_type, :amount
+  validates_presence_of :name, :commission_type, :amount

  private
  def generate_custom_id