abiao 2 rokov pred
rodič
commit
21da40fa57

+ 2 - 1
app/models/food_unsub.rb

@@ -79,7 +79,8 @@ class FoodUnsub < ActiveRecord::Base
       field :created_at
     end
     edit do
-      field :employ
+      # field :employ
+      field :employ_id
       field :food_date
       field :source, :enum do
         filterable true

+ 4 - 4
config/initializers/rails_admin.rb

@@ -83,9 +83,9 @@ RailsAdmin.config do |config|
   config.label_methods << :channel_value
   config.label_methods << :product_name
   config.audit_with :paper_trail, 'AdminUser', 'PaperTrail::Version'
-  # config.model 'ckeditor\asset' do
-  #   visible false
-  # end
+  config.model 'FoodUnsub' do
+    visible false
+  end
   #
   # config.model 'ckeditor\attachment_file' do
   #   visible false
@@ -156,7 +156,7 @@ RailsAdmin.config do |config|
     end
     #订餐退餐
     refund_food do
-      only ["FoodUnsub"]
+      only ["EmployStaticFood"]
     end
     push_tmpl_redirect do
       only ["PushTmpl"]

+ 3 - 3
lib/rails_admin/refund_food.rb

@@ -5,7 +5,7 @@ module RailsAdmin
         class RefundFood < RailsAdmin::Config::Actions::Base
             register_instance_option :visible?  do
                 unless bindings[:object].blank?
-                    authorized? && bindings[:object].status == false
+                    authorized? && bindings[:object].status == 1
                 else
                     authorized?
                 end
@@ -26,11 +26,11 @@ module RailsAdmin
             register_instance_option :controller do
                 Proc.new do
                     require 'rest-client'
-                    rd = FoodUnsub.where("id = ? and status = ? ",@object.id,false).first
+                    rd = FoodUnsub.where("id = ? and status = ? ",@object.id,1).first
                     n = "退餐成功"
                     if !rd.blank?
                         n = "已退餐成功"
-                        url = "#{CONFIG_FILE["xj_host"]}/base/rails-unsubcribe-food?id=#{@object.id}"
+                        url = "#{CONFIG_FILE["xj_host"]}/base/rails-unsubcribe-by-id?id=#{@object.id}"
                         begin
                             ret = RestClient.get url, {} #per_page: 5
                         rescue Exception => e