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

bill channel for request bill and creditnote payment duoble amt

Browse Source
This commit is contained in:
phyusin
2018-04-04 16:37:10 +06:30
parent 5c21d914ae
commit 2e81de1ea7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/origami/request_bills_controller.rb
View File

@@ -16,7 +16,7 @@ class Origami::RequestBillsController < ApplicationController
bk_order = BookingOrder.find_by_order_id(order_id) bk_order = BookingOrder.find_by_order_id(order_id)
order = Order.find(order_id) order = Order.find(order_id)
check_booking = Booking.find_by_booking_id(bk_order.booking_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id)
table = DiningFacility.find(check_booking.dining_facility_id)
if check_booking.sale_id.nil? if check_booking.sale_id.nil?
# Create Sale if it doesn't exist # 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) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
@@ -33,6 +33,8 @@ class Origami::RequestBillsController < ApplicationController
# Promotion Activation # Promotion Activation
Promotion.promo_activate(@sale) Promotion.promo_activate(@sale)
#bill channel
ActionCable.server.broadcast "bill_channel",table: table
if order.source == "quick_service" if order.source == "quick_service"
result = {:status=> @status, :data => @sale.sale_id } result = {:status=> @status, :data => @sale.sale_id }
render :json => result.to_json render :json => result.to_json

2
app/models/sale_payment.rb
View File

@@ -472,7 +472,7 @@ class SalePayment < ApplicationRecord
elsif paid_amount.to_f > 0 #|| paid_amount != "0.0" elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
table_update_status(sObj) table_update_status(sObj)
update_shift update_shift
elsif method_status && paid_amount.to_f == 0 elsif method_status && paid_amount.to_f == 0 && is_credit == 0
table_update_status(sObj) table_update_status(sObj)
update_shift update_shift
end end