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

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
Aung Kyaw Phyoe
2019-01-10 11:47:49 +06:30
parent 055ef84ce5 7ad653f40b
commit defabf6a27
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/origami/discounts_controller.rb
View File

@@ -52,8 +52,17 @@ class Origami::DiscountsController < BaseOrigamiController
#save sale item for discount
discount_items.each do |di|
origin_sale_item = SaleItem.find(di["id"])
sale_item = SaleItem.new
if !origin_sale_item.nil?
menu_category = MenuCategory.get_menu_category(origin_sale_item.product_code) #get menu category for menu items
if !menu_category.nil?
sale_item.menu_category_code = menu_category.code
sale_item.menu_category_name = menu_category.name
end
end
sale_item.sale_id = sale_id
sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
sale_item.product_name = di["name"]

7
app/models/promotion.rb
View File

@@ -162,8 +162,13 @@ class Promotion < ApplicationRecord
def self.update_existing_item(qty, item, sale_id, type, item_price,source)
menu_category = MenuCategory.get_menu_category(item.item_code) #get menu category for menu items
sale_item = SaleItem.new
if !menu_category.nil?
sale_item.menu_category_code = menu_category.code
sale_item.menu_category_name = menu_category.name
end
sale_item.product_code = item.item_code
sale_item.item_instance_code = item.item_instance_code
sale_item.product_name = item.item_name + "(promotion)"