Merge branch 'master' into develop

* master:
  add confirm on balance order
  add confirm on balance order
  add confirm on balance order
  add user  token
  add user  token

app/models/product_attr_config.rb

@@ -2,6 +2,8 @@ class ProductAttrConfig < ActiveRecord::Base
     has_paper_trail
     self.table_name = 'product_attr_configs'
     belongs_to :product_attr_key, :foreign_key => :attr_key_id
+    belongs_to :product
+
     validates :size_type,:product_id,:product_attr_key,presence:true
     attr_accessor :show_products
 
@@ -22,13 +24,17 @@ class ProductAttrConfig < ActiveRecord::Base
         })
 
         list do 
-            filters [:product_id,:product_attr_key]
+            filters [:product,:product_attr_key]
             field :id
+=begin
             field :product_id, :enum do
                 enum do
                   PRODUCT_ENUM
                 end
             end
+=end
+            field :product
+            field :product_id
             field :product_attr_key
             field :size_type, :enum do
                 enum do
@@ -44,6 +50,7 @@ class ProductAttrConfig < ActiveRecord::Base
                   PRODUCT_ENUM
                 end
             end
+            field :product_id
             field :product_attr_key
             field :size_type, :enum do
                 enum do