Phone numbers on address! (#62)

* add phone column to addresses

* phone number!

* lint

Author: 24c02

app/frontend/images/icons/phone.svg

@@ -2,18 +2,19 @@
 #
 # Table name: addresses
 #
-#  id          :bigint           not null, primary key
-#  city        :string
-#  country     :integer
-#  first_name  :string
-#  last_name   :string
-#  line_1      :string
-#  line_2      :string
-#  postal_code :string
-#  state       :string
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  identity_id :bigint           not null
+#  id           :bigint           not null, primary key
+#  city         :string
+#  country      :integer
+#  first_name   :string
+#  last_name    :string
+#  line_1       :string
+#  line_2       :string
+#  phone_number :string
+#  postal_code  :string
+#  state        :string
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  identity_id  :bigint           not null
 #
 # Indexes
 #
@@ -43,10 +44,16 @@ class Address < ApplicationRecord
 
   def self.strip_gremlins(str) = str&.delete(GREMLINS)&.presence
 
-  validates_presence_of :first_name, :line_1, :city, :state, :postal_code, :country
+  validates_presence_of :first_name, :line_1, :city, :state, :postal_code, :country, :phone_number
 
   before_validation :strip_gremlins_from_fields
 
+  before_validation :normalize_phone_number
+
+  def self.country_calling_code(country_alpha2)
+    ISO3166::Country[country_alpha2]&.country_code
+  end
+
   private def strip_gremlins_from_fields
     self.first_name = Address.strip_gremlins(first_name)
     self.last_name = Address.strip_gremlins(last_name)
@@ -56,4 +63,14 @@ def self.strip_gremlins(str) = str&.delete(GREMLINS)&.presence
     self.state = Address.strip_gremlins(state)
     self.postal_code = Address.strip_gremlins(postal_code)
   end
+
+  private def normalize_phone_number
+    return if phone_number.blank?
+    cleaned = phone_number.gsub(/[^\d+]/, "")
+    calling_code = Address.country_calling_code(country)
+    unless cleaned.start_with?("+")
+      cleaned = "+#{calling_code}#{cleaned}"
+    end
+    self.phone_number = cleaned
+  end
 end

app/models/address.rb

@@ -17,6 +17,9 @@
     <% end %>
     <%= address.city %>, <%= address.state %> <%= address.postal_code %><br>
     <%= address.country %>
+    <% if address.phone_number.present? %>
+      <br><%= inline_icon("phone", size: 14) %> <%= address.phone_number %>
+    <% end %>
   </div>
 
   <div class="form-actions" style="gap: 0.5rem;">

app/views/addresses/_address.html.erb

@@ -1,3 +1,19 @@
+<%
+  country_calling_codes = Address.countries.keys.each_with_object({}) do |alpha2, hash|
+    hash[alpha2] = Address.country_calling_code(alpha2)
+  end
+  initial_country = address.country || current_identity&.country || "US"
+  initial_calling_code = Address.country_calling_code(initial_country) || "1"
+
+  # Strip country code prefix for display (it's shown separately)
+  raw_phone = address.phone_number.presence || current_identity&.phone_number
+  display_phone = if raw_phone.present? && raw_phone.start_with?("+")
+    raw_phone.sub(/^\+#{initial_calling_code}/, "")
+  else
+    raw_phone
+  end
+%>
+
 <%= form_with model: address, url: local_assigns[:url], local: true do |f| %>
   <% if local_assigns[:from_program] %>
     <%= f.hidden_field :from_program, value: true %>
@@ -27,12 +43,32 @@
     <%= f.text_field :state, placeholder: t("addresses.state"), required: true %>
   </div>
 
-  <div class="grid">
-    <%= f.text_field :postal_code, placeholder: t("addresses.postal_code"), required: true %>
-    <%= f.collection_select :country, Address.countries_for_select,
-                            :first, :last,
-                            { include_blank: "Country" },
-                            { required: true } %>
+  <div x-data="{
+         callingCodes: <%= country_calling_codes.to_json %>,
+         callingCode: '<%= initial_calling_code %>',
+         updateCallingCode(countrySelect) {
+           const code = this.callingCodes[countrySelect.value];
+           if (code) this.callingCode = code;
+         }
+       }">
+    <div class="grid">
+      <%= f.text_field :postal_code, placeholder: t("addresses.postal_code"), required: true %>
+      <%= f.collection_select :country, Address.countries_for_select,
+                              :first, :last,
+                              { include_blank: "Country" },
+                              { required: true, "@change": "updateCallingCode($event.target)" } %>
+    </div>
+
+    <div class="grid" style="grid-template-columns: auto 1fr; margin-top: 1rem;">
+      <span style="padding: 0.5rem 0.75rem; background: var(--input-bg); border: 1px solid var(--input-border); border-radius: var(--radius); display: flex; align-items: center; font-size: 0.95rem; color: var(--text-muted);">
+        +<span x-text="callingCode"></span>
+      </span>
+      <%= f.telephone_field :phone_number,
+                            placeholder: t("addresses.phone_number"),
+                            value: display_phone,
+                            required: true,
+                            style: "margin: 0;" %>
+    </div>
   </div>
 
   <div class="form-actions">

app/views/addresses/_form.html.erb

@@ -8,5 +8,6 @@
   state: address.state,
   postal_code: address.postal_code,
   country: address.country,
+  phone_number: address.phone_number,
   primary: address.id == address&.identity&.primary_address&.id
 }.compact_blank

app/views/api/v1/addresses/_address.jb

@@ -120,6 +120,7 @@ en:
     city: City
     state: State/Province
     postal_code: Postal code
+    phone_number: Phone number
     save: Save address
     cancel: Cancel
     primary: Primary

config/locales/en.yml

@@ -0,0 +1,5 @@
+class AddPhoneNumberToAddresses < ActiveRecord::Migration[8.0]
+  def change
+    add_column :addresses, :phone_number, :string
+  end
+end