feat: reigioning it! (#249)

NeonGamerBot-QK · web-flow · commit 4f8243084330 · 2025-12-06T14:39:09.000-05:00
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
@@ -107,11 +107,16 @@ def create_order
   private
 
   def user_region
-    return current_user.region if current_user.region.present?
+    if current_user
+      return current_user.region if current_user.region.present?
 
-    primary_address = current_user.addresses.find { |a| a["primary"] } || current_user.addresses.first
-    country = primary_address&.dig("country")
-    Shop::Regionalizable.country_to_region(country)
+      primary_address = current_user.addresses.find { |a| a["primary"] } || current_user.addresses.first
+      country = primary_address&.dig("country")
+      region_from_address = Shop::Regionalizable.country_to_region(country)
+      return region_from_address if region_from_address != "XX" || country.present?
+    end
+
+    Shop::Regionalizable.timezone_to_region(cookies[:timezone])
   end
 
   def user_ordered_free_stickers?
diff --git a/app/javascript/controllers/timezone_controller.js b/app/javascript/controllers/timezone_controller.js
@@ -0,0 +1,20 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  connect() {
+    if (!this.hasTimezoneCookie()) {
+      this.setTimezoneCookie();
+    }
+  }
+
+  hasTimezoneCookie() {
+    return document.cookie.split(";").some((c) => c.trim().startsWith("timezone="));
+  }
+
+  setTimezoneCookie() {
+    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    if (timezone) {
+      document.cookie = `timezone=${encodeURIComponent(timezone)};path=/;max-age=31536000;SameSite=Lax`;
+    }
+  }
+}
diff --git a/app/models/concerns/shop/regionalizable.rb b/app/models/concerns/shop/regionalizable.rb
@@ -94,5 +94,38 @@ def self.region_name(region_code)
     def self.countries_for_region(region_code)
       REGIONS.dig(region_code.upcase, :countries) || []
     end
+
+    TIMEZONE_TO_REGION = {
+      # United States
+      "America/New_York" => "US", "America/Chicago" => "US", "America/Denver" => "US",
+      "America/Los_Angeles" => "US", "America/Phoenix" => "US", "America/Anchorage" => "US",
+      "Pacific/Honolulu" => "US", "America/Detroit" => "US", "America/Indiana/Indianapolis" => "US",
+      # Canada
+      "America/Toronto" => "CA", "America/Vancouver" => "CA", "America/Edmonton" => "CA",
+      "America/Winnipeg" => "CA", "America/Halifax" => "CA", "America/St_Johns" => "CA",
+      # United Kingdom
+      "Europe/London" => "UK",
+      # EU countries
+      "Europe/Paris" => "EU", "Europe/Berlin" => "EU", "Europe/Rome" => "EU",
+      "Europe/Madrid" => "EU", "Europe/Amsterdam" => "EU", "Europe/Brussels" => "EU",
+      "Europe/Vienna" => "EU", "Europe/Stockholm" => "EU", "Europe/Copenhagen" => "EU",
+      "Europe/Helsinki" => "EU", "Europe/Warsaw" => "EU", "Europe/Prague" => "EU",
+      "Europe/Budapest" => "EU", "Europe/Athens" => "EU", "Europe/Bucharest" => "EU",
+      "Europe/Sofia" => "EU", "Europe/Dublin" => "EU", "Europe/Lisbon" => "EU",
+      "Europe/Zagreb" => "EU", "Europe/Ljubljana" => "EU", "Europe/Bratislava" => "EU",
+      "Europe/Tallinn" => "EU", "Europe/Riga" => "EU", "Europe/Vilnius" => "EU",
+      "Europe/Luxembourg" => "EU", "Europe/Malta" => "EU",
+      # India
+      "Asia/Kolkata" => "IN", "Asia/Calcutta" => "IN",
+      # Australia/NZ
+      "Australia/Sydney" => "AU", "Australia/Melbourne" => "AU", "Australia/Brisbane" => "AU",
+      "Australia/Perth" => "AU", "Australia/Adelaide" => "AU", "Australia/Hobart" => "AU",
+      "Pacific/Auckland" => "AU", "Pacific/Fiji" => "AU"
+    }.freeze
+
+    def self.timezone_to_region(timezone)
+      return "XX" if timezone.blank?
+      TIMEZONE_TO_REGION[timezone] || "XX"
+    end
   end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -37,7 +37,7 @@
     <%= Sentry.get_trace_propagation_meta.html_safe %> <%# erb_lint:disable ErbSafety %>
   </head>
 
-  <body class="<%= current_user.present? ? 'signed-in' : '' %>">
+  <body class="<%= current_user.present? ? 'signed-in' : '' %>" data-controller="timezone">
     <% if current_user.present? %>
       <%= render "shared/sidebar" %>
     <% end %>
