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

show incl exec in receipt bill

Browse Source
This commit is contained in:
phyusin
2018-05-25 14:46:40 +06:30
parent 5feea91584
commit 590b67abdf
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/sale.rb
View File

@@ -421,6 +421,7 @@ class Sale < ApplicationRecord
end end
total_tax_amount = 0 total_tax_amount = 0
tax_incl_exec = "execulsive"
#tax_profile - list by order_by #tax_profile - list by order_by
tax_profiles = TaxProfile.all.order("order_by asc") tax_profiles = TaxProfile.all.order("order_by asc")
customer = Customer.find(sale.customer_id) customer = Customer.find(sale.customer_id)
@@ -483,7 +484,7 @@ class Sale < ApplicationRecord
end end
end end
end end
sale.tax_type =
sale.total_tax = total_tax_amount sale.total_tax = total_tax_amount
end end

6
app/pdf/receipt_bill_a5_pdf.rb
View File

@@ -303,12 +303,16 @@ class ReceiptBillA5Pdf < Prawn::Document
end end
if sale_data.sale_taxes.length > 0 if sale_data.sale_taxes.length > 0
incl_tax = ""
if sale_data.tax_type == "inculsive"
incl_tax = "Incl."
end
sale_data.sale_taxes.each do |st| sale_data.sale_taxes.each do |st|
move_down line_move move_down line_move
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
text "#{ st.tax_name } ( #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
end end
bounding_box([self.description_width,y_position], :width =>self.label_width) do bounding_box([self.description_width,y_position], :width =>self.label_width) do
text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right

7
app/pdf/receipt_bill_pdf.rb
View File

@@ -290,12 +290,17 @@ class ReceiptBillPdf < Prawn::Document
end end
if sale_data.sale_taxes.length > 0 if sale_data.sale_taxes.length > 0
incl_tax = ""
if sale_data.tax_type == "inculsive"
incl_tax = "Incl."
end
sale_data.sale_taxes.each do |st| sale_data.sale_taxes.each do |st|
move_down line_move move_down line_move
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
text "#{ st.tax_name } ( #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
end end
bounding_box([self.item_description_width,y_position], :width =>self.label_width) do bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right