|
|
@@ -14,7 +14,7 @@ class OrderDetail < ActiveRecord::Base
|
|
|
end
|
|
|
end
|
|
|
|
|
|
-=begin
|
|
|
+
|
|
|
def paid_time
|
|
|
paidTime = 0
|
|
|
order = Order.where("id = ?", self.order_id).first
|
|
|
@@ -23,7 +23,7 @@ class OrderDetail < ActiveRecord::Base
|
|
|
end
|
|
|
return paidTime
|
|
|
end
|
|
|
-=end
|
|
|
+
|
|
|
|
|
|
def pay_way
|
|
|
payWay = ""
|
|
|
@@ -74,13 +74,14 @@ class OrderDetail < ActiveRecord::Base
|
|
|
STATUS_ENUM
|
|
|
end
|
|
|
end
|
|
|
- field :paid_time do
|
|
|
- filterable true
|
|
|
- formatted_value do
|
|
|
- #bindings[:object].order.paied_time
|
|
|
- (bindings[:object].order.paied_at == 0 || bindings[:object].order.paied_at == nil) ? Time.at(0) : Time.at(bindings[:object].order.paied_at)
|
|
|
- end
|
|
|
- end
|
|
|
+ # field :paid_time do
|
|
|
+ # filterable true
|
|
|
+ # formatted_value do
|
|
|
+ # #bindings[:object].order.paied_time
|
|
|
+ # (bindings[:object].order.paied_at == 0 || bindings[:object].order.paied_at == nil) ? Time.at(0) : Time.at(bindings[:object].order.paied_at)
|
|
|
+ # end
|
|
|
+ # end
|
|
|
+ field :paid_time
|
|
|
field :pay_way, :enum do
|
|
|
filterable true
|
|
|
enum do
|