From b54791bb9557358f9780b5fe3ddcb8abb05b03e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= <naruto0426@rulingcom.com>
Date: Thu, 18 Jan 2024 23:47:13 +0800
Subject: [PATCH] Add agree settings.

---
 .../admin/application_forms_controller.rb         |  2 +-
 app/models/application_form_signup.rb             |  2 +-
 app/views/application_forms/show.html.erb         | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/application_forms_controller.rb b/app/controllers/admin/application_forms_controller.rb
index df87d46..c6de8a5 100644
--- a/app/controllers/admin/application_forms_controller.rb
+++ b/app/controllers/admin/application_forms_controller.rb
@@ -939,7 +939,7 @@ class Admin::ApplicationFormsController < OrbitAdminController
     if @application_form.application_form_signup_field_sets.where(:field_name.in=>except_attributes).destroy != 0
       @application_form = @application_form.reload
     end
-    (ApplicationFormSignup.attribute_names + ['recaptcha']).each do |attr_signup|
+    (ApplicationFormSignup.attribute_names + ['recaptcha', 'agree']).each do |attr_signup|
       next if except_attributes.include?(attr_signup)
       signup_set = @application_form.application_form_signup_field_sets.select{|v| v.field_name==attr_signup }
       fix_trans = false
diff --git a/app/models/application_form_signup.rb b/app/models/application_form_signup.rb
index 37e8daf..9a02333 100644
--- a/app/models/application_form_signup.rb
+++ b/app/models/application_form_signup.rb
@@ -4,7 +4,7 @@ class ApplicationFormSignup
   include Mongoid::Document
   include Mongoid::Timestamps
   HiddenFields = ['ip', 'application_form_signup_id', 'password', 'status', 'reviewer_ids_list','_id', 'created_at', 'updated_at','application_form_main_id',"serial_number","final_session","final_sessions","preferred_sessions",'application_form_session_id',"application_form_session_ids","preferred_session","sort_number","abstract_number","presentation_type", "cipher_stage_num", "process_stage", "review_status", "agree_reviewer_ids", "agree_reviewer_times"]
-  DefaultEnableFields = ['name','tel','phone','email', 'recaptcha']
+  DefaultEnableFields = ['name','tel','phone','email', 'recaptcha', 'agree']
   field :ip, type: String
   field :sort_number , type: Integer, default: 10000
   field :process_stage, type: Integer, default: 1
diff --git a/app/views/application_forms/show.html.erb b/app/views/application_forms/show.html.erb
index b004d50..3529c26 100644
--- a/app/views/application_forms/show.html.erb
+++ b/app/views/application_forms/show.html.erb
@@ -54,7 +54,7 @@
       </div>
       <% if @application_form.application_form_signup_field_sets.count != 0 %>
         <% @application_form.application_form_signup_field_sets.each do |signup_field| %>
-          <% if !(signup_field.disabled) && signup_field.field_name != 'recaptcha' %>
+          <% if !(signup_field.disabled) && !(['recaptcha', 'agree'].include?(signup_field.field_name)) %>
             <div class="form-group<%= (@application_form.registration_status[0] == 'G' && signup_field.field_name == 'password') ? ' hide' : '' %>" id="<%= signup_field.field_name == 'password' ? 'registration_status' : '' %>">
               <label for="<%= signup_field['name'][I18n.locale] %>" class="col-sm-2 control-label">
                 <% if !(['address','note'].include? signup_field.field_name) %>
@@ -288,14 +288,23 @@
         </div>
       </div> -->
     
+      <% agree_set = @application_form.application_form_signup_field_sets.select{|v| v.field_name=='agree'}[0]
+        if agree_set.nil?
+          agree_trans = t("application_form_signup.agree")
+        else
+          agree_trans = agree_set.name[I18n.locale.to_s]
+        end
+      %>
+      <% if agree_set.nil? || !agree_set.disabled %>
       <div class="form-group">
         <div class="col-sm-offset-2 col-sm-10">
         <label>
-        	<input id="agree" name="agree" value="1" type="checkbox" required="required">
-        	<a href="<%= prefix_url %>?method=show_privacy" target="_blank"><%= t("application_form_signup.agree")%></a>
+          <input id="agree" name="agree" value="1" type="checkbox" required="required">
+          <a href="<%= prefix_url %>?method=show_privacy" target="_blank"><%= agree_trans %></a>
         </label>
         </div>
       </div>
+      <% end %>
 
       <div class="form-group">
         <div class="col-sm-offset-2 col-sm-10">