abiao пре 5 година
родитељ
комит
b0787b201e

+ 8 - 5
app/models/order_static.rb

@@ -25,9 +25,12 @@ class OrderStatic < ActiveRecord::Base
     end
   end
 
-  def begin_date_fomate
+  def begin_date_fomat
     return self.begin_date.strftime
   end
+  def end_date_fomat
+    return self.end_date.strftime
+  end
 
   STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
   
@@ -38,8 +41,8 @@ class OrderStatic < ActiveRecord::Base
     list do
       filters [:state,:is_send]
       field :id
-      field :begin_date_fomate
-      field :end_date
+      field :begin_date_fomat
+      field :end_date_fomat
       field :state, :enum do
           enum do
             STATUS_ENUM
@@ -52,8 +55,8 @@ class OrderStatic < ActiveRecord::Base
 
     show do
       field :id
-      field :begin_date
-      field :end_date
+      field :begin_date_fomat
+      field :end_date_fomat
       field :state, :enum do
         enum do
           STATUS_ENUM

+ 6 - 0
app/models/order_static_detail.rb

@@ -13,6 +13,12 @@ class OrderStaticDetail < ActiveRecord::Base
     list do
       filters [:begin_date,:end_date, :state,:is_send]
       field :id
+      field :begin_date do
+        visible true
+        formatted_value do
+          :begin_date.strftime
+        end
+      end
       field :begin_date
       field :end_date
       field :state, :enum do

+ 2 - 1
config/locales/models/order_static.yml

@@ -5,7 +5,8 @@ zh-CN:
     attributes:
       order_static:
         begin_date: 开始时间
-        begin_date_fomate: 开始时间
+        begin_date_fomat: 开始时间
+        end_date_fomat: 结束时间
         end_date: 结束时间
         state: 订单状态
         is_send: 是否赠品

+ 2 - 0
config/locales/models/order_static_detail.yml

@@ -6,6 +6,8 @@ zh-CN:
       order_static_detail:
         begin_date: 开始时间
         end_date: 结束时间
+        begin_date_fomat: 开始时间
+        end_date_fomat: 结束时间
         state: 订单状态
         is_send: 是否赠品
         product_id: 商品ID