From 2c24b133445e71188d6dff2c3454c15d6d908938 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 14 Dec 2017 14:30:30 +0630 Subject: [PATCH] bill foc --- app/controllers/reports/saleitem_controller.rb | 2 +- app/models/sale_item.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index 2e213323..7e7469f9 100755 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -18,7 +18,7 @@ class Reports::SaleitemController < BaseReportController @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED) @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil) -puts @sale_data.to_json + @account_cate_count = Hash.new {|hash, key| hash[key] = 0} diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 2cd728d4..8726c645 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -30,7 +30,7 @@ class SaleItem < ApplicationRecord sale_item = SaleItem.new sale_item.product_code = item.product_code sale_item.item_instance_code = item.item_instance_code - sale_item.product_name = item.product_name + "(#{type})" + sale_item.product_name = item.product_name + " (#{type.upcase})" sale_item.product_alt_name = item.product_alt_name sale_item.account_id = item.account_id sale_item.remark = type