update closing receipt

app/models/printer/cashier_station_printer.rb

@@ -22,14 +22,14 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   # end
 
   #Bill Receipt Print
-  def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes)
+  def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount)
     #Use CUPS service
     #Generate PDF
     #Print
     cashier = shift_sale.employee.name
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
 
-    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes)
+    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount)
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
     pdf.render_file filename
     self.print(filename)

app/models/sale.rb

@@ -569,7 +569,7 @@ def self.get_item_query()
 
     query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
     query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id")
-  end  
+end  
   
     
   def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
@@ -746,15 +746,6 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
   end 
 end
 
-# def self.get_separate_tax(from,to,payment_method=nil)
-        
-#     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
-#                   .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id")
-#                   .group("sale_taxes.tax_name")
-                       
-#       return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to)
-# end
-
 def grand_total_after_rounding
     return self.old_grand_total.to_f + self.rounding_adjustment.to_f
 end

app/models/shift_sale.rb

@@ -88,4 +88,33 @@ class ShiftSale < ApplicationRecord
      closing_balance = shiftobj.grand_total + shiftobj.cash_in - shiftobj.cash_out + shiftobj.total_cash
      return closing_balance
   end
+
+  def self.get_by_shift_other_payment(shift)
+        
+    other_payment = Sale.select("sale_payments.payment_method as name,
+                        SUM(case when (sale_payments.payment_method='mpu') then (sale_payments.payment_amount) else 0 end) as mpu_amount, 
+                        SUM(case when (sale_payments.payment_method='visa') then (sale_payments.payment_amount) else 0 end) as visa_amount, 
+                        SUM(case when (sale_payments.payment_method='master') then (sale_payments.payment_amount) else 0 end) as master_amount, 
+                        SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, 
+                        SUM(case when (sale_payments.payment_method='paypar') then (sale_payments.payment_amount) else 0 end) as paypar_amount")
+                .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+                .where("sales.shift_sale_id =? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.id)
+  end
+
+  def self.calculate_total_price_by_accounts(shift,type)
+      query = Sale.select("acc.title as account_name," + 
+                          "SUM(case when (acc.id=i.account_id) then (i.price) else 0 end) as total_price")
+      
+      query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id "+
+                          "JOIN accounts acc ON acc.id = i.account_id" + 
+                          " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id")
+      if type == 'discount'
+        query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.is_taxable = false and i.remark = 'Discount'", shift.id)
+                .group("acc.title").order("acc.id")
+      else
+        query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id)
+                .group("acc.title").order("acc.id")
+      end
+  end  
+
 end