diff --git a/app/controllers/trainings_controller.rb b/app/controllers/trainings_controller.rb index ad3248c9..8650a5a7 100644 --- a/app/controllers/trainings_controller.rb +++ b/app/controllers/trainings_controller.rb @@ -15,20 +15,6 @@ class TrainingsController < ApplicationController layout 'base_trainings' - # TODO: 测试完成后删除 - ALLOW_OPENID_LIST = [ - 'oSrqE59d6uMBkANfXnJcGuUwuGds', - 'oSrqE5-j3rT3f9nt4iFhSICPF1Vo', - 'oSrqE5w6dtsRyjFkFBahQ1jeurTk', - 'oSrqE52fgGMooW3B1K4mZ0Le5G9I', - 'o5fSc0607iR3rp4-h_VnuBTp8CiM' - ] - before_filter :check_openid, only: [:update_payinfo] - def check_openid - return if ALLOW_OPENID_LIST.include?(session[:wechat_open_id]) - render plain: '暂未开放' - end - def show @training = current_training @@ -37,9 +23,6 @@ class TrainingsController < ApplicationController return end - # TODO: 测试完成后删除 - @test_wxpay = ALLOW_OPENID_LIST.include?(session[:wechat_open_id]) - render 'trainingsInfo' end @@ -67,8 +50,6 @@ class TrainingsController < ApplicationController @training.training_payinfo.fee = @training.registration_fee @training.training_payinfo.pay_type = params[:pay_type].presence || 3 end - # TODO: 测试完成后删除 - @test_wxpay = ALLOW_OPENID_LIST.include?(session[:wechat_open_id]) end def pay_callback @@ -174,12 +155,8 @@ class TrainingsController < ApplicationController training_info.save! - # TODO: 测试完成后删除 - @test_wxpay = ALLOW_OPENID_LIST.include?(session[:wechat_open_id]) - if params[:js] == 'true' && training_info.not_payed? - # TODO: 测试完成后删除 - _pay_js(@test_wxpay ? 0.01 : training_info.fee) + _pay_js(training_info.fee) else redirect_to result_training_path(id: friendly_id) end diff --git a/app/views/trainings/pay.html.erb b/app/views/trainings/pay.html.erb index f1b16f6e..7426cfa3 100644 --- a/app/views/trainings/pay.html.erb +++ b/app/views/trainings/pay.html.erb @@ -2,20 +2,10 @@
- <% if @test_wxpay %> - <%= @training.training_payinfo.pay_type.to_i == 3 ? "线下支付" : "微信支付" %> - <% else %> - 线下支付 - <% end %> - + <%= @training.training_payinfo.pay_type.to_i == 3 ? "线下支付" : "微信支付" %>