From ffe279b2ee81e30b84e9a2e8b41128c19c974896 Mon Sep 17 00:00:00 2001 From: Zoey Date: Tue, 28 May 2019 12:04:53 +0630 Subject: [PATCH] shift sale item pdf --- app/controllers/origami/shifts_controller.rb | 11 -- app/models/printer/cashier_station_printer.rb | 7 +- app/pdf/close_cashier_pdf.rb | 133 +++++++++--------- app/pdf/receipt_bill_pdf.rb | 20 +-- app/pdf/sale_items_pdf.rb | 14 +- 5 files changed, 88 insertions(+), 97 deletions(-) diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index f33b0b97..f5be805e 100755 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -111,16 +111,6 @@ class Origami::ShiftsController < BaseOrigamiController @total_other_charges = ShiftSale.get_total_other_charges(@shift).total_other_charges_amount @total_credit_payments = ShiftSale.get_shift_sales_with_credit_payment(shift_id).total_credit_payments -# <<<<<<< HEAD -# # close_cashier = Lookup.is_print_close_cashier -# # if close_cashier -# # get printer info -# print_settings = PrintSetting.find_by_unique_code(unique_code) -# printer = Printer::CashierStationPrinter.new(print_settings) - -# printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments) -# # end -# ======= # get printer info print_settings = PrintSetting.find_by_unique_code(unique_code) printer = Printer::CashierStationPrinter.new(print_settings) @@ -135,7 +125,6 @@ class Origami::ShiftsController < BaseOrigamiController if find_close_cashier_print[0][1].to_i > 0 printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items, shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments) end -# >>>>>>> 6c45e8f0a32a9e71992bde41d20ef993b668c42d end end Employee.logout(session[:session_token]) diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index 11669f2f..64c448c0 100755 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -37,8 +37,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker # pdf.render_file filename # self.print(filename, cashier_terminal.printer_name) # end -# <<<<<<< HEAD - + def print_close_cashier(printer_settings,cashier_terminal,shift_sale, sale_items,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) if !sale_items.blank? or !sale_items.nil? @@ -53,10 +52,6 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker @totalByAccount = Hash.new {|hash, key| hash[key] = 0} sale_items.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} end -# ======= - -# def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) -# >>>>>>> 6c45e8f0a32a9e71992bde41d20ef993b668c42d #Use CUPS service #Generate PDF diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index df1c2ab2..4e2fc443 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -516,93 +516,94 @@ class CloseCashierPdf < Prawn::Document bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do text "Sale Items Summary", :size => self.header_font_size, :align => :center end - move_down 5 total_items = 0 total_amount = 0 + total_qty = 0 + sub_total = 0 - if !menu_cate_count.nil? - menu_cate_count.each do |key, value| + arr = Array.new - # account = Account.find(key) - menu_category = MenuCategory.where('code=?', key).last + unless sale_items.nil? + sale_items.each do |item| - y_position = cursor - bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do - text "#{menu_category.name}", :size => self.header_font_size, :align => :left - end - move_down 5 + if !arr.include?(item['menu_category_id']) + + unless total_qty == 0 and sub_total == 0 + total_details('Sub Total', total_qty, sub_total) + end - stroke_horizontal_rule - move_down 2 - y_position = cursor - pad_top(15) { - # @item_width.to_i + @half_qty.to_i + total_qty = 0 + sub_total = 0 + + move_down 10 + + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "#{item['menu_category_name']}", :size => self.header_font_size, :align => :left + end + + # write_stroke_dash + # dash(1, :space => 1, :phase => 1) + # stroke_horizontal_rule + # move_down 2 + y_position = cursor + pad_top(15) { text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - } - move_down 2 - stroke_horizontal_rule - - total_qty = 0 - sub_total = 0 - - sale_items.each do |item| - - if item.menu_category_id == key - total_qty += item.total_item.to_i - sub_total += item.grand_total.to_i - - - move_down 5 - - y_position = cursor - pad_top(15) { - # @item_width.to_i + @half_qty.to_i - text_box "#{item.product_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix - text_box "#{item.unit_price.to_i}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{item.total_item.to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{item.grand_total.to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - } - # move_down 3 - end + } + move_down 2 + stroke_horizontal_rule end - stroke_horizontal_rule - move_down 5 - # item_label_qty_front_width = (self.item_width+self.price_width) + 2 - # item_label_qty_end_width = 32 - # item_label_total_front_width = (self.item_width+self.price_width) + 2 - # item_label_total_end_width = 64 - total_items += total_qty - total_amount += sub_total + + move_down 3 y_position = cursor pad_top(15) { - # @item_width.to_i + @half_qty.to_i - text_box "Sub Total", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix - # text_box "#{item.unit_price.to_i}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{total_qty}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{sub_total}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + bounding_box([0,y_position], :width =>self.item_width) do + text "#{item['product_name']}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix + end + text_box "#{item['unit_price'].to_i}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{item['total_item'].to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{item['grand_total'].to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } - move_down 10 + + if item['total_item'].to_i > 0 + total_qty += item['total_item'].to_i + total_items += item['total_item'].to_i + end + + sub_total += item['grand_total'].to_i + total_amount += item['grand_total'].to_i + arr.push(item['menu_category_id']) end - stroke_horizontal_rule + # stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) move_down 5 - - y_position = cursor - pad_top(15) { - # @item_width.to_i + @half_qty.to_i - text_box "Total Amount", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix - # text_box "#{item.unit_price.to_i}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{total_items}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{total_amount}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - } - + total_details('Total Amount', total_items, total_amount) move_down 10 end end + + def total_details(col_name, total_qty, sub_total) + self.item_width = 73 + self.price_width = 60 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = 32 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = 64 + + move_down 5 + stroke_horizontal_rule + y_position = cursor + pad_top(15) { + text_box "#{col_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{total_qty.to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{sub_total.to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + end end \ No newline at end of file diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index fbb15b1b..97f6dfc2 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -292,18 +292,18 @@ class ReceiptBillPdf < Prawn::Document text "#{product_name}", :size => self.item_font_size,:align => :left end # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size - text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - if show_alt_name - if !(item.product_alt_name).empty? - move_down 2 - # font("public/fonts/NotoSansCJKtc-Regular.ttf") do - text "(#{item.product_alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true - # end - end + if show_alt_name + if !(item.product_alt_name).empty? + move_down 2 + # font("public/fonts/NotoSansCJKtc-Regular.ttf") do + text "(#{item.product_alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true + # end end + end move_down line_move } diff --git a/app/pdf/sale_items_pdf.rb b/app/pdf/sale_items_pdf.rb index 45da87a3..30c6e835 100644 --- a/app/pdf/sale_items_pdf.rb +++ b/app/pdf/sale_items_pdf.rb @@ -173,7 +173,7 @@ class SaleItemsPdf < Prawn::Document y_position = cursor pad_top(15) { text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix - text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :left, :overflow => :shrink_to_fix text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } @@ -186,14 +186,20 @@ class SaleItemsPdf < Prawn::Document y_position = cursor pad_top(15) { - text_box "#{item['product_name']}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + bounding_box([0,y_position], :width =>self.item_width) do + text "#{item['product_name']}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix + end text_box "#{item['unit_price'].to_i}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix text_box "#{item['total_item'].to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix text_box "#{item['grand_total'].to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } - total_qty += item['total_item'].to_i + + if item['total_item'].to_i > 0 + total_qty += item['total_item'].to_i + total_items += item['total_item'].to_i + end + sub_total += item['grand_total'].to_i - total_items += item['total_item'].to_i total_amount += item['grand_total'].to_i arr.push(item['menu_category_id']) end