diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 045afafb..40d8c573 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -300,7 +300,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @account_arr =[]
       accounts.each do |acc|
         account = TaxProfile.find(acc.id)
-        @account_arr.push(account)
+        @account_arr.push(account.name)
       end
       
       rebate = MembershipSetting.find_by_rebate(1)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index fb4824ec..477cdca6 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -97,15 +97,53 @@
               <td class="item-attr"><strong><span>(<%= number_with_precision(@sale_data.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>)</span></strong></td>
             </tr>
             <tr>
-              <td class="charges-name"><strong>Tax
-              (<% @i = 0
-               @account_arr.each do |ct| %>
-                <%=ct.name%>
-                <% if @account_arr.count != @i+1%>
-                  +       <% @i =+1 %>
-                <%end%>
-              <%end %>)
-              </strong></td>
+              <td class="charges-name">
+                <strong>
+                Tax
+                <!-- (<% @i = 0
+                 @account_arr.each do |ct| %>
+                  <%=ct%>
+                  <% if @account_arr.count != @i+1%>
+                    +       <% @i =+1 %>
+                  <%end%>
+                <%end %>) -->
+                <div class="row m-l-15">
+                  <div class="col-xs-6 col-sm-3 col-md-3 col-lg-3">
+                    <div class="form-check">
+                      <input type="radio" class="form-check-input" id="tax_type_0" name="tax_type" checked="checked">
+                      <label class="form-check-label" for="tax_type_0">
+                        Service Charges + Commercial Tax
+                      </label>
+                    </div>
+                  </div>
+
+                  <div class="col-xs-6 col-sm-3 col-md-3 col-lg-3">
+                    <div class="form-check">
+                      <input type="radio" class="form-check-input" id="tax_type_1" name="tax_type">
+                      <label class="form-check-label" for="tax_type_1">Service Charges</label>
+                    </div>
+                  </div>
+                  
+                  <div class="col-xs-6 col-sm-3 col-md-3 col-lg-3">
+                    <div class="form-check">
+                      <input type="radio" class="form-check-input" id="tax_type_2" name="tax_type">
+                      <label class="form-check-label" for="tax_type_2">
+                        Commercial Tax
+                      </label>
+                    </div>
+                  </div>
+
+                   <div class="col-xs-6 col-sm-3 col-md-3 col-lg-3">
+                    <div class="form-check">
+                      <input type="radio" class="form-check-input" id="tax_type_3" name="tax_type">
+                      <label class="form-check-label" for="tax_type_3">
+                        No Tax
+                      </label>
+                    </div>
+                  </div>
+                </div>
+                </strong>
+              </td>
               <td class="item-attr"><strong><span><%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></span></strong></td>
             </tr>
             <tr>