diff --git a/app/models/order.rb b/app/models/order.rb index c71597bd..ef21b7ff 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -141,7 +141,7 @@ class Order < ApplicationRecord # set_order_items = # end - if item.include? 'sub_items' + if (item.include? 'sub_items') || (item.include? :sub_items) item[:sub_items].each do |si| set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity]}) end diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb new file mode 100644 index 00000000..752f6d39 --- /dev/null +++ b/config/initializers/sidekiq.rb @@ -0,0 +1,10 @@ +redis = YAML::load(File.open("#{ Rails.root }/config/redis.yml"))[::Rails.env] + +Sidekiq.configure_server do |config| + config.redis = { url: "#{ redis['url'] }/#{ redis['db'] }" } +end + +Sidekiq.configure_client do |config| + # config.redis = { url: "redis://#{ redis['host'] }:#{ redis['port'] }/0" } + config.redis = { url: "#{ redis['url'] }/#{ redis['db'] }" } +end \ No newline at end of file diff --git a/config/redis.yml b/config/redis.yml new file mode 100644 index 00000000..66b9db53 --- /dev/null +++ b/config/redis.yml @@ -0,0 +1,13 @@ +default: &default + url: redis://localhost:6379 + db: 0 + +development: + <<: *default + +test: + <<: *default + +production: + <<: *default + url: redis://127.0.0.1:6379 \ No newline at end of file