git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

payment tax UI

Browse Source
This commit is contained in:
phyusin
2018-05-24 15:30:44 +06:30
parent b56f2793bd
commit 445f98cf7c
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/payments_controller.rb
View File

@@ -300,7 +300,7 @@ class Origami::PaymentsController < BaseOrigamiController
@account_arr =[] @account_arr =[]
accounts.each do |acc| accounts.each do |acc|
account = TaxProfile.find(acc.id) account = TaxProfile.find(acc.id)
@account_arr.push(account) @account_arr.push(account.name)
end end
rebate = MembershipSetting.find_by_rebate(1) rebate = MembershipSetting.find_by_rebate(1)

56
app/views/origami/payments/show.html.erb
View File

@@ -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> <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>
<tr> <tr>
<td class="charges-name"><strong>Tax <td class="charges-name">
(<% @i = 0 <strong>
@account_arr.each do |ct| %> Tax
<%=ct.name%> <!-- (<% @i = 0
<% if @account_arr.count != @i+1%> @account_arr.each do |ct| %>
+ <% @i =+1 %> <%=ct%>
<%end%> <% if @account_arr.count != @i+1%>
<%end %>) + <% @i =+1 %>
</strong></td> <%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> <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>
<tr> <tr>