From 569f074a4eb676512df716e1405dfdf5ae140227 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 Jul 2019 14:15:09 +0630 Subject: [PATCH] all items foc case fixed --- app/controllers/api/bill_controller.rb | 2 +- app/controllers/oqs/print_controller.rb | 4 +- .../origami/request_bills_controller.rb | 2 +- app/models/sale_item.rb | 42 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 214e1300..1614bb1e 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -131,7 +131,7 @@ class Api::BillController < Api::ApiController #member_info = Customer.get_member_account(customer) # printer = Printer::ReceiptPrinter.new(print_settings) - # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) + # printer.print_receipt_bill(print_settings, false, nil,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) end def request_bill diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index abf20018..751e1c01 100755 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -51,7 +51,7 @@ class Oqs::PrintController < ApplicationController ai.save end - # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) + # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) if ENV["SERVER_MODE"] == "cloud" result = { :filepath => filename, @@ -119,7 +119,7 @@ class Oqs::PrintController < ApplicationController ai.save end - # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) + # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) if ENV["SERVER_MODE"] == "cloud" result = { :filepath => filename, diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 422e1372..9905ebaf 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -120,7 +120,7 @@ class Origami::RequestBillsController < ApplicationController # printer = Printer::ReceiptPrinter.new(print_settings) - # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) + # printer.print_receipt_bill(print_settings, false, nil,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) end end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 86e9cabc..f813f111 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -62,29 +62,29 @@ class SaleItem < ApplicationRecord item.save menu_category = MenuCategory.get_menu_category(item.product_code) #get menu category for menu items - 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.item_instance_code = item.item_instance_code - 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.status = type - sale_item.remark = type - if type == "foc" || type == "promotion" || type == "void" || type == "waste" || type == "spoile" - sale_item.qty = qty * (-1) - else - sale_item.qty = qty - end + # 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.item_instance_code = item.item_instance_code + # 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.status = type + # sale_item.remark = type + # if type == "foc" || type == "promotion" || type == "void" || type == "waste" || type == "spoile" + # sale_item.qty = qty * (-1) + # else + # sale_item.qty = qty + # end - sale_item.unit_price = item_price # * (-1) - sale_item.taxable_price = (price) * (-1) - sale_item.price = (price) * (-1) + # sale_item.unit_price = item_price # * (-1) + # sale_item.taxable_price = (price) * (-1) + # sale_item.price = (price) * (-1) - sale_item.is_taxable = 1 - sale_item.sale_id = sale_id - sale_item.save + # sale_item.is_taxable = 1 + # sale_item.sale_id = sale_id + # sale_item.save sale = Sale.find(sale_id) sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) end