Merge branch 'dev_trainings' into develop

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

app/views/trainings/pay.html.erb

@@ -2,20 +2,10 @@
   <div style="padding-top: 10px">
     <%= hidden_field_tag(:friendly_id, @friendly_id) %>
 
-    <% if @test_wxpay %>
-      <div class="showPanel" id="payTypeLine" NavShow>
-    <% else %>
-      <div class="showPanel" id="payTypeLine">
-    <% end %>
-<!--    <div class="showPanel" id="payTypeLine" <%#= @training.training_payinfo.not_payed? ? 'NavShow' : '' %>>-->
+    <div class="showPanel" id="payTypeLine" <%= @training.training_payinfo.not_payed? ? 'NavShow' : '' %>>
       <p class="clearfix pr">
         <label>支付方式</label>
-        <% if @test_wxpay %>
         <span class="mr5" style="margin-right: 24px;" id="payTypeName"><%= @training.training_payinfo.pay_type.to_i == 3 ? "线下支付" : "微信支付" %></span>
-        <% else %>
-          <span class="mr5" style="margin-right: 24px;">线下支付</span>
-        <% end %>
-<!--        <span class="mr5" style="margin-right: 24px;" id="payTypeName"><%#= @training.training_payinfo.pay_type.to_i == 3 ? "线下支付" : "微信支付" %></span>-->
         <i class="iconfont icon-gengduo1 rightArrow" style="color: #323232;right: 4px"></i>
       </p>
       <div class="<%= @training.training_payinfo.pay_type.to_i == 3 ? "" : "none" %> mt5" id="payInfos">
@@ -192,10 +182,10 @@
         //     $(this).addClass("active");
         //     billTypeShowFun(parseInt($(this).index()), userInfo);
         // })
-        // //关闭弹窗
-        // $(".billClose").on("click", function () {
-        //     hideNav($(".downNav"));
-        // });
+        //关闭弹窗
+        $(".billClose").on("click", function () {
+            hideNav($(".downNav"));
+        });
 
         //延迟支付，直接提交
         $('#delayPayBtn').on('click', function () {

app/views/trainings/trainingsInfo.html.erb

@@ -41,13 +41,7 @@
 <% if @training.training_payinfo.blank? || @training.training_payinfo.not_payed? %>
   <div class="bottomBtn">
     <%= link_to '转账支付', pay_training_path(id: @friendly_id, pay_type: 3), class: 'leftbtn' %>
-    <%#= link_to '微信支付', pay_training_path(id: @friendly_id, pay_type: 1), class: 'rightbtn' %>
-    <!-- TODO:: 测试微信支付，待删除 -->
-    <% if @test_wxpay %>
     <%= link_to '微信支付', pay_training_path(id: @friendly_id, pay_type: 1), class: 'rightbtn' %>
-    <% else %>
-      <a href="javascript:void(0)" onclick="alert('即将开通');" class="rightbtn">微信支付</a>
-    <% end %>
   </div>
 <% else %>
   <div class="bottomBtn">