mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-03 02:21:33 +00:00
add fullname reversed search
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user