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/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index 902fede4..cd9d7b3b 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -174,7 +174,7 @@ class CloseCashierCustomisePdf < Prawn::Document
         end
 
         #end total FOC amount      
-        total_grand_total = shift_sale.grand_total + shift_sale.total_discounts + @total_foc.to_f + shift_sale.total_void.to_f - total_discount_account.to_f
+        total_grand_total = shift_sale.grand_total + @total_foc.to_f + shift_sale.total_void.to_f - total_discount_account.to_f
         # @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
@@ -197,31 +197,6 @@ class CloseCashierCustomisePdf < Prawn::Document
         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
-        
-        if @overall > 0
-          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
-          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 
-        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
@@ -452,6 +427,41 @@ class CloseCashierCustomisePdf < Prawn::Document
         end  
         #end total other charges amount
 
+        move_down -5
+        stroke_horizontal_rule
+        move_down 7
+
+        #start total over all discount
+         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
+        
+        if @overall > 0
+          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
+          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 
+        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
          text "Total Dine-in Count :", :size => self.item_font_size, :align => :right