diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 1647ba37..19def9b6 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -66,7 +66,7 @@ class Origami::ShiftsController < BaseOrigamiController
         unique_code = "CloseCashierPdf"
 
         if !close_cashier_pdf.empty?
-        close_cashier_pdf.each do |close_cashier|
+          close_cashier_pdf.each do |close_cashier|
             if close_cashier[0] == 'CloseCashierCustomisePdf' 
               if close_cashier[1] == '1'
                 unique_code="CloseCashierCustomisePdf"
@@ -90,7 +90,7 @@ class Origami::ShiftsController < BaseOrigamiController
         @total_dinein               = ShiftSale.get_total_dinein(@shift).total_dinein_amount
         @total_takeway              = ShiftSale.get_total_takeway(@shift).total_takeway_amount
         @total_other_charges        = ShiftSale.get_total_other_charges(@shift).total_other_charges_amount
-
+        
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)
         #byebug
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index ba3483ca..c9404b3d 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -43,7 +43,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 = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
     close_cashier_pdf = Lookup.collection_of("print_settings") #print_settings with name:CloseCashierPdf
     
     if !close_cashier_pdf.empty?
@@ -52,7 +52,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)
           else
-            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
           end
         end
       end
diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index 65089a74..bcc27724 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -455,12 +455,13 @@ class CloseCashierCustomisePdf < Prawn::Document
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
            text "-#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end 
+          move_down -5
+          stroke_horizontal_rule
+          move_down 7
         end 
         #end total over all discount
 
-        move_down -5
-        stroke_horizontal_rule
-        move_down 7
+       
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 412cb9a4..7ac7a130 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -234,14 +234,12 @@ class CloseCashierPdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-        # text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-        text "#{ number_with_precision(shift_sale.total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
-       
+         text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Gross Sale :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
@@ -394,7 +392,6 @@ class CloseCashierPdf < Prawn::Document
         move_down 5
         stroke_horizontal_rule
         move_down 5
-		move_down 5
+    move_down 5
   end
-end
-
+end
\ No newline at end of file