fixed conflict after merge with dev branch for report query updated

app/models/order_item.rb

@@ -125,42 +125,14 @@ class OrderItem < ApplicationRecord
   end
 
   def update_stock_journal
-    if self.set_menu_items.present?
-      puts "set menu itemsssssssss???????????????????????????????"
-      puts items = JSON.parse(self.set_menu_items)
-      instance_code = Array.new
-      count = 0
-      items.each { |i|
-        instance_code.push(i["item_instance_code"])
-      }
-      print instance_code
-    end
-    if self.qty != self.qty_before_last_save
-      found, inventory_definition = InventoryDefinition.find_product_in_inventory(self,self.order.shop_code)
-      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