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

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-06-19 11:02:09 +06:30
parent 555ff6e684
commit 8d1b15f119
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/controllers/api/bill_controller.rb
View File

@@ -14,22 +14,17 @@ class Api::BillController < Api::ApiController
# for Multiple Cashier by Zone # for Multiple Cashier by Zone
table = DiningFacility.find(booking.dining_facility_id) table = DiningFacility.find(booking.dining_facility_id)
cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) if booking
if booking.sale_id.nil?
shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) @sale = Sale.new
get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id) @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, current_login_employee, "cashier")
@sale_data = Sale.find_by_sale_id(@sale_id)
if booking else
if booking.sale_id.nil? @status = true
@sale = Sale.new @sale_id = booking.sale_id
@status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, get_cashier_by_terminal) @sale_data = Sale.find_by_sale_id(@sale_id)
@sale_data = Sale.find_by_sale_id(@sale_id)
else
@status = true
@sale_id = booking.sale_id
@sale_data = Sale.find_by_sale_id(@sale_id)
end
end end
end
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
@@ -47,7 +42,7 @@ class Api::BillController < Api::ApiController
elsif (params[:order_id]) elsif (params[:order_id])
@sale = Sale.new @sale = Sale.new
@status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier) @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier, "cashier")
# for Job # for Job
booking = Booking.find_by_sale_id(@sale_id) booking = Booking.find_by_sale_id(@sale_id)

1
app/controllers/origami/addorders_controller.rb
View File

@@ -261,7 +261,6 @@ class Origami::AddordersController < BaseOrigamiController
#Send to background job for processing #Send to background job for processing
order = Order.find(order_id) order = Order.find(order_id)
sidekiq = Lookup.find_by_lookup_type("sidekiq") sidekiq = Lookup.find_by_lookup_type("sidekiq")
if ENV["SERVER_MODE"] != 'cloud' if ENV["SERVER_MODE"] != 'cloud'
cup_status = `#{"sudo service cups status"}` cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status) print_status = check_cup_status(cup_status)

2
config/secrets.yml
View File

@@ -12,7 +12,7 @@
development: development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
sx_provision_url: connect.pos-myanmar.com/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: application server_mode: application
cipher_type: AES-256-CBC cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L sx_key: Wh@t1$C2L