diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 21c2d373..52149abb 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -165,7 +165,7 @@ class Crm::CustomersController < BaseCrmController
                                   paypar_account_no: paypar_account_no,
                                   member_group_id: member_group_id,
                                   merchant_uid:merchant_uid,auth_token:auth_token}.to_json
-                end 
+                end
 
                 begin
                 response        = HTTParty.post(url,
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index 13f295a9..c69e3626 100755
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -180,10 +180,10 @@ class SaleItem < ApplicationRecord
    def self.get_all_sale_items(sale_id)
     sale_items = SaleItem.select("sale_id,product_code,item_instance_code,
       product_name,product_alt_name,account_id,status,remark,
-      (CASE WHEN (qty > 0 AND remark IS NULL) OR (qty < 0 AND status='Discount') OR (status='promotion' AND (remark='promotion' OR remark = 'promotion nett price' OR remark= 'promotion discount')) THEN SUM(qty) ELSE qty END) as qty,
+      (CASE WHEN (qty > 0 AND remark IS NULL) OR (qty < 0 AND status = 'foc') OR (qty < 0 AND status='Discount') OR (status='promotion' AND (remark='promotion' OR remark = 'promotion nett price' OR remark= 'promotion discount')) THEN SUM(qty) ELSE qty END) as qty,
       unit_price,
       taxable_price,
-      (CASE WHEN (price > 0 AND remark IS NULL) OR (price < 0 AND status='Discount') OR (status='promotion' AND (remark='promotion' OR remark = 'promotion nett price' OR remark= 'promotion discount')) THEN SUM(price) ELSE price END) as price,
+      (CASE WHEN (price > 0 AND remark IS NULL) OR (qty < 0 AND status = 'foc') OR (price < 0 AND status='Discount') OR (status='promotion' AND (remark='promotion' OR remark = 'promotion nett price' OR remark= 'promotion discount')) THEN SUM(price) ELSE price END) as price,
       is_taxable")
               .where("sale_id = ?",sale_id)
               .order("product_name asc")
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index f3883627..f872d608 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,6 +1,7 @@
 class OrderItemPdf < 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
+  
   def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 83df19da..33e1e314 100755
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -1,6 +1,7 @@
 class OrderItemSlimPdf < 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
+  
   def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 573dd1ee..fbb15b1b 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -408,13 +408,13 @@ class ReceiptBillPdf < Prawn::Document
         sale_payments.each do |payment|
             y_position = cursor
             if payment.payment_method == "paypar"
-                bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                 text "Redeem Payment", :size => self.item_font_size,:align => :left
-            end
+              end
             else
-                bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+              bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
                 text "#{payment.payment_method.capitalize} Payment", :size => self.item_font_size,:align => :left
-            end
+              end
             end
             
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
@@ -432,7 +432,7 @@ class ReceiptBillPdf < Prawn::Document
                 text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
           #  move_down line_move
-        end        
+        end
     end
 
     # show member information
@@ -538,6 +538,7 @@ class ReceiptBillPdf < Prawn::Document
              text "#{ customer_name }" , :size => self.item_font_size,:align => :right
         end
         move_down line_move
+        stroke_horizontal_rule
     end
 
 
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 5abb412e..cab8fe5d 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-       if check_license
-         current_license(ENV["SX_PROVISION_URL"])
-       else
-         redirect_to activate_path
-       end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 
diff --git a/config/puma.rb b/config/puma.rb
index fd89392f..fbe48c81 100755
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,10 +1,10 @@
-application_path="#{File.expand_path("../..", __FILE__)}"
-directory application_path
+#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!
+#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
old mode 100755
new mode 100644
index 7d7b359c..87e22f1d
Binary files a/dump.rdb and b/dump.rdb differ