diff --git a/README.md b/README.md
index 0bfd8bbf..97f43595 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ ruby 2.4.1p111
 
 	Osaka
 
-		Auth Token        => rj0MJ0XI5GsKZehE => New
+		Auth Token        => wu8YvlLmah0CL => New 	##note : Old => rj0MJ0XI5GsKZehE
 
 						  => code2lab => Old
 
@@ -23,7 +23,7 @@ ruby 2.4.1p111
 
     BITP
 
-		Auth Token        => rj0MJ0XI5GsKZehE => New
+		Auth Token        => pZBHXEFbGNj/G => New   ##note : Old => rj0MJ0XI5GsKZehE
 
 						  => code2lab => Old
 
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 01372dd3..af37253e 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -10,7 +10,9 @@ class Oqs::EditController < BaseOqsController
     qty_weight = params[:qty_weight]
     remarks = params[:remarks]
 
-    order_item = OrderItem.find(order_items_id);
+    order_item = OrderItem.find(order_items_id)
+    before_updated_qty = order_item.qty
+
     order_item.item_order_by = current_user.name
     order_item.qty = qty_weight
     order_item.remark = remarks
@@ -45,7 +47,7 @@ class Oqs::EditController < BaseOqsController
 
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
     end
   end
 end
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 3ee71e8d..ebe737d7 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -28,9 +28,9 @@ class Oqs::HomeController < BaseOqsController
 
     if !@filter.nil?
       @count = queue_items_count_query(false,@filter)
-      @count.each do |count|
+      # @count.each do |count|
 
-      end
+      # end
     end
 
     # @queue_stations_items=Array.new
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index aaa6b262..36e5d6d9 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -38,7 +38,7 @@ class Oqs::PrintController < ApplicationController
       # print when complete click 
       print_settings = PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
+      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, "", options )
       
       # update print status for completed same order items
       assigned_items.each do |ai|
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index c00b39bf..0dda31f5 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders   = Order.all.order('date desc')
+    @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @shop     = Shop::ShopDetail
     
     # @shift = ShiftSale.current_open_shift(current_user.id)
@@ -17,7 +17,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     
     @status_order = ""
     @status_sale = ""
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 6fa61bc7..199325e9 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -45,8 +45,8 @@ class Origami::PaymentsController < BaseOrigamiController
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
         member_info = Customer.get_member_account(customer)
-        # current_balance = SaleAudit.paymal_search(sale_id)
-        current_balance = 0
+        current_balance = SaleAudit.paymal_search(sale_id)
+        # current_balance = 0
       end
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 85264737..04ad5896 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,6 +1,6 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
-  def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, options="")
+  def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, before_updated_qty="", options="")
     #Use CUPS service
     #Generate PDF
     #Print
@@ -14,7 +14,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
-    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
     order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
     # check for item not to show 
     # if order_item[0].price != 0 
@@ -22,15 +22,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         order_slim_pdf.each do |order_item_slim|
           if order_item_slim[0] == 'OrderSlimPdf'
             if order_item_slim[1] == '1'
-              pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             else
-              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             end
           elsif order_item_slim[0] == 'OrderSetPdf'
             if order_item_slim[1] == '1'
-              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             else
-              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
             end
           end
         end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 49f126af..f42b62a0 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -743,7 +743,7 @@ def self.get_item_query()
   query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
                      "i.remark as status_type,"+
-                     " i.unit_price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+                     " mii.price as unit_price,i.price as price,i.product_name as product_name, mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
   query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 9483b847..26253b6e 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,7 +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)
+  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
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemPdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision)
+    order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items(order_item, options, alt_name, precision)
+  def order_items(order_item, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderItemPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_item.qty, precision)
     move_down 5
   end
 
@@ -127,4 +128,17 @@ class OrderItemPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
index 6887d201..f419f185 100644
--- a/app/pdf/order_item_slim_pdf.rb
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -1,7 +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)
+  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
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderItemSlimPdf < Prawn::Document
     order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
 
     # order items slim
-    order_items_slim(order_item_slim, options, alt_name, print_settings.precision)
+    order_items_slim(order_item_slim, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderItemSlimPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_items_slim(order_item_slim, options, alt_name, precision)
+  def order_items_slim(order_item_slim, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderItemSlimPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_item_slim.qty, precision)
     move_down 1
   end
 
@@ -126,4 +127,17 @@ class OrderItemSlimPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+        move_down 1
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 30a800b4..8f915ad0 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -1,7 +1,7 @@
 class OrderSetItemPdf < 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_set_item, print_status, options, alt_name)
+  def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
     self.page_height = print_settings.page_height
     self.margin = 0
@@ -46,7 +46,7 @@ class OrderSetItemPdf < Prawn::Document
     order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
 
     # order items
-    order_set_items(order_set_item, options, alt_name, print_settings.precision)
+    order_set_items(order_set_item, options, alt_name, print_settings.precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -74,7 +74,7 @@ class OrderSetItemPdf < Prawn::Document
   end
 
   # Write Order items to PDF
-  def order_set_items(order_set_item, options, alt_name, precision)
+  def order_set_items(order_set_item, options, alt_name, precision, before_updated_qty)
     y_position = cursor
 
     #Add Order Item    
@@ -82,6 +82,7 @@ class OrderSetItemPdf < Prawn::Document
 
     dash(1, :space => 1, :phase => 1)
     stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_set_item.qty, precision)
     move_down 5
   end
 
@@ -143,4 +144,17 @@ class OrderSetItemPdf < Prawn::Document
 
   end
 
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
 end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0b70e159..a5b7b23c 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -476,12 +476,14 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         
-        // console.log(checkReceiptNoInFirstBillData(receipt_no));
+        discount="<%= @membership.discount%>"
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          if(checkReceiptNoInFirstBillData(receipt_no,"")){
-            $("#pay").show();
-          }else{
-            $("#pay").hide();
+          if (discount) {
+            if(checkReceiptNoInFirstBillData(receipt_no,"")){
+              $("#pay").show();
+            }else{
+              $("#pay").hide();
+            }
           }
         }
       /* end check first bill or not*/