Restore firstname lastname on address

admin/app/components/solidus_admin/ui/forms/address/component.html.erb

@@ -4,6 +4,11 @@
 >
   <div class="<%= stimulus_id %>--address-form flex flex-wrap gap-4 pb-4">
     <%= render component("ui/forms/field").text_field(@name, :name, object: @address) %>
+    <%= render component("ui/forms/field").text_field(@name, :firstname, object: @address) %>
+    <%= render component("ui/forms/field").text_field(@name, :lastname, object: @address) %>
+    <% if Spree::Config[:company] %>
+      <%= render component("ui/forms/field").text_field(@name, :company, object: @address) %>
+    <% end %>
     <%= render component("ui/forms/field").text_field(@name, :address1, object: @address) %>
     <%= render component("ui/forms/field").text_field(@name, :address2, object: @address) %>
     <div class="flex gap-4 w-full">

admin/spec/features/orders/show_spec.rb

@@ -52,6 +52,8 @@
 
     within("dialog") do
       fill_in "Name", with: "John Doe"
+      fill_in "First Name", with: "John"
+      fill_in "Last Name", with: "Doe"
       fill_in "Street Address", with: "1 John Doe Street"
       fill_in "Street Address (cont'd)", with: "Apartment 2"
       fill_in "City", with: "John Doe City"
@@ -78,6 +80,8 @@
 
     within("dialog") do
       fill_in "Name", with: "Jane Doe"
+      fill_in "First Name", with: "Jane"
+      fill_in "Last Name", with:  "Doe"
       fill_in "Street Address", with: "1 Jane Doe Street"
       fill_in "Street Address (cont'd)", with: "Apartment 3"
       fill_in "City", with: "Jane Doe City"

admin/spec/features/users_spec.rb

@@ -129,28 +129,32 @@
       # Invalid submission
       within("form.ship_address") do
         fill_in "Name", with: ""
+        fill_in "First Name", with: ""
         fill_in "Street Address", with: ""
         click_on "Update"
       end
-      expect(page).to have_content("can't be blank").twice
+      expect(page).to have_content("can't be blank").thrice
 
       # Valid submission
       within("form.bill_address") do
         fill_in "Name", with: "Galadriel"
+        fill_in "First Name", with: "Galadriel"
         click_on "Update"
       end
       expect(page).to have_content("Billing Address has been successfully updated.")
 
       # Valid submission
       within("form.ship_address") do
         fill_in "Name", with: "Elrond"
+        fill_in "First Name", with: "Elrond"
         click_on "Update"
       end
       expect(page).to have_content("Shipping Address has been successfully updated.")
 
       # Cancel submission
       within("form.bill_address") do
         fill_in "Name", with: "Smeagol"
+        fill_in "First Name", with: "Smeagol"
         click_on "Cancel"
       end
       expect(page).to have_content("Users / [email protected] / Addresses")
@@ -159,6 +163,8 @@
       # The address forms weirdly only have values rather than actual text on the page.
       expect(page).to have_field("user[bill_address_attributes][name]", with: "Galadriel")
       expect(page).to have_field("user[ship_address_attributes][name]", with: "Elrond")
+      expect(page).to have_field("user[bill_address_attributes][firstname]", with: "Galadriel")
+      expect(page).to have_field("user[ship_address_attributes][firstname]", with: "Elrond")
     end
   end
 

admin/spec/requests/solidus_admin/users_spec.rb

@@ -12,6 +12,8 @@
       user: {
         bill_address_attributes: {
           name: address.name,
+          firstname: address.firstname,
+          lastname: address.lastname,
           address1: address.address1,
           address2: address.address2,
           city: address.city,

api/lib/spree/api_configuration.rb

@@ -61,7 +61,7 @@ class ApiConfiguration < Preferences::Configuration
     ]
 
     preference :address_attributes, :array, default: [
-      :id, :name, :address1, :address2, :city, :zipcode, :phone, :company,
+      :id, :name, :firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :company,
       :alternative_phone, :country_id, :country_iso, :state_id, :state_name,
       :state_text
     ]

api/spec/requests/spree/api/address_books_spec.rb

@@ -8,6 +8,8 @@ module Spree::Api
     let!(:harry_address_attributes) do
       {
         'name' => 'Harry Potter',
+        'firstname' => 'Harry',
+        'lastname' => 'Potter',
         'address1' => '4 Privet Drive',
         'address2' => 'cupboard under the stairs',
         'city' => 'Surrey',
@@ -21,6 +23,8 @@ module Spree::Api
     let!(:ron_address_attributes) do
       {
         'name' => 'Ron Weasly',
+        'firstname' => 'Ron',
+        'lastname' => 'Weasly',
         'address1' => 'Ottery St. Catchpole',
         'address2' => '4th floor',
         'city' => 'Devon, West Country',
@@ -54,6 +58,8 @@ module Spree::Api
           user = create(:user, spree_api_key: 'galleon')
           address = user.save_in_address_book(harry_address_attributes, true)
           harry_address_attributes['name'] = 'Ron Weasly'
+          harry_address_attributes['firstname'] = 'Ron'
+          harry_address_attributes['lastname'] = 'Weasly'
 
           expect {
             put "/api/users/#{user.id}/address_book",
@@ -73,7 +79,7 @@ module Spree::Api
 
         context "when updating a default address" do
           let(:user) { create(:user, spree_api_key: 'galleon') }
-          let(:changes) { { name: "Hermione Granger", id: user.ship_address.id} }
+          let(:changes) { { name: "Hermione Granger", firstname: "Hermione", lastname: "Granger", id: user.ship_address.id} }
           before do
             # Create "Harry Potter" default shipping address
             user.save_in_address_book(harry_address_attributes, true)
@@ -168,7 +174,9 @@ module Spree::Api
         it "updates another user's address" do
           other_user = create(:user)
           address = other_user.save_in_address_book(harry_address_attributes, true)
-          updated_harry_address = harry_address_attributes.merge('name' => 'Ron Weasly')
+          harry_address_attributes.merge('firstname' => 'Ron')
+          harry_address_attributes.merge('name' => 'Ron Weasly')
+          updated_harry_address = harry_address_attributes.merge('lastname' => 'Weasly')
 
           expect {
             put "/api/users/#{other_user.id}/address_book",

api/spec/requests/spree/api/checkouts_spec.rb

@@ -72,6 +72,8 @@ module Spree::Api
         let(:address) do
           {
             name:  'John Doe',
+            firstname:  'John',
+            lastname:   'Doe',
             address1:   '7735 Old Georgetown Road',
             city:       'Bethesda',
             phone:      '3014445002',
@@ -96,6 +98,8 @@ module Spree::Api
           expect(json_response['state']).to eq('delivery')
           expect(json_response['bill_address']['name']).to eq('John Doe')
           expect(json_response['ship_address']['name']).to eq('John Doe')
+          expect(json_response['bill_address']['firstname']).to eq('John')
+          expect(json_response['ship_address']['firstname']).to eq('John')
           expect(response.status).to eq(200)
         end
 

api/spec/requests/spree/api/orders_spec.rb

@@ -531,12 +531,12 @@ module Spree::Api
 
       let(:address_params) { { country_id: country.id } }
       let(:billing_address) {
-        { name: "Tiago Motta", address1: "Av Paulista",
+        { name: "Tiago Motta", firstname: "Tiago", lastname: "Motta", address1: "Av Paulista",
                                 city: "Sao Paulo", zipcode: "01310-300", phone: "12345678",
                                 country_id: country.id, state_id: state.id }
       }
       let(:shipping_address) {
-        { name: "Tiago Motta", address1: "Av Paulista",
+        { name: "Tiago Motta", firstname: "Tiago", lastname: "Motta", address1: "Av Paulista",
                                  city: "Sao Paulo", zipcode: "01310-300", phone: "12345678",
                                  country_id: country.id, state_id: state.id }
       }

api/spec/requests/spree/api/users_spec.rb

@@ -51,6 +51,8 @@ module Spree::Api
           email: "[email protected]",
           bill_address_attributes: {
             name: 'First Last',
+            firstname: 'First',
+            lastname: 'Last',
             address1: '1 Test Rd',
             city: 'City',
             country_id: country.id,
@@ -60,6 +62,8 @@ module Spree::Api
           },
           ship_address_attributes: {
             name: 'First Last',
+            firstname: 'First',
+            lastname: 'Last',
             address1: '1 Test Rd',
             city: 'City',
             country_id: country.id,
@@ -84,6 +88,8 @@ module Spree::Api
             email: "[email protected]",
             bill_address_attributes: {
               name: 'First Last',
+              firstname: 'First',
+              lastname: 'Last',
               address1: '1 Test Rd',
               city: 'City',
               country_id: country.id,
@@ -93,6 +99,8 @@ module Spree::Api
             },
             ship_address_attributes: {
               name: 'First Last',
+              firstname: 'First',
+              lastname: 'Last',
               address1: '1 Test Rd',
               city: 'City',
               country_id: country.id,

backend/app/assets/javascripts/spree/backend/templates/orders/customer_details/autocomplete.hbs

@@ -4,6 +4,7 @@
     {{#if bill_address.name }}
       <strong>{{t 'bill_address' }}</strong>
       {{bill_address.name}}<br>
+      {{bill_address.firstname}} {{bill_address.lastname}}<br>
       {{bill_address.address1}}, {{bill_address.address2}}<br>
       {{bill_address.city}}<br>
       {{#if bill_address.state_id }}

backend/app/assets/javascripts/spree/backend/user_picker.js

@@ -28,7 +28,9 @@ $.fn.userAutocomplete = function () {
           q: {
             m: 'or',
             email_start: term,
-            name_start: term
+            name_start: term,
+            firstname_start: term,
+            lastname_start: term
           }
         };
       },

backend/app/assets/javascripts/spree/backend/views/order/address.js

@@ -23,7 +23,7 @@ Spree.Views.Order.Address = Backbone.View.extend({
 
   eachField: function(callback){
     var view = this;
-    var fields = ["name", "company", "address1", "address2",
+    var fields = ["name", "firstname", "lastname", "company", "address1", "address2",
       "city", "zipcode", "phone", "country_id", "state_name"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');

backend/app/assets/javascripts/spree/backend/views/order/customer_select.js

@@ -34,7 +34,9 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
             q: {
               m: 'or',
               email_start: term,
-              name_start: term
+              name_start: term,
+              firstname_start: term,
+              lastname_start: term
             }
           }
         },

backend/app/assets/stylesheets/spree/backend/sections/_orders.scss

@@ -65,7 +65,7 @@
 }
 
 label[for="order_bill_address_attributes_name"] {
-  margin-top: 53.5px;
+  margin-top: 45px;
 }
 
 #risk_analysis legend {

backend/app/controllers/spree/admin/search_controller.rb

@@ -16,7 +16,9 @@ def users
           @users = Spree.user_class.ransack({
             m: 'or',
             email_start: params[:q],
-            name_start: params[:q]
+            name_start: params[:q],
+            addresses_firstname_start: params[:q],
+            addresses_lastname_start: params[:q]
           }).result.limit(10)
         end
       end

backend/app/views/spree/admin/search/users.json.jbuilder

@@ -6,6 +6,8 @@ json.array!(@users) do |user|
 
   address_fields = [
     :name,
+    :firstname,
+    :lastname,
     :address1,
     :address2,
     :city,

backend/app/views/spree/admin/shared/_address.html.erb

@@ -1,5 +1,5 @@
 <div data-hook="address">
-  <%= address.name %> <%= address.company unless address.company.blank? %><br>
+  <%= address.name %> <%= "#{address.firstname} #{address.lastname} " %> <%= address.company unless address.company.blank? %><br>
   <%= address.phone %><%= address.alternative_phone unless address.alternative_phone.blank? %><br>
   <%= address.address1 %><br>
   <% if address.address2.present? %><%= address.address2 %><br><% end %>

backend/app/views/spree/admin/shared/_address_form.html.erb

@@ -6,6 +6,16 @@
     <%= f.text_field :name, class: 'fullwidth' %>
   </div>
 
+  <div class="field <%= "#{type}-row" %>">
+    <%= f.label :firstname %>
+    <%= f.text_field :firstname, class: 'fullwidth' %>
+  </div>
+
+  <div class="field <%= "#{type}-row" %>">
+    <%= f.label :lastname %>
+    <%= f.text_field :lastname, class: 'fullwidth' %>
+  </div>
+
   <% if Spree::Config[:company] %>
     <div class="field <%= "#{type}-row" %>">
       <%= f.label :company %>

backend/lib/spree/backend_configuration.rb

@@ -72,7 +72,7 @@ class BackendConfiguration < Preferences::Configuration
         {
           partial: "spree/admin/shared/search_fields/text_field",
           locals: {
-            ransack: :bill_address_name_cont,
+            ransack: :bill_address_firstname_or_bill_address_lastname_cont,
             label: -> { I18n.t(:name_contains, scope: :spree) }
           }
         },

backend/spec/controllers/spree/admin/payments_controller_spec.rb

@@ -56,6 +56,7 @@ module Admin
             let(:address_attributes) do
               {
                 'name' => address.name,
+                'firstname' => address.firstname,
                 'address1' => address.address1,
                 'city' => address.city,
                 'country_id' => address.country_id,

backend/spec/controllers/spree/admin/search_controller_spec.rb

@@ -37,7 +37,7 @@ def starting_letters(string)
         end
       end
 
-      context 'when searching by ship addresss name' do
+      context 'when searching by ship address name' do
         it_should_behave_like 'user found by search' do
           let(:search_query) { starting_letters(user.ship_address.name) }
         end
@@ -48,6 +48,30 @@ def starting_letters(string)
           let(:search_query) { starting_letters(user.bill_address.name) }
         end
       end
+
+      context 'when searching by ship address first name' do
+        it_should_behave_like 'user found by search' do
+          let(:search_query) { starting_letters(user.ship_address.firstname) }
+        end
+      end
+
+      context 'when searching by bill address first name' do
+        it_should_behave_like 'user found by search' do
+          let(:search_query) { starting_letters(user.bill_address.firstname) }
+        end
+      end
+
+      context 'when searching by ship address last name' do
+        it_should_behave_like 'user found by search' do
+          let(:search_query) { starting_letters(user.ship_address.lastname) }
+        end
+      end
+
+      context 'when searching by bill address last name' do
+        it_should_behave_like 'user found by search' do
+          let(:search_query) { starting_letters(user.bill_address.lastname) }
+        end
+      end
     end
 
     context 'when searching by user ids' do

backend/spec/controllers/spree/admin/users_controller_spec.rb

@@ -9,6 +9,8 @@
   let(:valid_address_attributes) do
     {
       name: 'Foo Bar',
+      firstname: 'Foo',
+      lastname: 'Bar',
       city: "New York",
       country_id: state.country.id,
       state_id: state.id,