From b16483708a06e834e94238c02c7020b27f84b8d5 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 16 Mar 2018 17:21:55 +0630 Subject: [PATCH] tax profiles --- .../settings/tax_profiles_controller.rb | 30 ++++++++++++++++++- .../settings/tax_profiles/_form.html.erb | 27 +++++++++++++++-- .../settings/tax_profiles/index.html.erb | 4 +-- app/views/settings/tax_profiles/show.html.erb | 5 ++++ 4 files changed, 59 insertions(+), 7 deletions(-) diff --git a/app/controllers/settings/tax_profiles_controller.rb b/app/controllers/settings/tax_profiles_controller.rb index 6e6e08f5..75e4343e 100755 --- a/app/controllers/settings/tax_profiles_controller.rb +++ b/app/controllers/settings/tax_profiles_controller.rb @@ -7,7 +7,17 @@ class Settings::TaxProfilesController < ApplicationController def index @settings_tax_profiles = TaxProfile.all tax_profiles = Lookup.collection_of("tax_profiles") - + if !@settings_tax_profiles.nil? + @settings_tax_profiles.each_with_index do |setting_tax_profile, tax_index| + if !tax_profiles.nil? + tax_profiles.each do |group| + if setting_tax_profile.group_type == group[1] + @settings_tax_profiles[tax_index].group_type = group[0] + end + end + end + end + end end # GET /settings/tax_profiles/1 @@ -17,11 +27,19 @@ class Settings::TaxProfilesController < ApplicationController # GET /settings/tax_profiles/new def new + @name = nil @settings_tax_profile = TaxProfile.new + @tax_profiles = TaxProfile.all end # GET /settings/tax_profiles/1/edit def edit + @settings_tax_profile = TaxProfile.find(params[:id]) + @name = nil + if !@settings_tax_profile.nil? + @name = @settings_tax_profile.name + end + @tax_profiles = TaxProfile.all end # POST /settings/tax_profiles @@ -71,6 +89,16 @@ class Settings::TaxProfilesController < ApplicationController # Use callbacks to share common setup or constraints between actions. def set_settings_tax_profile @settings_tax_profile = TaxProfile.find(params[:id]) + tax_profiles = Lookup.collection_of("tax_profiles") + if !@settings_tax_profile.nil? + if !tax_profiles.nil? + tax_profiles.each do |group| + if @settings_tax_profile.group_type == group[1] + @settings_tax_profile.group_type = group[0] + end + end + end + end end # Never trust parameters from the scary internet, only allow the white list through. diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb index 1997e655..5ffd29aa 100755 --- a/app/views/settings/tax_profiles/_form.html.erb +++ b/app/views/settings/tax_profiles/_form.html.erb @@ -9,14 +9,15 @@
<%= f.input :group_type, :collection => Lookup.collection_of("tax_profiles"),:input_html=>{:class=>"col-md-10"},:required=>true %> - <%= f.input :name %> + <%= f.input :name, :input_html=>{:onchange=>"checkDuplicate(this.value);"} %> + <%= f.input :rate %> <%= f.input :inclusive %> <%= f.input :order_by %>
- <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> + <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect btn_submit' %>
<% end %> @@ -46,5 +47,25 @@ - + diff --git a/app/views/settings/tax_profiles/index.html.erb b/app/views/settings/tax_profiles/index.html.erb index bda31d46..e1e63c06 100755 --- a/app/views/settings/tax_profiles/index.html.erb +++ b/app/views/settings/tax_profiles/index.html.erb @@ -30,9 +30,7 @@ <% @settings_tax_profiles.each do |settings_tax_profile| %> - - <%= settings_tax_profile.group_type %> - + <%= settings_tax_profile.group_type %> <%= settings_tax_profile.name %> <%= settings_tax_profile.rate %> <%= settings_tax_profile.inclusive %> diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb index 77a503f2..b405066f 100755 --- a/app/views/settings/tax_profiles/show.html.erb +++ b/app/views/settings/tax_profiles/show.html.erb @@ -15,6 +15,11 @@

<%= t("en.tax_profile") %>

+ + + + +
<%= t("views.right_panel.detail.group_type") %>:<%= @settings_tax_profile.group_type %>
<%= t("views.right_panel.detail.name") %>: <%= @settings_tax_profile.name %>