From 7ad653f40bca4b98ea4dda216b8109f76c421e07 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 9 Jan 2019 13:24:50 +0630 Subject: [PATCH] menu category for discount and promotion item --- app/controllers/origami/discounts_controller.rb | 9 +++++++++ app/models/promotion.rb | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 23c026b3..22092a50 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -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"] diff --git a/app/models/promotion.rb b/app/models/promotion.rb index b6bd063f..034ae8ac 100755 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -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)"