change tax profile structure

This commit is contained in:
phyusin
2018-07-25 17:19:00 +06:30
parent 2be9ff0613
commit 94a65a749f
6 changed files with 85 additions and 69 deletions

View File

@@ -87,7 +87,9 @@ class Origami::CustomersController < BaseOrigamiController
@crm_customer = Customer.new
@count_customer = Customer.count_customer
@taxes = TaxProfile.where(:group_type => 'cashier')
# @taxes = TaxProfile.where(:group_type => 'cashier')
@taxes = TaxProfile.unscoped.select("id, (CONCAT(name,'(',(SELECT name FROM lookups WHERE lookup_type='tax_profiles' AND value=group_type),')')) as name")
.order("group_type ASC,order_by ASC")
# if flash["errors"]
# @crm_customer.valid?
# end

View File

@@ -12,76 +12,82 @@ class Origami::RequestBillsController < ApplicationController
sale_order=SaleOrder.new
if !ShiftSale.current_shift.nil?
order_id = params[:id] # order_id
bk_order = BookingOrder.find_by_order_id(order_id)
order = Order.find(order_id)
check_booking = Booking.find_by_booking_id(bk_order.booking_id)
if check_booking.dining_facility_id.to_i > 0
table = DiningFacility.find(check_booking.dining_facility_id)
else
table = nil
end
tax_profiles = TaxProfile.unscoped.where("group_type='cashier'").pluck(:id)
customers = Customer.find('CUS-000000000002')
puts "data => "
puts tax_profiles.to_json
puts customers.tax_profiles.to_json
# order_id = params[:id] # order_id
# bk_order = BookingOrder.find_by_order_id(order_id)
# order = Order.find(order_id)
# check_booking = Booking.find_by_booking_id(bk_order.booking_id)
# if check_booking.dining_facility_id.to_i > 0
# table = DiningFacility.find(check_booking.dining_facility_id)
# else
# table = nil
# end
if check_booking.sale_id.nil?
# Create Sale if it doesn't exist
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
@sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id)
# if check_booking.sale_id.nil?
# # Create Sale if it doesn't exist
# @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
# @sale_data = Sale.find_by_sale_id(@sale_id)
# @sale_items = SaleItem.where("sale_id=?",@sale_id)
# in-duty update
in_duties = InDuty.where("booking_id=?",bk_order.booking_id)
if !in_duties.empty?
in_duties.each do |in_duty|
induty = InDuty.find(in_duty.id)
induty.sale_id = @sale_id
induty.save
end
end
else
@sale_data = Sale.find_by_sale_id(check_booking.sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
end
# # in-duty update
# in_duties = InDuty.where("booking_id=?",bk_order.booking_id)
# if !in_duties.empty?
# in_duties.each do |in_duty|
# induty = InDuty.find(in_duty.id)
# induty.sale_id = @sale_id
# induty.save
# end
# end
# else
# @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
# @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
# end
# Bind shift sale id to sale
# @sale_data.shift_sale_id = shift.id
# @sale_data.save
# # Bind shift sale id to sale
# # @sale_data.shift_sale_id = shift.id
# # @sale_data.save
action_by = current_user.name
type = "REQUEST_BILL"
# action_by = current_user.name
# type = "REQUEST_BILL"
remark = "Request bill Receipt No #{@sale_data.receipt_no}"
sale_audit = SaleAudit.record_audit_sale(@sale_data.sale_id,remark,action_by,type )
# remark = "Request bill Receipt No #{@sale_data.receipt_no}"
# sale_audit = SaleAudit.record_audit_sale(@sale_data.sale_id,remark,action_by,type )
# Promotion Activation
Promotion.promo_activate(@sale)
# # Promotion Activation
# Promotion.promo_activate(@sale)
#bill channel
if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain
else
from = ""
end
# #bill channel
# if ENV["SERVER_MODE"] == 'cloud'
# from = request.subdomain + "." + request.domain
# else
# from = ""
# end
ActionCable.server.broadcast "bill_channel",table: table, from: from
if order.source == "quick_service"
result = {:status=> @status, :data => @sale.sale_id }
render :json => result.to_json
else
# ActionCable.server.broadcast "bill_channel",table: table, from: from
# if order.source == "quick_service"
# result = {:status=> @status, :data => @sale.sale_id }
# render :json => result.to_json
# else
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
# if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
printer = PrintSetting.find_by_unique_code("CheckInOutPdf")
unique_code = "CheckInOutPdf"
booking = Booking.find_by_booking_id(bk_order.booking_id)
# printer = PrintSetting.find_by_unique_code("CheckInOutPdf")
# unique_code = "CheckInOutPdf"
# booking = Booking.find_by_booking_id(bk_order.booking_id)
# print when complete click
order_queue_printer = Printer::OrderQueuePrinter.new(printer)
# # print when complete click
# order_queue_printer = Printer::OrderQueuePrinter.new(printer)
if !printer.nil?
order_queue_printer.print_check_in_out(printer, booking, table)
end
end
end
# if !printer.nil?
# order_queue_printer.print_check_in_out(printer, booking, table)
# end
# end
# end
else
@status = false
@error_message = "No Current Open Shift for This Employee"