raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9157 from jibees/SC-sort-shipping-methods-case-insenstive

Browse Source 
Split Checkout: Sort shipping methods case insensitive
This commit is contained in:
Maikel
2022-05-31 10:54:43 +10:00
committed by GitHub
parent c22c1ddf32 f2ac888f2c
commit f3d9b3d7ed
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/checkout_callbacks.rb
View File

@@ -47,7 +47,7 @@ module CheckoutCallbacks
end
def load_shipping_methods
@shipping_methods = available_shipping_methods.sort_by(&:name)
@shipping_methods = available_shipping_methods.sort { |a, b| a.name.casecmp(b.name) }
end
def redirect_to_shop?

4
spec/system/consumer/split_checkout_spec.rb
View File

@@ -36,7 +36,7 @@ describe "As a consumer, I want to checkout my order", js: true do
create(:shipping_method, require_ship_address: true, name: "A Free Shipping with required address")
}
let(:free_shipping) {
create(:shipping_method, require_ship_address: false, name: "Free Shipping", description: "yellow",
create(:shipping_method, require_ship_address: false, name: "free Shipping", description: "yellow",
calculator: Calculator::FlatRate.new(preferred_amount: 0.00))
}
let(:shipping_tax_rate) { create(:tax_rate, amount: 0.25, zone: zone, included_in_price: true) }
@@ -184,7 +184,7 @@ describe "As a consumer, I want to checkout my order", js: true do
it 'display shipping methods alphabetically' do
shipping_methods = page.all(:field, "shipping_method_id").map { |field| field.sibling("label") }.map(&:text)
expect(shipping_methods).to eq ["A Free Shipping with required address", "Free Shipping", "Local", "Shipping with Fee", "Z Free Shipping without required address"]
expect(shipping_methods).to eq ["A Free Shipping with required address", "free Shipping", "Local", "Shipping with Fee", "Z Free Shipping without required address"]
end
it_behaves_like "when I have an out of stock product in my cart"