|
|
@@ -6,15 +6,6 @@ class OrderBaseDetail < ActiveRecord::Base
|
|
|
belongs_to :order, :foreign_key => :order_id
|
|
|
|
|
|
|
|
|
- def paid_shijian
|
|
|
- paidTime = 0
|
|
|
- order = Order.where("order_id = ?", self.order_no).first
|
|
|
- if !order.blank?
|
|
|
- paidTime=order.paied_at
|
|
|
- end
|
|
|
- return paidTime
|
|
|
- end
|
|
|
-
|
|
|
rails_admin do
|
|
|
navigation_label '订单基本明细'
|
|
|
weight -300
|
|
|
@@ -37,6 +28,15 @@ class OrderBaseDetail < ActiveRecord::Base
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
+ field :order_state do
|
|
|
+ filterable true
|
|
|
+ formatted_value do
|
|
|
+ #bindings[:object].order.paied_time
|
|
|
+ if !bindings[:object].order.blank?
|
|
|
+ bindings[:object].order.order_state
|
|
|
+ end
|
|
|
+ end
|
|
|
+ end
|
|
|
field :send
|
|
|
end
|
|
|
show do
|