Prechádzať zdrojové kódy

add confirm on balance order

abiao 4 rokov pred
rodič
commit
bf061c9176

+ 13 - 4
app/models/base_config.rb

@@ -31,13 +31,23 @@ class BaseConfig < ActiveRecord::Base
         end
       end
 
+=begin
       field :cash_award do
         visible true
-        label "购券返佣()"
+        label "购券返佣(Bl)"
         pretty_value do
           value!=0 ? (value.to_f / 100.0):0
         end
       end
+=end
+
+      field :cash_award do
+        label "购券返佣率"
+        pretty_value do
+          "#{value}%"
+        end
+      end
+
       field :order_limit do
         visible true
         label "订单免运金额(元)"
@@ -118,10 +128,9 @@ class BaseConfig < ActiveRecord::Base
         end
       end
       field :cash_award do
-        visible true
-        label "购券返佣(元)"
+        label "购券返佣率"
         pretty_value do
-          value!=0 ? (value.to_f / 100.0):0
+          "#{value}%"
         end
       end
 

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

@@ -6,7 +6,7 @@ zh-CN:
       base_config:
         buy_cash: 购券支付(分)
         send_cash: 购券实得(分)
-        cash_award: 购券返佣
+        cash_award: 购券返佣比例(%
         order_limit: 订单免运(分)
         freight: 运费(分)
         user_apply: 会员申店(分)