|
|
@@ -6,6 +6,8 @@ class Product < ActiveRecord::Base
|
|
|
scope :active, -> { where(ptype: "cent_sale") }
|
|
|
scope :inactive, -> { where(ptype: "direct_sale") }
|
|
|
belongs_to :product_cat, :foreign_key => :category_id
|
|
|
+ belongs_to :product_sale_type, :foreign_key => :sale_zone
|
|
|
+
|
|
|
belongs_to :merchant, :foreign_key => :merchant_id
|
|
|
validates :product_no,:name,:buy_price,:price,:category_id,:count,:robo_balance_price,:relate_product_id, presence: true
|
|
|
validate :product_validation
|
|
|
@@ -170,14 +172,15 @@ class Product < ActiveRecord::Base
|
|
|
field :name do
|
|
|
filterable true
|
|
|
end
|
|
|
- field :ptype, :enum do
|
|
|
- enum do
|
|
|
- TYPE_ENUM
|
|
|
- end
|
|
|
- end
|
|
|
+ # field :ptype, :enum do
|
|
|
+ # enum do
|
|
|
+ # TYPE_ENUM
|
|
|
+ # end
|
|
|
+ # end
|
|
|
field :product_no
|
|
|
#field :category_id
|
|
|
field :product_cat
|
|
|
+ field :product_sale_type
|
|
|
field :detail
|
|
|
field :price do
|
|
|
label "现金价格(元)"
|
|
|
@@ -237,14 +240,15 @@ class Product < ActiveRecord::Base
|
|
|
field :merchant_id
|
|
|
field :merchant
|
|
|
field :name
|
|
|
- field :ptype, :enum do
|
|
|
- enum do
|
|
|
- TYPE_ENUM
|
|
|
- end
|
|
|
- end
|
|
|
+ # field :ptype, :enum do
|
|
|
+ # enum do
|
|
|
+ # TYPE_ENUM
|
|
|
+ # end
|
|
|
+ # end
|
|
|
field :product_no
|
|
|
#field :category_id
|
|
|
field :product_cat
|
|
|
+ field :product_sale_type
|
|
|
field :detail
|
|
|
field :price do
|
|
|
label "现金价格(元)"
|
|
|
@@ -316,15 +320,16 @@ class Product < ActiveRecord::Base
|
|
|
end
|
|
|
end
|
|
|
field :name
|
|
|
- field :ptype, :enum do
|
|
|
- enum do
|
|
|
- TYPE_ENUM
|
|
|
- end
|
|
|
- end
|
|
|
+ # field :ptype, :enum do
|
|
|
+ # enum do
|
|
|
+ # TYPE_ENUM
|
|
|
+ # end
|
|
|
+ # end
|
|
|
field :product_no
|
|
|
#field :category_id
|
|
|
field :merchant_id
|
|
|
field :product_cat
|
|
|
+ field :product_sale_type
|
|
|
field :detail, :ck_editor
|
|
|
field :price
|
|
|
field :robo_balance_price
|