@@ -38,6 +38,8 @@ class BaseDetail < ActiveRecord::Base
return order.status
end
+
+ STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
def paid_time
@@ -96,7 +98,7 @@ class BaseDetail < ActiveRecord::Base
field :product_name
- field :order_state, :enum do
+ field :order_status, :enum do
filterable true
enum do
STATUS_ENUM
@@ -116,6 +118,11 @@ class BaseDetail < ActiveRecord::Base
PAY_WAY_ENUM
+ enum do
+ STATUS_ENUM
+ end
field :is_zeng
#field :size_name
#field :color_name
@@ -74,7 +74,7 @@ class OrderDetail < ActiveRecord::Base
parent Order
list do
- filters [:product,:order_no,:nums,:price,:order_state]
+ filters [:product,:order_no,:nums,:price,:order_status]
field :id
field :order_no do
@@ -93,7 +93,7 @@ class OrderDetail < ActiveRecord::Base
@@ -141,6 +141,12 @@ class OrderDetail < ActiveRecord::Base
value!=0 ? (value/100.0):0
+ filterable true
field :size_name
field :color_name
@@ -0,0 +1,16 @@
+# This migration and CreateVersionAssociations provide the necessary
+# schema for tracking associations.
+class AddOrderStausColumnToBaseDetails < ActiveRecord::Migration
+ def self.up
+ add_column :base_details, :order_status, :string, :limit => 64
+ add_column :order_details, :order_status, :string, :limit => 64
+ def self.down
+ remove_column :base_details, :order_status
+ remove_column :order_details, :order_status
+end