From 4b73920e1869491b718ea9ecb5f07ff7dfc84aeb Mon Sep 17 00:00:00 2001 From: Zoey Date: Mon, 3 Jun 2019 16:47:49 +0630 Subject: [PATCH] total other amount added to SaleItemsPdf --- .../reports/saleitem_controller.rb | 12 ++++-- app/models/printer/cashier_station_printer.rb | 6 +-- app/models/shift_sale.rb | 9 +++- app/pdf/close_cashier_pdf.rb | 25 +++++++---- app/pdf/sale_items_pdf.rb | 40 +++++++++++++----- app/pdf/sale_items_star_pdf.rb | 39 ++++++++++++----- dump.rdb | Bin 1229 -> 1343 bytes 7 files changed, 95 insertions(+), 36 deletions(-) diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index 1db8f7f3..df61d197 100755 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -117,8 +117,14 @@ class Reports::SaleitemController < BaseReportController account_type = params[:account_type] @type = params[:period_type] period_name = get_period_name(params[:period]) - @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type) + @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type) + other_charges = Sale.get_other_charges() + if shift.present? + @total_other_charges = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) + else + @total_other_charges = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) + end # get printer info print_settings = PrintSetting.find_by_unique_code('CloseCashierPdf') # SaleItemsPdf @@ -127,11 +133,11 @@ class Reports::SaleitemController < BaseReportController if print_settings.nil? if !print_settings_star.nil? printer = Printer::CashierStationPrinter.new(print_settings_star) - printer.print_sale_items_report(print_settings_star, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data) + printer.print_sale_items_report(print_settings_star, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) end else printer = Printer::CashierStationPrinter.new(print_settings) - printer.print_sale_items_report(print_settings, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data) + printer.print_sale_items_report(print_settings, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) end diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index b2762071..d5ac2e73 100755 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -81,15 +81,15 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker end end - def print_sale_items_report(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items) + def print_sale_items_report(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges) filename = "tmp/reports_sale_items.pdf" if print_settings.unique_code == "CloseCashierPdf" - pdf = SaleItemsPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, nil, nil, nil) + pdf = SaleItemsPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges, nil, nil, nil) puts 'Printing!!!!' end if print_settings.unique_code == "CloseCashierStarPdf" - pdf = SaleItemsStarPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, nil, nil, nil) + pdf = SaleItemsStarPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges, nil, nil, nil) puts 'PrintingStar!!!!' end diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index eb812b7b..21386e90 100755 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -156,7 +156,14 @@ class ShiftSale < ApplicationRecord .joins("JOIN customers as c ON c.customer_id = sales.customer_id") .where('shift_sale_id =? and sales.sale_status = "completed" and c.customer_type = "Takeaway" and c.membership_id is null',shift.id) .first() - end + end + + # def self.get_total_other_charges_for_sale_item_report(from, to) + # query = SaleItem.select("sum(sale_items.qty * sale_items.unit_price) as total_other_charges_amount") + # .joins("JOIN sales as s ON s.sale_id = sale_items.sale_id") + # .joins("JOIN shift_sales ss ON ss.id = s.shift_sale_id") + # .where('s.sale_status = "completed" and sale_items.product_code = "Other Charges" and sale_items.item_instance_code is null and s.receipt_date between ? and ?',from, to) + # end def self.get_total_other_charges(shift) query = SaleItem.select("sum(sale_items.qty * sale_items.unit_price) as total_other_charges_amount") diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 4e2fc443..100b4bfb 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -57,7 +57,7 @@ class CloseCashierPdf < Prawn::Document shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments) if !sale_items.nil? or !sale_items.blank? - sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc) + sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges) end end @@ -504,7 +504,7 @@ class CloseCashierPdf < Prawn::Document end - def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc) + def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges) self.item_width = 73 self.price_width = 60 item_label_qty_front_width = (self.item_width+self.price_width) + 2 @@ -521,6 +521,7 @@ class CloseCashierPdf < Prawn::Document total_amount = 0 total_qty = 0 sub_total = 0 + flag = false arr = Array.new @@ -529,12 +530,15 @@ class CloseCashierPdf < Prawn::Document if !arr.include?(item['menu_category_id']) - unless total_qty == 0 and sub_total == 0 + if flag == true + move_down 5 + stroke_horizontal_rule total_details('Sub Total', total_qty, sub_total) end total_qty = 0 sub_total = 0 + flag = true move_down 10 @@ -571,7 +575,7 @@ class CloseCashierPdf < Prawn::Document 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 } - if item['total_item'].to_i > 0 + if item['total_item'].to_i > 0 or item['status_type'] == 'foc' or item['status_type'] == 'void' total_qty += item['total_item'].to_i total_items += item['total_item'].to_i end @@ -581,11 +585,17 @@ class CloseCashierPdf < Prawn::Document arr.push(item['menu_category_id']) end - # stroke_horizontal_rule + move_down 5 + stroke_horizontal_rule total_details('Sub Total', total_qty, sub_total) move_down 5 + move_down 5 + stroke_horizontal_rule total_details('Total Amount', total_items, total_amount) - move_down 10 + + # other_charges = get_other_charges(total_other_charges) + total_details('Total Other Amount', nil, total_other_charges) + move_down 20 end end @@ -597,8 +607,7 @@ class CloseCashierPdf < Prawn::Document 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 diff --git a/app/pdf/sale_items_pdf.rb b/app/pdf/sale_items_pdf.rb index 3b92fac8..91a6ac65 100644 --- a/app/pdf/sale_items_pdf.rb +++ b/app/pdf/sale_items_pdf.rb @@ -2,7 +2,7 @@ class SaleItemsPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, acc_cate_count, menu_cate_count, total_by_acc) + def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, total_other_charges, acc_cate_count, menu_cate_count, total_by_acc) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height self.header_font_size = printer_settings.header_font_size.to_i @@ -58,7 +58,7 @@ class SaleItemsPdf < Prawn::Document sale_details(period, type, account, from_date, to_date, shift) - sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc) + sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges) end def header (shop_details) @@ -127,7 +127,7 @@ class SaleItemsPdf < Prawn::Document move_down 10 end - def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc) + def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges) self.item_width = 73 self.price_width = 60 item_label_qty_front_width = (self.item_width+self.price_width) + 2 @@ -144,6 +144,7 @@ class SaleItemsPdf < Prawn::Document total_amount = 0 total_qty = 0 sub_total = 0 + flag = false arr = Array.new @@ -152,10 +153,14 @@ class SaleItemsPdf < Prawn::Document if !arr.include?(item['menu_category_id']) - unless total_qty == 0 and sub_total == 0 + if flag == true + move_down 5 + stroke_horizontal_rule total_details('Sub Total', total_qty, sub_total) end + flag = true + total_qty = 0 sub_total = 0 @@ -173,7 +178,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 => :left, :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 } @@ -194,7 +199,7 @@ class SaleItemsPdf < Prawn::Document 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 } - if item['total_item'].to_i > 0 + if item['total_item'].to_i > 0 or item['status_type'] == 'foc' or item['status_type'] == 'void' total_qty += item['total_item'].to_i total_items += item['total_item'].to_i end @@ -204,11 +209,17 @@ class SaleItemsPdf < Prawn::Document arr.push(item['menu_category_id']) end - # stroke_horizontal_rule + move_down 5 + stroke_horizontal_rule total_details('Sub Total', total_qty, sub_total) move_down 5 + move_down 5 + stroke_horizontal_rule total_details('Total Amount', total_items, total_amount) - move_down 10 + + other_charges = get_other_charges(total_other_charges) + total_details('Total Other Amount', nil, other_charges) + move_down 20 end end @@ -220,8 +231,6 @@ class SaleItemsPdf < Prawn::Document 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 @@ -230,4 +239,15 @@ class SaleItemsPdf < Prawn::Document } end + def get_other_charges(total_other_charges) + other_sub_total = 0 + unless total_other_charges.nil? + total_other_charges.each do |charges| + other_sub_total += charges.grand_total + end + end + + return other_sub_total + end + end diff --git a/app/pdf/sale_items_star_pdf.rb b/app/pdf/sale_items_star_pdf.rb index 8ce08f28..b407cf86 100644 --- a/app/pdf/sale_items_star_pdf.rb +++ b/app/pdf/sale_items_star_pdf.rb @@ -2,7 +2,7 @@ class SaleItemsStarPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, acc_cate_count, menu_cate_count, total_by_acc) + def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, total_other_charges, acc_cate_count, menu_cate_count, total_by_acc) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height self.header_font_size = printer_settings.header_font_size.to_i @@ -58,7 +58,7 @@ class SaleItemsStarPdf < Prawn::Document sale_details(period, type, account, from_date, to_date, shift) - sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc) + sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges) end def header (shop_details) @@ -127,7 +127,7 @@ class SaleItemsStarPdf < Prawn::Document move_down 10 end - def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc) + def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges) self.item_width = 73 self.price_width = 35 item_label_qty_front_width = (self.item_width+self.price_width) + 2 @@ -152,9 +152,11 @@ class SaleItemsStarPdf < Prawn::Document if !arr.include?(item['menu_category_id']) - unless total_qty == 0 and sub_total == 0 - total_details('Sub Total', total_qty, sub_total) - end + if flag == true + move_down 5 + stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) + end total_qty = 0 sub_total = 0 @@ -194,7 +196,7 @@ class SaleItemsStarPdf < Prawn::Document 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 } - if item['total_item'].to_i > 0 + if item['total_item'].to_i > 0 or item['status_type'] == 'foc' or item['status_type'] == 'void' total_qty += item['total_item'].to_i total_items += item['total_item'].to_i end @@ -204,11 +206,17 @@ class SaleItemsStarPdf < Prawn::Document arr.push(item['menu_category_id']) end - # stroke_horizontal_rule + move_down 5 + stroke_horizontal_rule total_details('Sub Total', total_qty, sub_total) move_down 5 + move_down 5 + stroke_horizontal_rule total_details('Total Amount', total_items, total_amount) - move_down 10 + + other_charges = get_other_charges(total_other_charges) + total_details('Total Other Amount', nil, other_charges) + move_down 20 end end @@ -220,8 +228,6 @@ class SaleItemsStarPdf < Prawn::Document 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 @@ -230,4 +236,15 @@ class SaleItemsStarPdf < Prawn::Document } end + def get_other_charges(total_other_charges) + other_sub_total = 0 + unless total_other_charges.nil? + total_other_charges.each do |charges| + other_sub_total += charges.grand_total + end + end + + return other_sub_total + end + end diff --git a/dump.rdb b/dump.rdb index 55991a961be21afb68a1f837181456658497ba6a..cfefa63bd033120c872b15045cbd92045a6778fb 100644 GIT binary patch literal 1343 zcmaJ>&5P4O6rYr~+O1oph_WKI4jwyYk~C==4_45_qJkfIQmNBq+6I%RO(qLP_HPhR zqTcjR(1Ry8yL<8E#e-LGf=3k(v8+y0w);WSYu@j@{65~ByVtL+-@_PdQNg38<)aPi zfg|LET99~K8moV@D z+4*|m3GdIIH(ZlSHtFiJibdVPEka0-5Q8e&+&Hi(%k_xu(`=U#Ru&bdr6_8vq12_8 zCQ7oJ?FRlN1X*j?b9dVx+PjsfaNzoENE`}vxIZ1%ASdcEYIZ7wK|LNMV+G^7)(};# z*{H#hWx^SYoLGa5^sARwO~>z;bi;N>4jr=U)r#Q`jllEh(3n77QfhD<(17|-e*jI| zBLT46mrf6?{-87REZ4Kx1U{<4>ZU+>p;{Cyv%20s_f2^D*ee~;3OAFSNYK8gf zpVHQNso$cq{RtevjwcsqA}V19l#T|ry^=|ZNew}!upg{1ED0)wI{&8_f~4u%Y(2pA z)sJ_#Vo`}~G2gSK=A~o#4>S3BD8h+25}Qq*-?{l^iFqo*GH0_uC9s)8QgqHwBBeN& zno?{ciMyOq)DV_J;lQM{OT*gs3otcqe|*10qk^Q_*?vayjU|pZIb?C!2{y!MT}}!m zCVPlQV)Kkbs#tlpD+wCoHz$5G7UUC9@qXiGNR!F&8v>ws=rs$^{QLfPuOFGk*Z%>G C->JC( delta 576 zcmY*W&ui0Q7*5i!KhoCL)v`hd62rzkG+XjzP17I}^fW~At}?zRU$HApiYlo zZ2iE)KoI|e!BjlisO+f!fDAl&5MehDv#9CH5DzcB@VxKyKJW94^PkwEBz@UGym^$1 z0&EHnc0Rn#6{({la=U`(W8`#f98s!k5*Y|gm;?$y7QG=Q_=+GrP$Yk;3)GW`fgIH0p8?xM&J6Yg4B z6=X4{CO=E#{>k!FCO?HPC*(>3-QInkyOT%(3x;cAXrqoMiz;kt5^N$YH&p{E5TyH& zg~N0g*#QPtuj_u)-{||KM4x+5Mj@|B&1M@)vI5l=$Q8~giqhac%j9QV4L(Gh+=Wx7 z6Kt6HuI+jb?uFc?qT%+8$oFy281S0DT%NtaYd84W6Z+!mEo*aY!}BfIx55E`tHE>k zX>99@T!FSsZe3rieWiD{gVKL``Fo%f1%sFZ9gM=cnYxw&#g(