@@ -20,6 +20,13 @@ class Order < ActiveRecord::Base
STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
TYPE_ENUM = [["普通",0],["秒杀",1]]
+ EXP_ENUM = []
+
+ expressCompanys = ExpressCompany.order("id asc")
+ expressCompanys.each do |exp|
+ a=[exp.express_company,exp.express_company]
+ EXP_ENUM.push(a)
+ end
PAY_WAY_ENUM = [
@@ -267,7 +274,12 @@ class Order < ActiveRecord::Base
field :tel
field :address
field :contact
- field :express_company
+ #field :express_company
+ field :express_company, :enum do
+ enum do
+ EXP_ENUM
field :express_order_no
field :remark
field :order_remark