add balance promotion shop promotion

app/models/present.rb

@@ -3,14 +3,27 @@ class Present < ActiveRecord::Base
   has_paper_trail
   self.table_name = "presents"
   validates :code,:name,:remark,presence: true
+  belongs_to :wx_user
 
+  def send_product
+    prd1 = Product.where("id = ?", self.send_prod1).first
+    if !prd1.blank?
+      return format("%s-%d",prd1.name,self.send_nums1)
+    else
+      return "--"
+    end
+  end
   rails_admin do
     navigation_label '促销管理'
     weight -500
     list do
       filters [:wx_user_id,:send_prod1,:source]
       field :id
-      field :wx_user_id
+      field :wx_user_id do
+        visible true
+        filterable true
+      end
+      field :wx_user
       field :price do
         label "单价（元）"
         formatted_value do # used in form views
@@ -24,7 +37,8 @@ class Present < ActiveRecord::Base
         end
       end
       field :send_prod1
-      field :send_nums1
+      #field :send_nums1
+      field :send_product
       field :order_id
       field :status
       field :source

config/locales/models/present.yml

@@ -9,6 +9,7 @@ zh-CN:
         wx_user: 微信会员
         price: 单价
         total: 总价
+        send_product: 赠品
         send_prod1: 赠品ID
         send_nums1: 赠品数量
         order_id: 订单号