abiao пре 3 година
родитељ
комит
4056031b2b
2 измењених фајлова са 31 додато и 2 уклоњено
  1. 24 2
      app/models/order.rb
  2. 7 0
      config/locales/models/order.yml

+ 24 - 2
app/models/order.rb

@@ -178,6 +178,22 @@ class Order < ActiveRecord::Base
         return paied_price_f.to_s #+ "提货券"
     end
 
+    def paied_silver_format
+        coupon_price_f = self.coupon_price!=0 ? ((self.coupon_price)/100.0) :0
+        return coupon_price_f.to_s
+    end
+
+    def dis_amount_format
+        coupon_price_f = self.coupon_price!=0 ? ((self.coupon_price)/100.0) :0
+        return coupon_price_f.to_s
+    end
+
+    def paied_cash_format
+        coupon_price_f = self.coupon_price!=0 ? ((self.coupon_price)/100.0) :0
+        return coupon_price_f.to_s
+    end
+
+
     def coupon_price_format
         coupon_price_f = self.coupon_price!=0 ? ((self.coupon_price)/100.0) :0
         return coupon_price_f.to_s
@@ -243,7 +259,10 @@ class Order < ActiveRecord::Base
                 visible true
             end
             field :coupon_price_format
-            field :cent_price_format
+            field :paied_silver_format
+            field :dis_amount_format
+            field :paied_cash_format
+            #field :cent_price_format
             field :paied_price_format do
                 visible true
             end
@@ -322,7 +341,10 @@ class Order < ActiveRecord::Base
                 end
             end
             field :coupon_price_format
-            field :cent_price_format
+            #field :cent_price_format
+            field :paied_silver_format
+            field :dis_amount_format
+            field :paied_cash_format
             field :paied_price_format
             field :buy_price
             field :trade_no

+ 7 - 0
config/locales/models/order.yml

@@ -52,4 +52,11 @@ zh-CN:
        depart: 部门
        depart_record: 部门
        list_file: 清单
+       paied_silver: 实付银豆
+       dis_amount: 店长折扣
+       paied_cash: 钱包支付
+       paied_silver_format: 实付银豆(元)
+       dis_amount_format: 店长折扣(元)
+       paied_cash_format: 钱包支付(元)
+