浏览代码

add orders list file

abiao 4 年之前
父节点
当前提交
7b8db268d2
共有 3 个文件被更改,包括 31 次插入15 次删除
  1. 24 6
      app/models/ckeditor/list_file.rb
  2. 1 3
      config/initializers/rails_admin.rb
  3. 6 6
      lib/rails_admin/export_order_view.rb

+ 24 - 6
app/models/ckeditor/list_file.rb

@@ -2,6 +2,8 @@
 class ListFile < ActiveRecord::Base
   has_paper_trail
   self.table_name = "list_files"
+  belongs_to :depart_record, :foreign_key => :depart
+  STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
 
   rails_admin do
     navigation_label '商品管理'
@@ -12,10 +14,16 @@ class ListFile < ActiveRecord::Base
       filters [:order_no,:order_status]
       field :id
       field :order_no
-      field :order_status
+      field :order_status, :enum do
+        enum do
+          STATUS_ENUM
+        end
+      end
       field :paied_date
       #field :paied_time
-      field :depart
+      #field :depart
+      field :depart_record
+
       field :list_file
       field :status
       field :created_at
@@ -24,10 +32,15 @@ class ListFile < ActiveRecord::Base
     show do
       field :id
       field :order_no
-      field :order_status
+      field :order_status, :enum do
+        enum do
+          STATUS_ENUM
+        end
+      end
       field :paied_date
       #field :paied_time
-      field :depart
+      # field :depart
+      field :depart_record
       field :list_file
       field :status
       field :created_at
@@ -36,10 +49,15 @@ class ListFile < ActiveRecord::Base
 
     edit do
       field :order_no
-      field :order_status
+      field :order_status, :enum do
+        enum do
+          STATUS_ENUM
+        end
+      end
       field :paied_date
       #field :paied_time
-      field :depart
+      #field :depart
+      field :depart_record
       field :list_file
       field :status
       field :created_at

+ 1 - 3
config/initializers/rails_admin.rb

@@ -24,8 +24,6 @@ require Rails.root.join('lib', 'rails_admin', 'export_order_view')
 
 
 
-
-
 RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::GenerateMenu)
 RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::PushTmplRedirect)
 RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::PushXcxTmplRedirect)
@@ -112,7 +110,7 @@ RailsAdmin.config do |config|
     bulk_delete
     # member actions
     export_order_view do
-      only ["Order"]
+      only ["ListFile"]
     end
     correct_takecash do
       only ["TakeCashOrder"]

+ 6 - 6
lib/rails_admin/export_order_view.rb

@@ -22,15 +22,15 @@ module RailsAdmin
                 register_instance_option :controller do
                     Proc.new do
                         require 'rest-client'
-                        live_award = LiveAward.where("id = ? and status = ? ",@object.id,0).first
-                        n = "发放成功"
-                        if not live_award.blank?
-                            n = "已成功发放"
-                            url = "#{CONFIG_FILE["api_host"]}/railsadmin/live/award/#{@object.id}"
+                        list_file = ListFile.where("id = ? ",@object.id,0).first
+                        n = "生成成功"
+                        if not list_file.blank?
+                            n = "已成功生成清单"
+                            url = "#{CONFIG_FILE["app_host"]}/railsadmin/list_file#{@object.id}"
                             begin
                                 ret = RestClient.get url, {} #per_page: 5
                             rescue Exception => e
-                                n = "发放失败!"
+                                n = "生成失败!"
                             end
                         end
                         redirect_to :back, notice: "#{n}"