Explorar o código

add orders list file

abiao %!s(int64=4) %!d(string=hai) anos
pai
achega
c5c34ab4fb

+ 1 - 1
app/models/ckeditor/list_file.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-class ListFile < ActiveRecord::Base
+class OrderFile < ActiveRecord::Base
   has_paper_trail
   self.table_name = "list_files"
   belongs_to :depart_record, :foreign_key => :depart

+ 4 - 4
config/initializers/rails_admin.rb

@@ -20,7 +20,7 @@ require Rails.root.join('lib', 'rails_admin', 'audit_order_refund')
 require Rails.root.join('lib', 'rails_admin', 'generate_user_perfomance')
 require Rails.root.join('lib', 'rails_admin', 'generate_live_award')
 require Rails.root.join('lib', 'rails_admin', 'balance_order_confirm')
-require Rails.root.join('lib', 'rails_admin', 'export_list_file')
+require Rails.root.join('lib', 'rails_admin', 'create_list_file')
 
 
 
@@ -45,7 +45,7 @@ RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::AuditOrderRefu
 RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::GenerateUserPerfomance)
 RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::GenerateLiveAward)
 RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::BalanceOrderConfirm)
-RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::ExportListFile)
+RailsAdmin::Config::Actions.register(RailsAdmin::Config::Actions::CreateListFile)
 
 
 
@@ -125,8 +125,8 @@ RailsAdmin.config do |config|
     audit_order_refund do
       only ["OrderRefund"]
     end
-    export_list_file do
-      only ["ListFile"]
+    create_list_file do
+      only ["OrderFile"]
     end
     create_xcx_qrcode do
       only ["WxUser"]

+ 2 - 2
config/locales/models/list_file.yml

@@ -1,9 +1,9 @@
 zh-CN:
   activerecord:
     models:
-      list_file: 订单清单打印
+      order_file: 订单清单打印
     attributes:
-      list_file:
+      order_file:
         id: ID
         order_no: 订单编号
         order_status: 订单状态

+ 1 - 1
config/locales/rails_admin.zh-CN.yml

@@ -169,7 +169,7 @@ zh-CN:
         menu: "推送"
       correct_takecash:
         menu: "提现冲正"
-      export_list_file:
+      create_list_file:
         menu: "生成清单"
       deposit_unlock:
         menu: "解冻"

+ 3 - 3
lib/rails_admin/export_list_file.rb

@@ -2,7 +2,7 @@
 module RailsAdmin
     module Config
         module Actions
-            class ExportListFile < RailsAdmin::Config::Actions::Base
+            class CreateListFile < RailsAdmin::Config::Actions::Base
                 register_instance_option :visible?  do
                     authorized?
                 end
@@ -22,9 +22,9 @@ module RailsAdmin
                 register_instance_option :controller do
                     Proc.new do
                         require 'rest-client'
-                        list_file = ListFile.where("id = ? ",@object.id).first
+                        order_file = OrderFile.where("id = ? ",@object.id).first
                         n = "生成成功"
-                        if not list_file.blank?
+                        if not order_file.blank?
                             n = "已成功生成清单"
                             url = "#{CONFIG_FILE["app_host"]}/railsadmin/order/list_file/#{@object.id}"
                             begin