git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change category code process

Browse Source
This commit is contained in:
phyusin
2018-12-26 15:01:34 +06:30
parent 60e1c211d3
commit 97085e9a1c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/sale.rb
View File

@@ -255,7 +255,7 @@ class Sale < ApplicationRecord
sale_item = SaleItem.new sale_item = SaleItem.new
#pull #pull
sale_item.menu_category_code = menu_category.code sale_item.menu_category_code = menu_category.code ? menu_category.code : nil
sale_item.menu_category_name = menu_category.name sale_item.menu_category_name = menu_category.name
sale_item.product_code = item.item_code sale_item.product_code = item.item_code
sale_item.item_instance_code = item.item_instance_code sale_item.item_instance_code = item.item_instance_code
@@ -286,7 +286,7 @@ class Sale < ApplicationRecord
menu_item = instance.menu_item menu_item = instance.menu_item
menu_category = MenuCategory.get_menu_category(menu_item.item_code) #get menu category for menu items menu_category = MenuCategory.get_menu_category(menu_item.item_code) #get menu category for menu items
sale_item.menu_category_code = menu_category.code sale_item.menu_category_code = menu_category.code ? menu_category.code : nil
sale_item.menu_category_name = menu_category.name sale_item.menu_category_name = menu_category.name
sale_item.product_code = menu_item.item_code sale_item.product_code = menu_item.item_code
sale_item.item_instance_code = item["item_instance_code"] sale_item.item_instance_code = item["item_instance_code"]
@@ -308,6 +308,7 @@ class Sale < ApplicationRecord
def create_saleitem_diningcharges(chargeObj, block_count, diningprice, dining_name, dining_time, order_source = nil) def create_saleitem_diningcharges(chargeObj, block_count, diningprice, dining_name, dining_time, order_source = nil)
sale_item = SaleItem.new sale_item = SaleItem.new
sale_item.menu_category_name = "Other Charge(s)"
sale_item.product_code = chargeObj.item_code sale_item.product_code = chargeObj.item_code
sale_item.product_name = dining_name.to_s + " ( " + dining_time.to_s + " )" sale_item.product_name = dining_name.to_s + " ( " + dining_time.to_s + " )"
sale_item.account_id = 0 sale_item.account_id = 0

3
app/models/sale_item.rb
View File

@@ -30,8 +30,11 @@ class SaleItem < ApplicationRecord
# Original Item to add remark # Original Item to add remark
item.status = type item.status = type
item.save item.save
menu_category = MenuCategory.get_menu_category(item.product_code) #get menu category for menu items
sale_item = SaleItem.new sale_item = SaleItem.new
sale_item.menu_category_code = menu_category.code ? menu_category.code : nil
sale_item.menu_category_name = menu_category.name
sale_item.product_code = item.product_code sale_item.product_code = item.product_code
sale_item.item_instance_code = item.item_instance_code sale_item.item_instance_code = item.item_instance_code
sale_item.product_name = item.product_name + " (#{type.upcase})" sale_item.product_name = item.product_name + " (#{type.upcase})"