|
|
@@ -2,8 +2,8 @@
|
|
|
class OrderDetail < ActiveRecord::Base
|
|
|
has_paper_trail
|
|
|
self.table_name = "order_details"
|
|
|
- # belongs_to :product, :foreign_key => :product_id
|
|
|
- belongs_to :order
|
|
|
+ belongs_to :product
|
|
|
+ belongs_to :order, :foreign_key => :order_id
|
|
|
|
|
|
def order_state
|
|
|
order = Order.where("id = ?", self.order_id).first
|
|
|
@@ -48,12 +48,12 @@ class OrderDetail < ActiveRecord::Base
|
|
|
parent Order
|
|
|
|
|
|
list do
|
|
|
- filters [:order_no,:nums,:price,:order_state,:paid_time]
|
|
|
+ filters [:product,:order_no,:nums,:price,:order_state,:paid_time]
|
|
|
field :id
|
|
|
field :order_no do
|
|
|
filterable true
|
|
|
end
|
|
|
- #field :product
|
|
|
+ field :product
|
|
|
field :nums
|
|
|
field :price do
|
|
|
visible true
|
|
|
@@ -91,7 +91,7 @@ class OrderDetail < ActiveRecord::Base
|
|
|
show do
|
|
|
field :id
|
|
|
field :order_no
|
|
|
- # field :product
|
|
|
+ field :product
|
|
|
field :nums
|
|
|
field :is_zeng
|
|
|
field :price do
|
