Update backend to have firstname and lastname fields

JustShah · JustShah · commit 4254d40b2ef8 · 2025-02-21T13:47:22.000+05:30
- Update the backend logic to separate 'name' into 'firstname' and 'lastname' for better data handling.
- Adjusted user and address forms, search functionality, and related views to use the new fields.
diff --git a/backend/app/assets/javascripts/spree/backend/templates/orders/customer_details/autocomplete.hbs b/backend/app/assets/javascripts/spree/backend/templates/orders/customer_details/autocomplete.hbs
@@ -1,9 +1,9 @@
 <div class='customer-autocomplete-item'>
   <div class='customer-details'>
     <span class="customer-email">{{customer.email}}</span>
-    {{#if bill_address.name }}
+    {{#if bill_address.firstname }}
       <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 }}
diff --git a/backend/app/assets/javascripts/spree/backend/user_picker.js b/backend/app/assets/javascripts/spree/backend/user_picker.js
@@ -28,7 +28,8 @@ $.fn.userAutocomplete = function () {
           q: {
             m: 'or',
             email_start: term,
-            name_start: term
+            firstname_start: term,
+            lastname_start: term
           }
         };
       },
diff --git a/backend/app/assets/javascripts/spree/backend/views/order/address.js b/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 = ["firstname", "lastname", "company", "address1", "address2",
       "city", "zipcode", "phone", "country_id", "state_name"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');
diff --git a/backend/app/assets/javascripts/spree/backend/views/order/customer_select.js b/backend/app/assets/javascripts/spree/backend/views/order/customer_select.js
@@ -34,7 +34,8 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
             q: {
               m: 'or',
               email_start: term,
-              name_start: term
+              firstname_start: term,
+              lastname_start: term
             }
           }
         },
diff --git a/backend/app/assets/stylesheets/spree/backend/sections/_orders.scss b/backend/app/assets/stylesheets/spree/backend/sections/_orders.scss
@@ -64,8 +64,8 @@
   margin-bottom: 15px;
 }
 
-label[for="order_bill_address_attributes_name"] {
-  margin-top: 53.5px;
+label[for="order_bill_address_attributes_firstname"] {
+  margin-top: 45px;
 }
 
 #risk_analysis legend {
diff --git a/backend/app/controllers/spree/admin/search_controller.rb b/backend/app/controllers/spree/admin/search_controller.rb
@@ -16,7 +16,8 @@ def users
           @users = Spree.user_class.ransack({
             m: 'or',
             email_start: params[:q],
-            name_start: params[:q]
+            addresses_firstname_start: params[:q],
+            addresses_lastname_start: params[:q]
           }).result.limit(10)
         end
       end
diff --git a/backend/app/views/spree/admin/search/users.json.jbuilder b/backend/app/views/spree/admin/search/users.json.jbuilder
@@ -5,7 +5,8 @@ json.array!(@users) do |user|
   json.email user.email
 
   address_fields = [
-    :name,
+    :firstname,
+    :lastname,
     :address1,
     :address2,
     :city,
diff --git a/backend/app/views/spree/admin/shared/_address.html.erb b/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.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 %>
diff --git a/backend/app/views/spree/admin/shared/_address_form.html.erb b/backend/app/views/spree/admin/shared/_address_form.html.erb
@@ -2,8 +2,13 @@
 
 <div id="<%= type %>" data-hook="address_fields">
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :name %>
-    <%= f.text_field :name, class: 'fullwidth' %>
+    <%= 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] %>
diff --git a/backend/lib/spree/backend_configuration.rb b/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) }
           }
         },
diff --git a/backend/spec/controllers/spree/admin/payments_controller_spec.rb b/backend/spec/controllers/spree/admin/payments_controller_spec.rb
@@ -55,7 +55,7 @@ module Admin
 
             let(:address_attributes) do
               {
-                'name' => address.name,
+                'firstname' => address.firstname,
                 'address1' => address.address1,
                 'city' => address.city,
                 'country_id' => address.country_id,
diff --git a/backend/spec/controllers/spree/admin/search_controller_spec.rb b/backend/spec/controllers/spree/admin/search_controller_spec.rb
@@ -37,15 +37,27 @@ def starting_letters(string)
         end
       end
 
-      context 'when searching by ship addresss name' do
+      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.name) }
+          let(:search_query) { starting_letters(user.ship_address.firstname) }
         end
       end
 
-      context 'when searching by bill address name' do
+      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.name) }
+          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
diff --git a/backend/spec/controllers/spree/admin/users_controller_spec.rb b/backend/spec/controllers/spree/admin/users_controller_spec.rb
@@ -8,7 +8,8 @@
   let(:state) { create(:state, state_code: 'NY') }
   let(:valid_address_attributes) do
     {
-      name: 'Foo Bar',
+      firstname: 'Foo',
+      lastname: 'Bar',
       city: "New York",
       country_id: state.country.id,
       state_id: state.id,
diff --git a/backend/spec/features/admin/orders/customer_details_spec.rb b/backend/spec/features/admin/orders/customer_details_spec.rb
@@ -14,8 +14,8 @@
   let!(:product) { create(:product_in_stock) }
 
   # We need a unique name that will appear for the customer dropdown
-  let!(:ship_address) { create(:address, country:, state:, name: "Jane Doe") }
-  let!(:bill_address) { create(:address, country:, state:, name: "Jane Doe") }
+  let!(:ship_address) { create(:address, country:, state:, firstname: "Jane", lastname: "Doe") }
+  let!(:bill_address) { create(:address, country:, state:, firstname: "Jane", lastname: "Doe") }
 
   let!(:user) { create(:user, email: 'foobar@example.com', ship_address:, bill_address:) }
 
@@ -37,7 +37,8 @@
     # Regression test for https://github.com/spree/spree/issues/3335 and https://github.com/spree/spree/issues/5317
     it "associates a user when not using guest checkout" do
       # 5317 - Address prefills using user's default.
-      expect(page).to have_field('Name', with: user.bill_address.name)
+      expect(page).to have_field('First Name', with: user.bill_address.firstname)
+      expect(page).to have_field('Last Name', with: user.bill_address.lastname)
       expect(page).to have_field('Street Address', with: user.bill_address.address1)
       expect(page).to have_field("Street Address (cont'd)", with: user.bill_address.address2)
       expect(page).to have_field('City', with: user.bill_address.city)
@@ -119,7 +120,7 @@
       order.update!(ship_address_id: nil)
       click_link "Customer"
       click_button "Update"
-      expect(page).to have_content("Shipping address name can't be blank")
+      expect(page).to have_content("Shipping address first name can't be blank")
     end
 
     context "for an order in confirm state with a user" do
@@ -170,7 +171,8 @@
       specify do
         click_link "Customer"
         # Need to fill in valid information so it passes validations
-        fill_in "order_ship_address_attributes_name",       with: "John 99 Doe"
+        fill_in "order_ship_address_attributes_firstname",  with: "John 99"
+        fill_in "order_ship_address_attributes_lastname",   with: "Doe"
         fill_in "order_ship_address_attributes_company",    with: "Company"
         fill_in "order_ship_address_attributes_address1",   with: "100 first lane"
         fill_in "order_ship_address_attributes_address2",   with: "#101"
@@ -188,7 +190,8 @@
   end
 
   def fill_in_address
-    fill_in "Name",                    with: "John 99 Doe"
+    fill_in "First Name",              with: "John 99"
+    fill_in "Last Name",               with: "Doe"
     fill_in "Company",                 with: "Company"
     fill_in "Street Address",          with: "100 first lane"
     fill_in "Street Address (cont'd)", with: "#101"
diff --git a/backend/spec/features/admin/orders/new_order_spec.rb b/backend/spec/features/admin/orders/new_order_spec.rb
@@ -367,7 +367,8 @@
   end
 
   def fill_in_address
-    fill_in "Name",                      with: "John 99 Doe"
+    fill_in "First Name",                with: "John 99"
+    fill_in "Last Name",                 with: "Doe"
     fill_in "Street Address",            with: "100 first lane"
     fill_in "Street Address (cont'd)",   with: "#101"
     fill_in "City",                      with: "Bethesda"

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({`
`34`	`34`	`q: {`
`35`	`35`	`m: 'or',`
`36`	`36`	`email_start: term,`
`37`		`- name_start: term`
	`37`	`+ firstname_start: term,`
	`38`	`+ lastname_start: term`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`},`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@`
`64`	`64`	`margin-bottom: 15px;`
`65`	`65`	`}`
`66`	`66`
`67`		`-label[for="order_bill_address_attributes_name"] {`
`68`		`- margin-top: 53.5px;`
	`67`	`+label[for="order_bill_address_attributes_firstname"] {`
	`68`	`+ margin-top: 45px;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`#risk_analysis legend {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class BackendConfiguration < Preferences::Configuration`
`72`	`72`	`{`
`73`	`73`	`partial: "spree/admin/shared/search_fields/text_field",`
`74`	`74`	`locals: {`
`75`		`- ransack: :bill_address_name_cont,`
	`75`	`+ ransack: :bill_address_firstname_or_bill_address_lastname_cont,`
`76`	`76`	`label: -> { I18n.t(:name_contains, scope: :spree) }`
`77`	`77`	`}`
`78`	`78`	`},`