diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index f7c34594..60fca0f7 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -74,7 +74,7 @@ authorize_resource :class => false @orders, @order_items = Booking.get_sync_data(params[:sale_id]) # Here comes to call the sync api - url = "http://192.168.1.187:3000/api/sync_records" + url = "http://192.168.1.176:3000/en/api/sync_data" begin @result = HTTParty.post(url.to_str, @@ -83,7 +83,7 @@ authorize_resource :class => false }.to_json, :headers => { 'Content-Type' => 'application/json', - 'Authorization' => 'bearer 88fa8a47ba8b52a43cbc' + 'Authorization' => 'Bearer 698bd32190e86d076325' }, :timeout => 10, :verify_ssl => OpenSSL::SSL::VERIFY_NONE, :verify => false ) diff --git a/app/models/order.rb b/app/models/order.rb index e8743187..44dc3668 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -563,19 +563,20 @@ class Order < ApplicationRecord def self.sync_order_records(orders) if !orders.nil? orders.each do |o| - unless Order.exists?(o.order_id) - order = Order.new() - order.order_id = o.order_id - order.date = o.date - order.source = o.source - order.order_type = o.order_type - order.customer_id = o.customer_id - order.item_count = o.item_count - order.quantity_count = o.quantity_count - order.status = o.status - order.waiters = o.waiters - order.guest_info = o.guest_info + unless Order.exists?(o['order_id']) + order = Order.new + order.order_id = o['order_id'] + order.date = o['date'] + order.source = o['source'] + order.order_type = o['order_type'] + order.customer_id = o['customer_id'] + order.item_count = o['item_count'] + order.quantity_count = o['quantity_count'] + order.status = o['status'] + order.waiters = o['waiters'] + order.guest_info = o['guest_info'] order.save + puts '...... order has been created .....' end end end diff --git a/app/models/order_item.rb b/app/models/order_item.rb index 6468d2f1..c4c9067a 100755 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -68,25 +68,26 @@ class OrderItem < ApplicationRecord def self.sync_order_item_records(order_items) if !order_items.nil? order_items.each do |item| - unless OrderItem.exists?(item.order_items_id) - order_item = OrderItem.new() - order_item.order_items_id = item.order_items_id - order_item.order_id = item.order_id - order_item.order_item_status = item.order_item_status - order_item.item_order_by = item.item_order_by - order_item.item_code = item.item_code - order_item.item_instance_code = item.item_instance_code - order_item.item_name = item.item_name - order_item.alt_name = item.alt_name - order_item.account_id = item.account_id - order_item.qty = item.qty - order_item.price = item.price - order_item.remark = item.remark - order_item.options = item.options - order_item.set_menu_items = item.set_menu_items - order_item.taxable = item.taxable - order_item.completed_by = item.completed_by + unless OrderItem.exists?(item['order_items_id']) + order_item = OrderItem.new + order_item.order_items_id = item['order_items_id'] + order_item.order_id = item['order_id'] + order_item.order_item_status = item['order_item_status'] + order_item.item_order_by = item['item_order_by'] + order_item.item_code = item['item_code'] + order_item.item_instance_code = item['item_instance_code'] + order_item.item_name = item['item_name'] + order_item.alt_name = item['alt_name'] + order_item.account_id = item['account_id'] + order_item.qty = item['qty'] + order_item.price = item['price'] + order_item.remark = item['remark'] + order_item.options = item['options'] + order_item.set_menu_items = item['set_menu_items'] + order_item.taxable = item['taxable'] + order_item.completed_by = item['completed_by'] order_item.save + puts '...... order item has been created. .....' end end end diff --git a/config/puma.rb b/config/puma.rb index c42b69ae..fd89392f 100755 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,4 +1,3 @@ - application_path="#{File.expand_path("../..", __FILE__)}" directory application_path #environment ENV.fetch("RAILS_ENV") { "production" }