diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index 1e4af21993..b9939582a5 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -25,6 +25,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, "order_bill_address_lastname", "order_bill_address_full_name", "order_bill_address_full_name_with_comma", + "order_bill_address_full_name_reversed", "variant_product_supplier_name", "order_email", "order_number", diff --git a/app/models/spree/address.rb b/app/models/spree/address.rb index df90e0b160..4735b5a3ce 100644 --- a/app/models/spree/address.rb +++ b/app/models/spree/address.rb @@ -6,7 +6,8 @@ module Spree self.belongs_to_required_by_default = false - searchable_attributes :firstname, :lastname, :phone, :full_name, :full_name_with_comma + searchable_attributes :firstname, :lastname, :phone, :full_name, :full_name_with_comma, + :full_name_reversed searchable_associations :country, :state belongs_to :country, class_name: "Spree::Country" @@ -42,6 +43,12 @@ module Spree ) end + ransacker :full_name_reversed, formatter: proc { |value| value.to_s } do |parent| + Arel::Nodes::SqlLiteral.new( + "CONCAT(#{parent.table_name}.lastname, ' ', #{parent.table_name}.firstname)" + ) + end + def self.default new(country: DefaultCountry.country) end diff --git a/spec/models/spree/address_spec.rb b/spec/models/spree/address_spec.rb index 1d3cd316ab..36e06de131 100644 --- a/spec/models/spree/address_spec.rb +++ b/spec/models/spree/address_spec.rb @@ -218,4 +218,19 @@ describe Spree::Address do expect(result2).not_to include(address1) end end + + describe "ransacker :full_name_reversed" do + it "searches for records with matching reversed full names" do + address1 = create(:address, firstname: 'John', lastname: 'Doe') + address2 = create(:address, firstname: 'Jane', lastname: 'Smith') + + result1 = described_class.ransack(full_name_reversed_cont: 'Doe John').result + expect(result1).to include(address1) + expect(result1).not_to include(address2) + + result2 = described_class.ransack(full_name_reversed_cont: 'Smith Jane').result + expect(result2).to include(address2) + expect(result2).not_to include(address1) + end + end end diff --git a/spec/system/admin/bulk_order_management_spec.rb b/spec/system/admin/bulk_order_management_spec.rb index 0494357c4a..88a81c172f 100644 --- a/spec/system/admin/bulk_order_management_spec.rb +++ b/spec/system/admin/bulk_order_management_spec.rb @@ -252,6 +252,18 @@ describe ' expect_line_items_results [li2, li3], [li1] end + + it "by customer fullname reversed" do + fill_in "quick_filter", with: o1.bill_address.lastname + ' ' + o1.bill_address.firstname + page.find('.filter-actions .button.icon-search').click + + expect_line_items_results [li1], [li2, li3] + + fill_in "quick_filter", with: o2.bill_address.lastname + ' ' + o2.bill_address.firstname + page.find('.filter-actions .button.icon-search').click + + expect_line_items_results [li2, li3], [li1] + end end context "displaying individual columns" do