diff --git a/app/assets/javascripts/client_management/add_new_site.js b/app/assets/javascripts/client_management/add_new_site.js
index 1c55c67..e551244 100644
--- a/app/assets/javascripts/client_management/add_new_site.js
+++ b/app/assets/javascripts/client_management/add_new_site.js
@@ -3,9 +3,14 @@ $('.select-site').on('change', function (e) {
var valueSelected = this.value;
// console.log(optionSelected+', '+valueSelected);
if ( valueSelected == "newsite" ) {
- $('.box-check-host').slideDown();
- }else {
- $('.box-check-host').slideUp();
+ $('#new-site-box').slideDown();
+ $('#maintenance-box').slideUp();
+ }else if(valueSelected == "") {
+ $('#new-site-box').slideUp();
+ $('#maintenance-box').slideUp();
+ }else{
+ $('#new-site-box').slideUp();
+ $('#maintenance-box').slideDown();
}
});
diff --git a/app/models/site_request.rb b/app/models/site_request.rb
index 507d364..9b57e41 100644
--- a/app/models/site_request.rb
+++ b/app/models/site_request.rb
@@ -6,6 +6,8 @@ class SiteRequest
field :site_id
field :host_with_rulingdigital, type: Boolean, default: false
field :server_details
+ field :maintenance, type: Boolean, default: false
+ field :maintenance_years, type: Integer
field :optional_modules, type: Array, default: []
field :custom_module, type: Boolean, default: false
field :custom_module_details
diff --git a/app/views/admin/client_managements/_site_spec.html.erb b/app/views/admin/client_managements/_site_spec.html.erb
index c4e0f1c..b5bc1fb 100644
--- a/app/views/admin/client_managements/_site_spec.html.erb
+++ b/app/views/admin/client_managements/_site_spec.html.erb
@@ -8,6 +8,18 @@
<%= @site_request.get_site.site_domain %>
+ <% if @site_request.maintenance %>
+
+
+ Yes
+
+
+
+
+ <%= @site_request.maintenance_years %>
+
+
+ <% end %>
<% else %>
<% if @site_request.host_with_rulingdigital %>
diff --git a/app/views/admin/client_managements/_site_spec_form.html.erb b/app/views/admin/client_managements/_site_spec_form.html.erb
index 6fc258b..5c816fa 100644
--- a/app/views/admin/client_managements/_site_spec_form.html.erb
+++ b/app/views/admin/client_managements/_site_spec_form.html.erb
@@ -21,11 +21,17 @@
<% end %>
<% end %>
-
-
-
- <%= f.number_field :service_cost, :min => "0" %>
-
+<% if @site_request.type == "existing" && @site_request.maintenance %>
+
+
+ <%= f.number_field :service_cost, :min => "0" %>
+
+<% elsif @site_request.type == "newsite" %>
+
+
+ <%= f.number_field :service_cost, :min => "0" %>
+
+<% end %>
<% if !@site_request.optional_modules.blank? %>
@@ -96,7 +102,7 @@
- <%= @contract.new_record? ? 0 : @contract.total_amount %> NTD.
+ <%= @contract.new_record? ? 0 : @contract.total_amount %> NTD.
<% if @contract.new_record? %>
<%= f.hidden_field :site_request, :value => @site_request.id.to_s %>
diff --git a/app/views/admin/client_managements/see_contract.html.erb b/app/views/admin/client_managements/see_contract.html.erb
index 8c8e037..fc2aa19 100644
--- a/app/views/admin/client_managements/see_contract.html.erb
+++ b/app/views/admin/client_managements/see_contract.html.erb
@@ -84,6 +84,9 @@
<% end %>
<% end %>
+ <% if attrib == "service_cost" %>
+ for <%= @site_request.maintenance_years rescue 1 %> year(s)
+ <% end %>
<%= amount %>
diff --git a/app/views/client_managements/_site_spec.html.erb b/app/views/client_managements/_site_spec.html.erb
index 5fc7c1a..833a502 100644
--- a/app/views/client_managements/_site_spec.html.erb
+++ b/app/views/client_managements/_site_spec.html.erb
@@ -11,22 +11,34 @@
<%= @site_request.get_site.site_domain %>
- <% else %>
- <% if @site_request.host_with_rulingdigital %>
-
-
- Yes
-
- <% else %>
-
-
- No
-
-
-
- <%= nl2br @site_request.server_details %>
-
- <% end %>
+ <% if @site_request.maintenance %>
+
+
+ Yes
+
+
+
+
+ <%= @site_request.maintenance_years %>
+
+
+ <% end %>
+<% else %>
+ <% if @site_request.host_with_rulingdigital %>
+
+
+ Yes
+
+ <% else %>
+
+
+ No
+
+
+
+ <%= nl2br @site_request.server_details %>
+
+ <% end %>
<% end %>
<% if !@site_request.optional_modules.blank? %>
diff --git a/app/views/client_managements/addnewsite.html.erb b/app/views/client_managements/addnewsite.html.erb
index e29e7c3..7abb4bb 100644
--- a/app/views/client_managements/addnewsite.html.erb
+++ b/app/views/client_managements/addnewsite.html.erb
@@ -35,7 +35,17 @@
<%= f.label :site_id, "Select or Create" %>
<%= f.select :site_id, @user_sites, {:prompt => "------Select or Create------"}, {:class => "form-control select-site"} %>
-
+
+
+ <%= f.label :maintenance, "Renew my maintenance" %>
+ <%= f.check_box :maintenance %>
+
+
+ <%= f.label :maintenance_years, "Year(s): " %>
+ <%= f.select :maintenance_years, options_for_select((1..5).collect{|i|[i,i]}), :class=>"form-control" %>
+
+
+
Do you want to host with RulingDigital?
<%= f.radio_button :host_with_rulingdigital, "1", {:class => "radio-check"} %>
@@ -135,4 +145,10 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/views/client_managements/contracts.html.erb b/app/views/client_managements/contracts.html.erb
index 1f08882..6e6b1f8 100644
--- a/app/views/client_managements/contracts.html.erb
+++ b/app/views/client_managements/contracts.html.erb
@@ -18,9 +18,9 @@
diff --git a/app/views/client_managements/new_ticket.html.erb b/app/views/client_managements/new_ticket.html.erb
index 6a3812a..1d205a4 100644
--- a/app/views/client_managements/new_ticket.html.erb
+++ b/app/views/client_managements/new_ticket.html.erb
@@ -2,7 +2,7 @@
<% end %>
diff --git a/app/views/client_managements/reopen_ticket.html.erb b/app/views/client_managements/reopen_ticket.html.erb
index 03e96fe..be6720c 100644
--- a/app/views/client_managements/reopen_ticket.html.erb
+++ b/app/views/client_managements/reopen_ticket.html.erb
@@ -11,7 +11,7 @@
<% end %>
diff --git a/app/views/client_managements/see_contract.html.erb b/app/views/client_managements/see_contract.html.erb
index b288daf..9b38b61 100644
--- a/app/views/client_managements/see_contract.html.erb
+++ b/app/views/client_managements/see_contract.html.erb
@@ -88,7 +88,12 @@
<% else %>
-
+
<% end %>
<%= amount %>
diff --git a/app/views/client_managements/show.html.erb b/app/views/client_managements/show.html.erb
index 453cab4..9bc826e 100644
--- a/app/views/client_managements/show.html.erb
+++ b/app/views/client_managements/show.html.erb
@@ -2,7 +2,7 @@
<% end %>
diff --git a/app/views/client_managements/show_ticket.html.erb b/app/views/client_managements/show_ticket.html.erb
index b5d8f98..8356b8d 100644
--- a/app/views/client_managements/show_ticket.html.erb
+++ b/app/views/client_managements/show_ticket.html.erb
@@ -11,7 +11,7 @@
<% end %>