diff --git a/README.md b/README.md index fcc35040..712d61a9 100755 --- a/README.md +++ b/README.md @@ -184,6 +184,9 @@ For MoveTablePdf in print settings Add Kitchen Role of Employee => 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen } +Add Base URL for DOEMAL + 1) settings/lookups => { type:order_reservation, name: BaseURL, value:'{doemal url}' } + * ToDo list 1. Migration diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index b49ef597..85c9b858 100755 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -24,7 +24,8 @@ module TokenVerification end end - @user = Employee.authenticate_by_token(token) + @user = Employee. + (token) if @user return true #Maybe log - login? diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 2fa99cf4..2d931d36 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -219,7 +219,19 @@ class OrderReservation < ApplicationRecord end def self.send_status_to_ordering(url,ref_no,status) - base_url = "http://192.168.1.186:3002" + base_url = 'https://api.doemal.com' + order_reservation = Lookup.collection_of("order_reservation") + if !order_reservation.empty? + order_reservation.each do |order_reserve| + if order_reserve[0] == 'BaseURL' + base_url = order_reserve[1] + end + end + else + Rails.logger.debug "Add order reservation BaseURL " + response = {status: false} + end + Rails.logger.debug "Doemal URL" + base_url post_url = base_url + url begin