diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 179e3336..57ef7702 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -133,7 +133,6 @@ class CloseCashierPdf < Prawn::Document
          text "#{shift_sale.cash_in}", :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
@@ -142,26 +141,12 @@ class CloseCashierPdf < Prawn::Document
          text "#{shift_sale.cash_out}", :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:", :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.nett_sales}", :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 Tax :", :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_taxes}", :size => self.item_font_size, :align => :right
-        end
-
         move_down -5
         stroke_horizontal_rule
         move_down 7
 
+        @total_payment = shift_sale.cash_sales + shift_sale.credit_sales
+        @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
@@ -180,14 +165,8 @@ class CloseCashierPdf < Prawn::Document
         #start other payment details 
         if shift_sale.other_sales > 0
             other_payment.each do |other|
-              y_position = cursor
-              bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-               text "Other Payment Details", :size => self.item_font_size, :align => :right
-              end
-              bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "", :size => self.item_font_size, :align => :right
-              end
-
+              @total_payment += other.mpu_amount + other.visa_amount + other.jcb_amount + other.master_amount + other.paypar_amount + other.foc_amount
+              @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
@@ -227,15 +206,6 @@ class CloseCashierPdf < Prawn::Document
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
                text "#{other.paypar_amount.round(2)}", :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 "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 "#{other.foc_amount.round(2)}", :size => self.item_font_size, :align => :right
-              end
-
             end
         else
             y_position = cursor
@@ -247,22 +217,56 @@ class CloseCashierPdf < Prawn::Document
             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 "#{shift_sale.total_rounding.round(2)}", :size => self.item_font_size, :align => :right
+        end
+
+        @total_payment += shift_sale.total_rounding
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total :", :styles => [:bold], :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "#{@total_payment.round(2)}", :styles => [:bold], :size => self.item_font_size, :align => :right
+        end
+
         # end other payment details 
         move_down -5
         stroke_horizontal_rule
         move_down 7
-        #start total amount by Account Like Food / Beverage /..
-        total_amount_by_account.each do |amount|        
+
+        #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 "Total #{amount.account_name} Amount:", :size => self.item_font_size, :align => :right
+           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 "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right
+           text "#{tax.st_amount.round(2)}", :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 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 "#{shift_sale.total_taxes}", :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 :", :styles => [:bold], :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.nett_sales}", :styles => [:bold] , :size => self.item_font_size, :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
@@ -305,47 +309,66 @@ class CloseCashierPdf < Prawn::Document
         
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Overall Discount :", :size => self.item_font_size, :align => :right
+         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 "#{@overall}", :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 "(#{@total_foc})", :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 Amount :", :size => self.item_font_size, :align => :right
+         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_discounts}", :size => self.item_font_size, :align => :right
+         text "(#{shift_sale.total_void})", :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 "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
         
         move_down -5
         stroke_horizontal_rule
         move_down 7
 
-        sale_taxes.each do |tax|
-        
+        #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 "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
+           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 "#{tax.st_amount.round(2)}", :size => self.item_font_size, :align => :right
+           text "#{amount.total_price.round(2)} ", :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 "Rounding Adjustment :", :size => self.item_font_size, :align => :right
+         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.total_rounding.round(2)}", :size => self.item_font_size, :align => :right
+         text "#{shift_sale.dining_count}", :size => self.item_font_size, :align => :right
         end
-         y_position = cursor
+
+        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
+         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.grand_total}", :size => self.item_font_size, :align => :right
+         text "#{shift_sale.takeaway_count}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -356,31 +379,7 @@ class CloseCashierPdf < Prawn::Document
          text "#{shift_sale.total_receipt}", :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 "Dining 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 "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 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
+        move_down 5
         stroke_horizontal_rule
         move_down 5
 		move_down 5
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index f6dd86b8..b2f32a7d 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -144,16 +144,7 @@
                 <% if !(@total_payment_methods.nil?) %>
                   <% @total_payment_methods.each do |payment| %>
                     <% if !@sale_data[0].empty? %>
-                      <% if payment.payment_method == 'mpu' || payment.payment_method == 'visa' || payment.payment_method == 'master' || payment.payment_method == 'jcb' %>
-                        <tr>
-                          <td>Card Sale : </td>
-                          <td align="right">
-                            <% @sale_data.each do |data| %>
-                              <%= data["card"] %>
-                            <% end %>
-                          </td>
-                        </tr>
-                      <% else %>
+                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
                         <tr>
                           <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
                           <td align="right">
@@ -167,6 +158,14 @@
                     <% end %>
                   <% end %>
                 <% end %>
+                <tr>
+                  <td>Card Sale : </td>
+                  <td align="right">
+                    <% @sale_data.each do |data| %>
+                      <%= data["card"] %>
+                    <% break end %>
+                  </td>
+                </tr>
               </table>
             </div>
           </div>