diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0966a573..505a38b3 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,13 +36,13 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    else         
-      # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+    # else         
+    #   # check for license file
+    #   if check_license
+    #     current_license(ENV["SX_PROVISION_URL"])
+    #   else
+    #     redirect_to activate_path
+    #   end      
     end
   end
 
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index cb2cc830..8bb684e9 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -73,12 +73,15 @@ class Origami::ShiftsController < BaseOrigamiController
         @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
         @total_discount_by_account  = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
         @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
+        @total_dinein               = ShiftSale.get_total_dinein(@shift).total_dinein_amount
+        @total_takeway              = ShiftSale.get_total_takeway(@shift).total_takeway_amount
+
         # 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,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
+        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway)
       end
     end
     Employee.logout(session[:session_token])
@@ -102,8 +105,7 @@ class Origami::ShiftsController < BaseOrigamiController
       # Calculate price_by_accounts
       @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
       @total_discount_by_account  = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
-      @total_member_discount = ShiftSale.get_total_member_discount(@shift)
-
+      @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
     end
     
   end
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index fc79934d..400a0934 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -22,18 +22,18 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   # end
 
   #Bill Receipt Print
-  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway)
     #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,other_payment,amount,discount,member_discount)
-    
+    pdf = CloseCashierCustomerizePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway)
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
     pdf.render_file filename
     self.print(filename, cashier_terminal.printer_name)
   end
-  #release_c1
+
+
 end
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index 57816948..0127bd5c 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -135,6 +135,20 @@ class ShiftSale < ApplicationRecord
      
   end  
 
+  def self.get_total_dinein(shift) 
+      query = Sale.select("sum(sales.grand_total) as total_dinein_amount")
+          .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 = "Dinein" and c.membership_id is null',shift.id)
+          .first()
+  end  
+
+  def self.get_total_takeway(shift) 
+      query = Sale.select("sum(sales.grand_total) as total_takeway_amount")
+          .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 
+
   def self.search(filter,from,to)
     if filter.blank?
         keyword = ''
diff --git a/app/pdf/close_cashier_customerize_pdf.rb b/app/pdf/close_cashier_customerize_pdf.rb
new file mode 100644
index 00000000..45834489
--- /dev/null
+++ b/app/pdf/close_cashier_customerize_pdf.rb
@@ -0,0 +1,433 @@
+class CloseCashierCustomerizePdf < 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,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway)
+    self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
+    self.page_height = printer_settings.page_height
+    self.margin = 5
+    self.price_width = 60
+    self.qty_width = 20
+    self.total_width = 40
+    self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
+    self.item_height = 15
+    self.item_description_width = (self.page_width-20) / 2
+    self.label_width = 100
+
+    self.text_width = (self.page_width - 80) - self.price_width / 3
+    # @item_width = self.page_width.to_i / 2
+    # @qty_width = @item_width.to_i / 3
+    # @double = @qty_width * 1.3
+    # @half_qty = @qty_width / 2
+    #setting page margin and width
+    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if printer_settings.font != ""
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+    # font "public/fonts/Zawgyi-One.ttf"
+    # font "public/fonts/padauk.ttf"
+    self.header_font_size = 10
+    self.item_font_size = 8
+
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+    #check delimiter
+    if printer_settings.delimiter
+        delimiter = ","
+    else
+        delimiter = ""
+    end
+
+    header( shop_details)
+
+    stroke_horizontal_rule
+
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_dinein,total_takeway) 
+  end
+
+  def header (shop_details)
+    move_down 7
+    text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
+    move_down 5
+    text "#{shop_details.address}", :size => self.item_font_size,:align => :center
+    # move_down self.item_height
+    move_down 5
+    text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
+    move_down 5
+
+    stroke_horizontal_rule
+  end
+
+  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_dinein,total_takeway)
+        move_down 7
+         y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Cashier : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.employee.name}" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Cashier Station : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.cashier_terminal.name}" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Opening Date : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Closing Date : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ shift_sale.shift_closed_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left
+        end
+        
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Opening Float : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+            text "Closing Float : ", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
+            text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            # text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
+        end
+
+
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do
+         text "Shift Sale Summary", :size => self.header_font_size, :align => :center
+        end
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Received Amount :", :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.closing_balance, :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 "Cash In :", :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.cash_in, :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 "Cash Out :", :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.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        end
+
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        @total_grand_total = shift_sale.grand_total + @overall + @total_foc + shift_sale.total_void
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Grand Total :", :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.cash_out, :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 "Total Discount :", :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(@overall, :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 "Total FOC :", :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(@total_foc, :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 "Total Void :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "(#{shift_sale.total_void})", :size => self.item_font_size, :align => :right
+        end
+
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7       
+
+        @total_foc = 0
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Cash Payment :", :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.cash_sales, :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 "Credit Payment :", :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.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
+        end
+        #start other payment details 
+        if shift_sale.other_sales > 0
+            other_payment.each do |other|
+              @total_foc = other.foc_amount.round(2)
+              y_position = cursor
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+               text "MPU Payment :", :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(other.mpu_amount, :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 "VISA Payment :", :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(other.visa_amount, :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 "Master Payment :", :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(other.master_amount, :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 "JCB Payment :", :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(other.jcb_amount, :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 "Reedem Payment :", :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(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+              end
+            end
+        else
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+             text "Other Payment :", :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.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+            end
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         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
+         
+        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
+        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
+        end
+
+        # end other payment details 
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        # start Dinein and Takeaway
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Dinein :", :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(total_dinein, :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 "Total Takeaway :", :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(total_takeway, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+          
+        end
+        # stop Dinein and Takeaway
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        #start service charges and commercial tax
+        sale_taxes.each do |tax|
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "#{tax.tax_name} :", :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(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+          end
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Taxes :", :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_taxes, :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 "Net Sales :", :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.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
+        end
+        #end for service charges and commercial tax
+#COMMENTED FOR NO NEED AND NOT CORRECT WHEN OTHER CHARGES
+        # y_position = cursor
+        # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+        #  text "Total Sale :", :size => self.item_font_size, :align => :right
+        # end
+        # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        #  text "#{shift_sale.total_revenue}", :size => self.item_font_size, :align => :right
+        # end
+
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+        #start total amount by Account Like Food / Beverage /..
+        total_discount_by_account.each do |amount|
+        
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total #{amount.account_name} Discount:", :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(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+          end
+        end
+        #end total amount by Account 
+
+        if total_member_discount[0].member_discount.present?
+          @member_discount = total_member_discount[0].member_discount rescue 0.0 
+          @overall = shift_sale.total_discounts - @member_discount
+                
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+             text "Total Member Discount :", :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(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+            end
+        else 
+          @overall = shift_sale.total_discounts                   
+        end
+
+        # y_position = cursor
+        # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+        #  text "Grand Total :", :size => self.item_font_size, :align => :right
+        # end
+        # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+        #  text "#{shift_sale.grand_total}", :size => self.item_font_size, :align => :right
+        # end
+  
+
+        #start total amount by Account Like Food / Beverage /..
+        total_amount_by_account.each do |amount|        
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+           text "Total #{amount.account_name} Amount :", :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(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+          end
+        end
+        #end total amount by Account 
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Dine-in Count :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.dining_count}", :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 "Total Takeaway Count :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.takeaway_count}", :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 "Total Receipts :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{shift_sale.total_receipt}", :size => self.item_font_size, :align => :right
+        end
+
+        move_down 5
+        stroke_horizontal_rule
+        move_down 5
+		move_down 5
+  end
+end
+
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 35248b97..7bee4ed3 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -234,12 +234,14 @@ 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_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
+       
         end
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "Gross Sale :", :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