diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index f5be805e..f28c1428 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -95,6 +95,8 @@ class Origami::ShiftsController < BaseOrigamiController
         @lookup = Lookup.shift_sale_items_lookup_value
         if @lookup.to_i == 1
           @sale_items    = Sale.get_shift_sale_items(@shift.id)
+          other_charges = Sale.get_other_charges()
+          @total_other_charges_info = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",@shift)
         end
         @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
         @total_waste   = Sale.get_total_waste(shift_id).sum(:grand_total)
@@ -123,7 +125,7 @@ class Origami::ShiftsController < BaseOrigamiController
           end
           find_close_cashier_print = Lookup.collection_of('close_cashier_print')
           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)
+            printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items, @total_other_charges_info, 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
       end
     end
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 4943d5c5..b581eae8 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('SaleItemsPdf') # SaleItemsPdf
@@ -132,15 +138,13 @@ 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
 
-
-
     respond_to do |format|
       format.html { redirect_to '/en/reports/saleitem/', notice: 'Printing Completed.'}
       format
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index 0a969ca0..0c42a05f 100755
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -94,8 +94,9 @@ class Reports::ShiftsaleController < BaseReportController
 		print_settings = PrintSetting.find_by_unique_code(unique_code)
 		printer = Printer::CashierStationPrinter.new(print_settings)
 
-		printer.print_close_cashier(print_settings,cashier_terminal,@shift, nil, 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)
-
+		# printer.print_close_cashier(print_settings,cashier_terminal,@shift, nil, 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)
+		printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items, @total_other_charges_info, 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)
+		
 		respond_to do |format|
 			format.html { redirect_to '/en/reports/shiftsale/', notice: 'Printing Completed.'}
 			format
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index 15a6d289..ef719810 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -38,7 +38,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   #   self.print(filename, cashier_terminal.printer_name)
   # end
 
-  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)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale, sale_items, total_other_charges_info,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?
       @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
@@ -59,7 +59,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     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")
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf"
-    pdf = CloseCashierPdf.new(printer_settings,shift_sale, sale_items, @account_cate_count, @menu_cate_count, @totalByAccount, shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments)
+    pdf = CloseCashierPdf.new(printer_settings,shift_sale, sale_items, total_other_charges_info, @account_cate_count, @menu_cate_count, @totalByAccount, shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments)
     close_cashier_pdf = Lookup.collection_of("print_settings") #print_settings with name:CloseCashierPdf
 
     if !close_cashier_pdf.empty?
@@ -68,7 +68,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
           if close_cashier[1] == '1'
             pdf = CloseCashierCustomisePdf.new(printer_settings,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)
           else
-            pdf = CloseCashierPdf.new(printer_settings,shift_sale, sale_items, @account_cate_count, @menu_cate_count, @totalByAccount, shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments)
+            pdf = CloseCashierPdf.new(printer_settings,shift_sale, sale_items, total_other_charges_info, @account_cate_count, @menu_cate_count, @totalByAccount, shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments)
           end
         end
       end
@@ -81,14 +81,16 @@ 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 == "SaleItemsPdf"
-      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 == "SaleItemsStarPdf"
-      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
 
     pdf.render_file filename
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 81322e77..ebd45b8a 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1016,7 +1016,8 @@ def self.get_item_query(type)
   query = query.joins(" JOIN accounts acc ON acc.id = i.account_id")
   query = query.where("#{sale_type}")
   query = query.group("acc.title,i.account_id,i.menu_category_code,i.item_instance_code,i.product_name,i.unit_price")
-               .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.unit_price asc")
+               .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.item_instance_code asc, SUM(i.qty) desc, i.unit_price asc")
+  # query = query.order("i.menu_category_name asc, SUM(i.qty) desc")
 end
 
 def self.get_other_charges()
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..9ff2f17a 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -2,7 +2,7 @@ class CloseCashierPdf < 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, shift_sale, sale_items, acc_cate_count, menu_cate_count, total_by_acc, 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)
+  def initialize(printer_settings, shift_sale, sale_items, total_other_charges_info, acc_cate_count, menu_cate_count, total_by_acc, 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)
     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
@@ -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_info)      
     end
   end
 
@@ -504,14 +504,7 @@ class CloseCashierPdf < Prawn::Document
 
   end
 
-  def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc)
-    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
-
+  def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges)
     y_position = cursor
     bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do
      text "Sale Items Summary", :size => self.header_font_size, :align => :center
@@ -521,6 +514,7 @@ class CloseCashierPdf < Prawn::Document
     total_amount = 0
     total_qty = 0
     sub_total = 0
+    flag = false
 
     arr = Array.new
 
@@ -529,12 +523,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
 
@@ -543,35 +540,25 @@ class CloseCashierPdf < Prawn::Document
             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
-          }
+          add_item_line('Items', 'Price', 'Qty', 'Total')
           move_down 2
           stroke_horizontal_rule
         end
 
-
         move_down 3
 
-        y_position = cursor
-        pad_top(15) {
-          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
-        }
+        # y_position = cursor
+        # pad_top(15) {
+        #   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
+        # }
+        add_item_line(item['product_name'], item['unit_price'].to_i, item['total_item'].to_i, item['grand_total'].to_i)
         
-        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,14 +568,70 @@ 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
+      total_other_amount, total_other_item = other_charges_detail(total_other_charges)
+
+      total_items += total_other_item
+      total_amount += total_other_amount
+      move_down 5
+      stroke_horizontal_rule
       total_details('Total Amount', total_items, total_amount)
-      move_down 10
     end
   end
 
+  def other_charges_detail(total_other_charges)
+    total_charges = 0
+    total_charges_items = 0
+
+    unless total_other_charges.nil?
+      y_position = cursor
+      bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do
+        text "Other Charges", :size => self.header_font_size, :align => :left
+      end
+
+      move_down 5
+      add_item_line('Items', 'Price', 'Qty', 'Total')
+      move_down 2
+      stroke_horizontal_rule
+
+      total_other_charges.each do |charges|
+        move_down 3
+        add_item_line(charges['product_name'], charges['unit_price'].to_i, charges['total_item'].to_i, charges['grand_total'].to_i)
+
+        total_charges_items += charges['total_item'].to_i
+        total_charges += charges['grand_total'].to_i
+      end
+    end
+
+    move_down 5
+    stroke_horizontal_rule
+    total_details('Total Charges Amount', total_charges_items, total_charges)
+
+    return total_charges, total_charges_items
+  end
+
+  def add_item_line(product_name, unit_price, total_item, grand_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
+
+    y_position = cursor
+    pad_top(15) {
+      bounding_box([0,y_position], :width =>self.item_width) do
+        text "#{product_name}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix
+      end
+      text_box "#{unit_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 "#{total_item}", :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 "#{grand_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
+    }
+  end
+
   def total_details(col_name, total_qty, sub_total)
     self.item_width = 73
     self.price_width = 60
@@ -597,8 +640,6 @@ 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..f27d5f35 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,8 @@ 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)
+    move_down 10
   end
 
   def header (shop_details)
@@ -127,14 +128,7 @@ class SaleItemsPdf < Prawn::Document
     move_down 10
   end
 
-  def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc)
-    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
-
+  def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges)
     y_position = cursor
     bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do
      text "Sale Items Summary", :size => self.header_font_size, :align => :center
@@ -144,6 +138,7 @@ class SaleItemsPdf < Prawn::Document
     total_amount = 0
     total_qty = 0
    	sub_total = 0
+    flag = false
 
     arr = Array.new
 
@@ -152,10 +147,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
 
@@ -166,35 +165,16 @@ class SaleItemsPdf < Prawn::Document
           	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 => :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
-          }
+          add_item_line('Items', 'Price', 'Qty', 'Total')
           move_down 2
           stroke_horizontal_rule
       	end
 
 
         move_down 3
+        add_item_line(item['product_name'], item['unit_price'].to_i, item['total_item'].to_i, item['grand_total'].to_i)
 
-        y_position = cursor
-        pad_top(15) {
-          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
-        }
-
-        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 +184,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
+      total_other_amount, total_other_item = other_charges_detail(total_other_charges)
+
+      total_items += total_other_item
+      total_amount += total_other_amount
+      move_down 5
+      stroke_horizontal_rule
       total_details('Total Amount', total_items, total_amount)
-      move_down 10
     end
   end
 
@@ -220,8 +206,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 +214,53 @@ class SaleItemsPdf < Prawn::Document
     }
   end
 
+  def other_charges_detail(total_other_charges)
+    total_charges = 0
+    total_charges_items = 0
+
+    unless total_other_charges.nil?
+      y_position = cursor
+      bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do
+        text "Other Charges", :size => self.header_font_size, :align => :left
+      end
+
+      move_down 5
+      add_item_line('Items', 'Price', 'Qty', 'Total')
+      move_down 2
+      stroke_horizontal_rule
+
+      total_other_charges.each do |charges|
+        move_down 3
+        add_item_line(charges['product_name'], charges['unit_price'].to_i, charges['total_item'].to_i, charges['grand_total'].to_i)
+
+        total_charges_items += charges['total_item'].to_i
+        total_charges += charges['grand_total'].to_i
+      end
+    end
+
+    move_down 5
+    stroke_horizontal_rule
+    total_details('Total Charges Amount', total_charges_items, total_charges)
+
+    return total_charges, total_charges_items
+  end
+
+  def add_item_line(product_name, unit_price, total_item, grand_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
+
+    y_position = cursor
+    pad_top(15) {
+      bounding_box([0,y_position], :width =>self.item_width) do
+        text "#{product_name}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix
+      end
+      text_box "#{unit_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 "#{total_item}", :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 "#{grand_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
+    }
+  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/config/puma.rb b/config/puma.rb
index 6a545bed..fd89392f 100755
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,10 +1,10 @@
-# application_path="#{File.expand_path("../..", __FILE__)}"
-# directory application_path
-# #environment ENV.fetch("RAILS_ENV") { "production" }
-# environment "production"
-# pidfile "#{application_path}/tmp/puma/pid"
-# state_path "#{application_path}/tmp/puma/state"
-# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-# port        ENV.fetch("PORT") { 62158 }
-# workers 2
-# preload_app!
+application_path="#{File.expand_path("../..", __FILE__)}"
+directory application_path
+#environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
+pidfile "#{application_path}/tmp/puma/pid"
+state_path "#{application_path}/tmp/puma/state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+port        ENV.fetch("PORT") { 62158 }
+workers 2
+preload_app!
diff --git a/dump.rdb b/dump.rdb
index f5a52546..0846110c 100644
Binary files a/dump.rdb and b/dump.rdb differ