Merge branch 'r-1902001-01-dev' of https://gitlab.com/code2lab/SXRestaurant into r-1902001-01-dev

This commit is contained in:
Nweni
2019-06-24 10:10:25 +06:30
13 changed files with 415 additions and 350 deletions

View File

@@ -280,8 +280,12 @@ class Origami::PaymentsController < BaseOrigamiController
end
def show
puts current_user
puts "Hello current_user"
display_type = Lookup.find_by_lookup_type("display_type")
if !display_type.nil? && display_type.value.to_i ==2
@display_type = display_type.value
else
@display_type = nil
end
path = request.fullpath
sale_id = params[:sale_id]
@trans_flag = true