diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 318aec49..5c4f3e68 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -71,14 +71,16 @@ authorize_resource :class => false end def sync_data - @orders, @order_items, @sales, @sale_items, @sale_taxes, @sale_payments, @sale_orders, @sale_audits, @bookings, @assigned_order_items, @shift_sales = Booking.get_sync_data(params[:sale_id]) + @orders, @order_items, @sales, @sale_items, @sale_taxes, @sale_payments, @sale_orders, @sale_audits, @bookings, @assigned_order_items, @shift_sales = Booking.get_sync_data(params[:sale_id]) # Here comes to call the sync api # url = "http://192.168.1.176:3000/en/api/sync_data" - url = Lookup.sync_url + url = Lookup.sync_url + token = Lookup.get_sync_token # token = Lookup.token - begin + unless url.nil? and token.nil? + begin @result = HTTParty.post(url.to_str, :body => { :orders => @orders, :order_items => @order_items, @@ -94,7 +96,7 @@ authorize_resource :class => false }.to_json, :headers => { 'Content-Type' => 'application/json', - 'Authorization' => 'Bearer 698bd32190e86d076325' + 'Authorization' => "Bearer #{token}" }, :timeout => 10, :verify_ssl => OpenSSL::SSL::VERIFY_NONE, :verify => false ) @@ -116,6 +118,7 @@ authorize_resource :class => false puts url puts response + end respond_to do |format| format.html { redirect_to '/en/reports/receipt_no/', notice: 'Sync Record Completed.'} diff --git a/app/models/booking.rb b/app/models/booking.rb index da8f5410..01684ab2 100755 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -14,10 +14,11 @@ class Booking < ApplicationRecord def self.sync_booking_records(bookings) if !bookings.nil? bookings.each do |b| - unless Booking.exists?(b['booking_id']) - booking = Booking.new + unless TableBooking.exists?(b['booking_id']) + booking = TableBooking.new booking.booking_id = b['booking_id'] booking.dining_facility_id = b['dining_facility_id'] + booking.type = b['type'] booking.checkin_at = b['checkin_at'] booking.checkin_by = b['checkin_by'] booking.checkout_at = b['checkout_at'] diff --git a/app/models/lookup.rb b/app/models/lookup.rb index edc15fdc..45762f74 100755 --- a/app/models/lookup.rb +++ b/app/models/lookup.rb @@ -26,6 +26,11 @@ class Lookup < ApplicationRecord return lookup.value end + def self.get_sync_token + lookup = Lookup.find_by_lookup_type('sync_token') + return lookup.value + end + def self.collection_of(type) Lookup.select("name, value").where("lookup_type" => type ).map { |l| [l.name, l.value] } diff --git a/dump.rdb b/dump.rdb index e347ef4f..68378516 100644 Binary files a/dump.rdb and b/dump.rdb differ