|
|
@@ -2,7 +2,7 @@
|
|
|
class Product < ActiveRecord::Base
|
|
|
has_paper_trail
|
|
|
self.table_name = 'products'
|
|
|
- Thread.current[:current_user] = @current_user
|
|
|
+ #Thread.current[:current_user] = @current_user
|
|
|
scope :active, -> { where(ptype: "cent_sale") }
|
|
|
scope :inactive, -> { where(ptype: "direct_sale") }
|
|
|
belongs_to :product_cat, :foreign_key => :category_id
|
|
|
@@ -121,7 +121,7 @@ class Product < ActiveRecord::Base
|
|
|
if self.buy_price != 0 && self.price != 0
|
|
|
rate = (( self.price.to_f - self.buy_price.to_f )/self.buy_price.to_f)*100
|
|
|
end
|
|
|
- return @current_user.id
|
|
|
+ return rate
|
|
|
end
|
|
|
|
|
|
rails_admin do
|
