|
|
@@ -2,7 +2,7 @@
|
|
|
class OrderDetail < ActiveRecord::Base
|
|
|
has_paper_trail
|
|
|
self.table_name = "order_details"
|
|
|
- belongs_to :product
|
|
|
+ #belongs_to :product
|
|
|
belongs_to :order, :foreign_key => :order_id
|
|
|
# has_one :order, :foreign_key=>:order_id, :primary_key=>:order_id
|
|
|
validates :order_no,:product_id,:nums, presence: true
|
|
|
@@ -59,6 +59,14 @@ class OrderDetail < ActiveRecord::Base
|
|
|
end
|
|
|
end
|
|
|
|
|
|
+ def product
|
|
|
+ pd = Product.where("id = ?", self.product_id).first
|
|
|
+ if !pd.blank?
|
|
|
+ return pd.name
|
|
|
+ else
|
|
|
+ return "--"
|
|
|
+ end
|
|
|
+ end
|
|
|
|
|
|
def paid_time
|
|
|
order = Order.where("id = ?", self.order_id).first
|