zuora_connect 2.0.60k → 2.0.60l

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe61d354796bd1cf1935f2787db0611bb2858393767db78230efb191cf64eabc
-  data.tar.gz: c5b22daf266f3cc696c1a85ac46e7b4242d75a59f094f2103edb1fa0da729df2
+  metadata.gz: 00f68595c6354e9924c2e73bdb81246bdc858874f49830f94111e0d46b6e8298
+  data.tar.gz: 1b01b3c05190970c9ad92c461f64b89787b790f3e2ffb6394831ccce425e0d1a
 SHA512:
-  metadata.gz: 04b0bf5d380361c58279910595d0967fde34c00b05db703d2c4dda02a8205487eb8b0fd3c8bfc44d0c0997854cfacca9585c778e96000e938a19b8ee6604271c
-  data.tar.gz: 510d4eb2cd734f1082f887ff3924ce580658d4419929ee12db35acec17338785b8e9ecb64588307f3a6fe26adb29a8ed45c04df51a2964f1be9480880c2f2813
+  metadata.gz: e58fc8cd5b36a2be218afab342507a78acb5221001cdc712e61a7e80ad0615797ed42c7ae413d4d5dc179d14784e91eb621ea5be9466a45e904ed97bd5996076
+  data.tar.gz: df3730519a5b2b1e8b3778866bd6ac59255633666522fe7ec8522e6815a1c87d5aba89fd733ec1eaecf6caeccf74fde010ea40a9d882b20d6fe2cfc4f1ee46a2

data/app/models/zuora_connect/app_instance_base.rb

@@ -260,9 +260,16 @@ module ZuoraConnect
 
       if self.user_timezone.present?
         # connect instance which has a custom timezone
-        if !self.auto_deployed? && self.task_data.dig('user_settings', 'timezone') != self.user_timezone
+        if !self.auto_deployed? && (
+          ActiveSupport::TimeZone[self.task_data.dig('user_settings', 'timezone') || '']&.utc_offset !=
+            ActiveSupport::TimeZone[self.user_timezone]&.utc_offset
+        )
           if self.environment == 'Production'
-            ZuoraConnect.logger.error('Instance and user timezones are different', app_instance_id: self.id)
+            ZuoraConnect.logger.error(
+              "Instance and user timezones are different. User has '#{self.user_timezone}' and " \
+              "instance has '#{self.task_data.dig('user_settings', 'timezone')}'",
+              app_instance_id: self.id
+            )
           end
           self.user_timezone = nil
           Time.zone = self.timezone

data/lib/zuora_connect/controllers/helpers.rb

@@ -132,6 +132,9 @@ module ZuoraConnect
             if locale.include?("-")
               locale = locale.split("-").first
               retry
+            elsif locale != session["#{@appinstance.id}::user::language"]
+              locale = session["#{@appinstance.id}::user::language"]
+              retry
             end
             ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
           end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.60k"
+  VERSION = "2.0.60l"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60k
+  version: 2.0.60l
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment