merge with origin master

This commit is contained in:
Yan
2017-06-18 12:50:07 +06:30
12 changed files with 78 additions and 80 deletions

View File

@@ -11,7 +11,6 @@ class ReceiptBillPdf < Prawn::Document
self.item_height = 15
self.item_description_width = (self.page_width-20) / 2
self.label_width = 100
# @item_width = self.page_width.to_i / 2
# @qty_width = @item_width.to_i / 3
# @double = @qty_width * 1.3
@@ -36,7 +35,6 @@ class ReceiptBillPdf < Prawn::Document
if member_info != nil
member_info(member_info)
end
footer
end
@@ -206,10 +204,10 @@ class ReceiptBillPdf < Prawn::Document
# show member information
def member_info(member_info)
move_down 7
if member_info["status"] == true
member_info["data"].each do |res|
if member_info["status"] == true
member_info["data"].each do |res|
move_down 5
y_position = cursor
@@ -219,9 +217,9 @@ class ReceiptBillPdf < Prawn::Document
bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
text "#{ res["balance"] }" , :size => self.item_font_size,:align => :right
end
end
end
end
end
end
def footer