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

major fix taxable price for sale and other sale and oqs

Browse Source
This commit is contained in:
Yan
2017-11-22 18:39:35 +06:30
parent 2cc8b820db
commit 6beb32348d
18 changed files with 105 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/controllers/oqs/home_controller.rb
View File

@@ -44,9 +44,9 @@ class Oqs::HomeController < BaseOqsController
# Get Order items
def get_order_items
items = []
table_name = params[:table_id]
order_no = params[:order_no]
status = params[:status]
dining = DiningFacility.find_by_name(table_name);
# dining = DiningFacility.find_by_name(table_name);
# oqpz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id)
# if status == ""
# AssignedOrderItem.where("order_queue_station_id=#{ oqpz.order_queue_station_id } AND delivery_status=0").find_each do |aoi|
@@ -60,22 +60,18 @@ class Oqs::HomeController < BaseOqsController
# end
# end
booking = Booking.find_by_dining_facility_id(dining.id)
BookingOrder.where("booking_id='#{ booking.booking_id }'").find_each do |bo|
order=Order.find(bo.order_id)
order.order_items.each do |oi|
items.push(oi)
end
end
# booking_id = dining.get_new_booking
# BookingOrder.where("booking_id='#{ booking_id }'").find_each do |bo|
# order=Order.find(bo.order_id);
# order.order_items.each do |oi|
# items.push(oi)
# end
# booking = Booking.find_by_dining_facility_id(dining.id)
# BookingOrder.where("booking_id='#{ booking.booking_id }'").find_each do |bo|
# order=Order.find(bo.order_id)
# order.order_items.each do |oi|
# items.push(oi)
# end
# end
OrderItem.where("order_id='#{ order_no }'").find_each do |oi|
items.push(oi)
end
render :json => items.to_json
end
@@ -132,7 +128,7 @@ class Oqs::HomeController < BaseOqsController
.where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
.order("assigned_order_items.assigned_order_item_id desc")
.group("assigned_order_items.assigned_order_item_id")
.group("odt.order_items_id")
end

9
app/controllers/oqs/print_controller.rb
View File

@@ -40,13 +40,16 @@ class Oqs::PrintController < ApplicationController
print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
# get dining
dining = DiningFacility.find_by_name(table_name);
booking = Booking.find_by_dining_facility_id(dining.id)
# dining = DiningFacility.find_by_name(table_name);
# booking = Booking.find_by_dining_facility_id(dining.id)
# Get Booking ID
booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0]
# print when complete click
print_settings = PrintSetting.find_by_unique_code(unique_code)
order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_booking_summary(print_settings,oqs, booking.booking_id, print_status)
order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status)
# update print status for completed same order items
assigned_items.each do |ai|

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

@@ -40,10 +40,10 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item.product_alt_name = ""
sale_item.remark = "Discount"
sale_item.qty = 1
sale_item.unit_price = di["price"]
sale_item.qty = -1
sale_item.unit_price = di["price"] * -1
sale_item.taxable_price = di["price"]
sale_item.is_taxable = 0
sale_item.is_taxable = 1
sale_item.account_id = origin_sale_item.account_id
sale_item.price = di["price"]

6
app/controllers/origami/other_charges_controller.rb
View File

@@ -36,11 +36,11 @@ class Origami::OtherChargesController < BaseOrigamiController
sale_item.qty = 1
sale_item.unit_price = di["price"]
sale_item.taxable_price = 0
sale_item.is_taxable = 0
sale_item.taxable_price = di["price"] * 1
sale_item.is_taxable = 1
sale_item.account_id = 0
sale_item.price = di["price"]
sale_item.price = di["price"] * 1
sale_item.save
action_by = current_user.id

6
app/controllers/settings/dining_charges_controller.rb
View File

@@ -57,11 +57,15 @@ class Settings::DiningChargesController < ApplicationController
@dining_charge.minimum_free_time = DateTime.parse(dining_charge_params["minimum_free_time"])
@dining_charge.charge_block = DateTime.parse(dining_charge_params["charge_block"])
@dining_charge.time_rounding_block = DateTime.parse(dining_charge_params["time_rounding_block"])
if @dining_charge.update(dining_charge_params)
@dining_charge.minimum_free_time = DateTime.parse(dining_charge_params["minimum_free_time"])
@dining_charge.charge_block = DateTime.parse(dining_charge_params["charge_block"])
@dining_charge.time_rounding_block = DateTime.parse(dining_charge_params["time_rounding_block"])
# @dining_charge.minimum_free_time = @dining_charge.minimum_free_time.to_datetime.advance(hours: +6, minutes: +30)
# @dining_charge.charge_block = @dining_charge.charge_block.to_datetime.advance(hours: +6, minutes: +30)
# @dining_charge.time_rounding_block = @dining_charge.time_rounding_block.to_datetime.advance(hours: +6, minutes: +30)
# @dining_charge.save
@dining_charge.save
if @table
format.html { redirect_to settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
else