diff --git a/Gemfile b/Gemfile index ba95e3c9..c8139eb7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.6.3' +ruby '2.4.1' git_source(:github) do |repo_name| repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") "https://github.com/#{repo_name}.git" diff --git a/README.md b/README.md index 4d81b144..77a25926 100755 --- a/README.md +++ b/README.md @@ -299,6 +299,9 @@ settings/lookups => {type:display_type, name: Display Type, value: 2} For show total before tax in receipt bill settings/lookups => {type:show_total_before_tax, name:Show Total Before Tax, value: {0 or 1}} +For Using Staff Meal +settings/lookups => { type:customer_type, name: Staff, value:Staff } + * ToDo list 1. Migration diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb index dd2f3c3c..f2ed207d 100755 --- a/app/models/inventory_definition.rb +++ b/app/models/inventory_definition.rb @@ -24,18 +24,18 @@ class InventoryDefinition < ApplicationRecord end def self.find_product_in_inventory(item,instance_code) - unless instance_code.empty? - 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})") - puts "found prodcut+++++++++++++++++++++++++++++++++++===" - puts prod.to_json - end + # unless instance_code.empty? + # 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})") + # puts "found prodcut+++++++++++++++++++++++++++++++++++===" + # puts prod.to_json + # 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)