diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 7f456f35..363791a8 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -163,7 +163,7 @@ class Origami::SaleEditController < BaseOrigamiController
     #   end
     # end
 
-    sale.compute_by_sale_items(saleObj.total_discount, nil, order_source)
+    # sale.compute_by_sale_items(saleObj.total_discount, nil, order_source) FOR WHAT????
 
     ProductCommission.edit_product_commission(saleitemObj)
   end
@@ -195,7 +195,7 @@ class Origami::SaleEditController < BaseOrigamiController
       end
     remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}"
     sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, action_by,remark,"ITEMCANCELVOID" )
-    
+
     saleObj.compute_by_sale_items(saleObj.total_discount, nil, order_source)
     ProductCommission.remove_product_commission(saleitemObj)
   end
diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb
index 82545456..fb247805 100755
--- a/app/models/inventory_definition.rb
+++ b/app/models/inventory_definition.rb
@@ -24,20 +24,6 @@ class InventoryDefinition < ApplicationRecord
   end
 
   def self.find_product_in_inventory(item)
-    # unless instance_code.nil?
-    #   instance_code = instance_code.to_s
-    #   instance_code[0] = ""
-    #   instance_code = instance_code.chomp("]")
-    # else
-    #   instance_code = '"0"'
-    # end
-    #
-    # if prod = InventoryDefinition.where("item_code IN(#{instance_code})")
-    #   if stock_check_item = StockCheckItem.where("item_code IN(#{instance_code})")
-    #     return true, prod
-    #   end
-    # end
-
     if product = InventoryDefinition.find_by_item_code(item.item_instance_code)
       if stock_check_item = StockCheckItem.find_by_item_code(item.item_instance_code)
         return true, product
@@ -46,13 +32,12 @@ class InventoryDefinition < ApplicationRecord
   end
 
   def self.check_balance(item, inventory_definition) # item => saleItemOBj
-     stock = StockJournal.where('item_code=?', item.item_instance_code).order("id DESC").first
-     unless stock.nil?
-       modify_balance(item, stock, inventory_definition)
-     else
-       puts "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< OUT OF STOCK >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-       StockJournal.add_to_journal(item.item_instance_code, item.qty, 0, "out of stock", inventory_definition, item.id, StockJournal::SALES_TRANS)
-     end
+   stock = StockJournal.where('item_code=?', item.item_instance_code).order("id DESC").first
+   unless stock.nil?
+     modify_balance(item, stock, inventory_definition)
+   else
+     StockJournal.add_to_journal(item.item_instance_code, item.qty, 0, "out of stock", inventory_definition, item.id, StockJournal::SALES_TRANS)
+   end
   end
 
   def self.modify_balance(item, stock, inventory_definition) #saleitemObj
@@ -77,6 +62,7 @@ class InventoryDefinition < ApplicationRecord
     elsif item.is_a? SaleItem
       trans_type = StockJournal::SALES_TRANS
     end
+    # StockJournal.add_to_journal(instance_code, qty, stock.balance, remark, inventory_definition, item.id, trans_type)
     StockJournal.add_to_journal(item.item_instance_code, qty, stock.balance, remark, inventory_definition, item.id, trans_type)
     check_item.different = check_item.different - qty
     check_item.save
diff --git a/app/models/order_item.rb b/app/models/order_item.rb
index 0b1c77d2..3e75ecba 100755
--- a/app/models/order_item.rb
+++ b/app/models/order_item.rb
@@ -125,41 +125,13 @@ class OrderItem < ApplicationRecord
   end
 
   def update_stock_journal
-    # if self.set_menu_items.present?
-    #   items = JSON.parse(self.set_menu_items)
-    #   instance_code = Array.new
-    #   count = 0
-    #   items.each { |i|
-    #     instance_code.push(i["item_instance_code"])
-    #   }
-    # end
-    
-    if self.qty != self.qty_before_last_save
-      found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
-      if found
-        InventoryDefinition.check_balance(self, inventory_definition)
+    unless MenuItemInstance.where("item_instance_name <> ''").pluck(:item_instance_code).include?(self.item_instance_code)
+      if self.qty != self.qty_before_last_save
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          InventoryDefinition.check_balance(self, inventory_definition)
+        end
       end
     end
-  #   if self.qty > self.qty_was
-  #     credit = 0
-  #     debit = self.qty.to_i - self.qty_was.to_i
-  #   else
-  #     credit = self.qty_was.to_i - self.qty.to_i
-  #     debit = 0
-  #   end
-  #   if credit != debit
-  #     defination = InventoryDefinition.find_by_item_code(self.item_instance_code)
-  #     stock = StockJournal.where('item_code = ?', self.item_instance_code).order("id DESC").first
-  #     journal = StockJournal.create(
-  #       item_code: self.item_instance_code,
-  #       credit: credit,
-  #       debit: debit,
-  #       balance: stock.balance - debit + credit,
-  #       inventory_definition_id: defination.id,
-  #       remark: 'ok',
-  #       trans_ref: self.order.id,
-  #       trans_type: StockJournal::SALES_TRANS
-  #     )
-  #   end
   end
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 999a18fd..a0273619 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2468,7 +2468,11 @@ private
           found, inventory_definition = InventoryDefinition.find_product_in_inventory(item)
           if found
             if stock_journal = StockJournal.find_by_trans_ref(item.order_items_id)
-              stock_journal.update(remark: self.sale_status)
+              if self.payment_status == "foc" && self.payment_status_was != "foc"
+                stock_journal.update(remark: self.payment_status)
+              else
+                stock_journal.update(remark: self.sale_status)
+              end
             end
           end
         end
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index 8473da78..65f3a4d5 100755
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -13,6 +13,7 @@ class SaleItem < ApplicationRecord
 
   before_validation :round_to_precision
   after_update :update_stock_journal
+  after_save :update_stock_journal_set_item
 
   # Add Sale Items
   def self.add_sale_items(sale_items)
@@ -304,40 +305,42 @@ class SaleItem < ApplicationRecord
   end
 
   def update_stock_journal
-    is_void = self.status == "void" && self.status_before_last_save != "void"
-    cancel_void = self.status_before_last_save == "void" && self.status.nil?
-    is_edit = self.qty >= 0 && self.qty != self.qty_before_last_save
-    is_foc =  self.status == "foc" && self.status_before_last_save != "foc"
-    cancel_foc = self.status_before_last_save == "foc"
+    unless MenuItemInstance.where("item_instance_name <> ''").pluck(:item_instance_code).include?(self.item_instance_code)
+      is_void = self.status == "void" && self.status_before_last_save != "void"
+      cancel_void = self.status_before_last_save == "void" && self.status.nil?
+      is_edit = self.qty >= 0 && self.qty != self.qty_before_last_save
+      is_foc =  self.status == "foc" && self.status_before_last_save != "foc"
+      cancel_foc = self.status_before_last_save == "foc"
 
-    if is_void or cancel_void or is_edit or is_foc or cancel_foc
-      found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
-      if found
-        stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first
-        unless stock.nil?
-          check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first
-          if is_void or cancel_void or is_edit
-            if is_void
-              qty = -self.qty
-              remark = "void"
-            elsif cancel_void
-              qty = self.qty
-              remark = "cancel void"
-            elsif is_edit
-              qty = self.qty - self.qty_before_last_save
-              remark = "edit"
-            end
-            StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS)
-            check_item.different = check_item.different + qty
-            check_item.save
-          else is_foc or cancel_foc
-            qty = StockJournal.where(trans_ref: self.sale_item_id).sum("credit-debit")
-            if order_item_id = self.sale.bookings.first.order_items.where(item_instance_code: self.item_instance_code, qty: self.qty + qty).select(:order_items_id).first.order_items_id
-              if stock_journal = StockJournal.find_by_trans_ref(order_item_id)
-                if is_foc
-                  stock_journal.update(remark: "foc")
-                elsif cancel_foc
-                  stock_journal.update(remark: "cancel_foc")
+      if is_void or cancel_void or is_edit or is_foc or cancel_foc
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first
+          unless stock.nil?
+            check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first
+            if is_void or cancel_void or is_edit
+              if is_void
+                qty = -self.qty
+                remark = "void"
+              elsif cancel_void
+                qty = self.qty
+                remark = "cancel void"
+              elsif is_edit
+                qty = self.qty - self.qty_before_last_save
+                remark = "edit"
+              end
+              StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS)
+              check_item.different = check_item.different + qty
+              check_item.save
+            else is_foc or cancel_foc
+              qty = StockJournal.where(trans_ref: self.sale_item_id).sum("credit-debit")
+              if order_item_id = self.sale.bookings.first.order_items.where(item_instance_code: self.item_instance_code, qty: self.qty + qty).select(:order_items_id).first.order_items_id
+                if stock_journal = StockJournal.find_by_trans_ref(order_item_id)
+                  if is_foc
+                    stock_journal.update(remark: "foc")
+                  elsif cancel_foc
+                    stock_journal.update(remark: "cancel_foc")
+                  end
                 end
               end
             end
@@ -346,4 +349,78 @@ class SaleItem < ApplicationRecord
       end
     end
   end
+
+  def update_stock_journal_set_item
+    is_void = self.status == "void" && self.status_before_last_save != "void" && self.qty > 0
+    cancel_void = self.status_before_last_save == "void" && self.status.nil?
+    is_edit = self.qty >= 0 && self.qty != self.qty_before_last_save
+    is_foc =  self.status == "foc" && self.status_before_last_save != "foc"
+    cancel_foc = self.status_before_last_save == "foc"
+    is_waste = self.status == "waste"
+    is_spoile = self.status == "spoile"
+
+    if MenuItemInstance.where("item_instance_name <> ''").pluck(:item_instance_code).include?(self.item_instance_code)
+      if self.qty == 1 && self.qty != self.qty_before_last_save
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first
+          unless stock.nil?
+            check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first
+            if self.qty.to_i >= 0
+              qty = self.qty - self.qty_was
+              if stock.balance.to_i >= qty
+                puts ">> stock is greater than order qty"
+                remark = "ok"
+              else
+                puts " << stock is less than order qty"
+                remark = "out of stock"
+              end
+            end
+            StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS)
+            check_item.different = check_item.different - qty
+            check_item.save
+          else
+            StockJournal.add_to_journal(self.item_instance_code, self.qty, 0, "out of stock", inventory_definition, self.id, StockJournal::SALES_TRANS)
+          end
+        end
+      elsif is_void or cancel_void or is_edit
+        if is_void
+          qty = -self.qty
+          remark = "void"
+        elsif cancel_void
+          qty = self.qty
+          remark = "cancel void"
+        elsif is_edit
+          qty = self.qty - self.qty_before_last_save
+          remark = "edit"
+        end
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first
+          unless stock.nil?
+            check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first
+          end
+        end
+        StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS)
+        check_item.different = check_item.different + qty
+        check_item.save
+      elsif is_foc or cancel_foc
+        qty = StockJournal.where(trans_ref: self.sale_item_id).sum("credit-debit")
+        if stock_journal = StockJournal.where(trans_ref: self.sale_item_id, item_code: self.item_instance_code).order(id: :desc).first
+          if is_foc
+            stock_journal.update(remark: "foc")
+          elsif cancel_foc
+            stock_journal.update(remark: "cancel_foc")
+          end
+        end
+      elsif is_waste or is_spoile
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          if stock_journal = StockJournal.where(trans_ref: self.sale_item_id, item_code: self.item_instance_code)
+            stock_journal.update(remark: self.status)
+          end
+        end
+      end
+    end
+  end
 end