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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

Browse Source
This commit is contained in:
Aung Myo
2017-10-24 15:56:44 +06:30
parent d725777638 33fc467a58
commit 85e2c48e5e
2 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/pdf/order_item_pdf.rb
View File

@@ -17,17 +17,17 @@ class OrderItemPdf < Prawn::Document
# super(:margin => [10, 5, 30, 5], :page_size => [200,400]) # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
# db font setup # db font setup
if print_settings.font != "" # if print_settings.font != ""
font_families.update("#{print_settings.font}" => { # font_families.update("#{print_settings.font}" => {
:normal => "public/fonts/#{print_settings.font}.ttf", # :normal => "public/fonts/#{print_settings.font}.ttf",
:italic => "public/fonts/#{print_settings.font}.ttf", # :italic => "public/fonts/#{print_settings.font}.ttf",
:bold => "public/fonts/#{print_settings.font}.ttf", # :bold => "public/fonts/#{print_settings.font}.ttf",
:bold_italic => "public/fonts/#{print_settings.font}.ttf" # :bold_italic => "public/fonts/#{print_settings.font}.ttf"
}) # })
font "#{print_settings.font}" # font "#{print_settings.font}"
fallback_fonts ["Courier", "Helvetica", "Times-Roman"] # fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
end # end
# font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/Zawgyi-One.ttf"
# font "public/fonts/padauk.ttf" # font "public/fonts/padauk.ttf"
#font "public/fonts/Chinese.ttf" #font "public/fonts/Chinese.ttf"
@@ -42,7 +42,7 @@ class OrderItemPdf < Prawn::Document
order_info(order_item.order_id, order_item.order_by,order_item.order_at) order_info(order_item.order_id, order_item.order_by,order_item.order_at)
# order items # order items
order_items(order_item, options, alt_name, print_settings.precision) order_items(order_item, options, alt_name, print_settings.precision,print_settings.font)
end end
# Write Order Information to PDF # Write Order Information to PDF
@@ -70,11 +70,11 @@ class OrderItemPdf < Prawn::Document
end end
# Write Order items to PDF # Write Order items to PDF
def order_items(order_item, options, alt_name, precision) def order_items(order_item, options, alt_name, precision, font)
y_position = cursor y_position = cursor
#Add Order Item #Add Order Item
add_order_items(order_item, options, alt_name, precision) add_order_items(order_item, options, alt_name, precision, font)
dash(1, :space => 1, :phase => 1) dash(1, :space => 1, :phase => 1)
stroke_horizontal_line 0, (self.page_width - self.margin) stroke_horizontal_line 0, (self.page_width - self.margin)
@@ -82,7 +82,19 @@ class OrderItemPdf < Prawn::Document
end end
# Add order items under order info # Add order items under order info
def add_order_items(order_item, options, alt_name, precision) def add_order_items(order_item, options, alt_name, precision, font)
# db font setup
if font != ""
font_families.update("#{font}" => {
:normal => "public/fonts/#{font}.ttf",
:italic => "public/fonts/#{font}.ttf",
:bold => "public/fonts/#{font}.ttf",
:bold_italic => "public/fonts/#{font}.ttf"
})
font "#{font}"
fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
end
y_position = cursor y_position = cursor
move_down 5 move_down 5

34
app/pdf/order_summary_pdf.rb
View File

@@ -15,18 +15,6 @@ class OrderSummaryPdf < Prawn::Document
super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
# db font setup
if print_settings.font != ""
font_families.update("#{print_settings.font}" => {
:normal => "public/fonts/#{print_settings.font}.ttf",
:italic => "public/fonts/#{print_settings.font}.ttf",
:bold => "public/fonts/#{print_settings.font}.ttf",
:bold_italic => "public/fonts/#{print_settings.font}.ttf"
})
font "#{print_settings.font}"
fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
end
# font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/Zawgyi-One.ttf"
# font "public/fonts/padauk.ttf" # font "public/fonts/padauk.ttf"
self.header_font_size = 12 self.header_font_size = 12
@@ -41,9 +29,9 @@ class OrderSummaryPdf < Prawn::Document
# order items # order items
if order_items == nil if order_items == nil
order_items(order, alt_name, print_settings.precision) order_items(order, alt_name, print_settings.precision,print_settings.font)
else else
order_items(order_items, alt_name, print_settings.precision) order_items(order_items, alt_name, print_settings.precision,print_settings.font)
end end
end end
@@ -72,7 +60,7 @@ class OrderSummaryPdf < Prawn::Document
end end
# Write Order items to PDF # Write Order items to PDF
def order_items(order_item, alt_name, precision) def order_items(order_item, alt_name, precision,font)
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
@@ -87,12 +75,24 @@ class OrderSummaryPdf < Prawn::Document
move_down 5 move_down 5
#Add Order Item #Add Order Item
add_order_items(order_item, alt_name, precision) add_order_items(order_item, alt_name, precision, font)
end end
# Add order items under order info # Add order items under order info
def add_order_items(order_item, alt_name, precision) def add_order_items(order_item, alt_name, precision, font)
# db font setup
if font != ""
font_families.update("#{font}" => {
:normal => "public/fonts/#{font}.ttf",
:italic => "public/fonts/#{font}.ttf",
:bold => "public/fonts/#{font}.ttf",
:bold_italic => "public/fonts/#{font}.ttf"
})
font "#{font}"
fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
end
y_position = cursor y_position = cursor
move_down 5 move_down 5