Pārlūkot izejas kodu

order base detail export edit

abiao 4 gadi atpakaļ
vecāks
revīzija
f0054c7311

+ 5 - 4
app/models/order_base_detail.rb

@@ -5,7 +5,7 @@ class OrderBaseDetail < ActiveRecord::Base
   validates :order_no,:order_dt_id,:product_id, presence: true
   belongs_to :order, :foreign_key => :order_id
 
-  def order_state
+  def order_dt_state
     if self.order_id != nil
       order = Order.where("id = ?", self.order_id).first
       if !order.blank?
@@ -14,7 +14,8 @@ class OrderBaseDetail < ActiveRecord::Base
     end
     return "--"
   end
-  STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
+
+  DT_STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
 
   rails_admin do
     navigation_label '订单基本明细'
@@ -38,10 +39,10 @@ class OrderBaseDetail < ActiveRecord::Base
            end
          end
       end
-      field :order_state, :enum do
+      field :order_dt_state, :enum do
         filterable true
         enum do
-          STATUS_ENUM
+          DT_STATUS_ENUM
         end
       end
       field :send

+ 1 - 1
config/locales/models/order_base_detail.yml

@@ -12,7 +12,7 @@ zh-CN:
         order_no: 订单编号
         order_dt_id: 订单明细ID
         wx_user_id: 微信用户Id
-        order_state: 订单状态
+        order_dt_state: 订单状态
         paid_time: 支付时间
         pay_way: 支付方式
         created_at: 创建时间