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

CBKI

Browse Source
This commit is contained in:
Nweni
2019-10-30 16:52:16 +06:30
parent 41178978d2
commit 359679d419
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/authenticate_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::AuthenticateController < Api::ApiController class Api::AuthenticateController < Api::ApiController
skip_before_action :authenticate # skip_before_action :authenticate
def create def create
emp_id = params[:emp_id] emp_id = params[:emp_id]

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

@@ -305,7 +305,7 @@ class Origami::AddordersController < BaseOrigamiController
def getCloudDomain def getCloudDomain
from = "" from = ""
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain from = request.subdomain.to_s + "." + request.domain.to_s
end end
return from return from

2
app/controllers/origami/payments_controller.rb
View File

@@ -839,7 +839,7 @@ class Origami::PaymentsController < BaseOrigamiController
def getCloudDomain def getCloudDomain
from = "" from = ""
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain from = request.subdomain.to_s + "." + request.domain.to_s
end end
return from return from

2
app/controllers/origami/pending_order_controller.rb
View File

@@ -22,7 +22,7 @@ class Origami::PendingOrderController < BaseOrigamiController
else else
redirect_to "/origami/#{params[:type]}" and return redirect_to "/origami/#{params[:type]}" and return
end end
elsif id.start_with?("BKI") elsif (id.start_with?("BKI") || id.start_with?("CBKI"))
@bookings = Booking.find(id) @bookings = Booking.find(id)
@order = @bookings.orders.where(status: "new").first @order = @bookings.orders.where(status: "new").first
@order_items = @bookings.order_items @order_items = @bookings.order_items