Преглед изворни кода

add auto take cash function

abiao пре 4 година
родитељ
комит
98df3817d1
1 измењених фајлова са 4 додато и 2 уклоњено
  1. 4 2
      app/models/order_detail.rb

+ 4 - 2
app/models/order_detail.rb

@@ -14,6 +14,7 @@ class OrderDetail < ActiveRecord::Base
     end
   end
 
+=begin
   def paid_time
     paidTime = 0
     order = Order.where("id = ?", self.order_id).first
@@ -22,6 +23,7 @@ class OrderDetail < ActiveRecord::Base
     end
     return paidTime
   end
+=end
 
   def pay_way
     payWay = ""
@@ -74,8 +76,8 @@ class OrderDetail < ActiveRecord::Base
       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)
+          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 :pay_way, :enum do