raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder error messages to improve readability

Browse Source 
tbs;
This commit is contained in:
Jean-Baptiste Bellet
2023-02-13 16:03:52 +01:00
parent 9a03023b6b
commit a39598d049
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/controllers/split_checkout_controller.rb
View File

@@ -60,6 +60,9 @@ class SplitCheckoutController < ::BaseController
def order_error_messages
# Remove ship_address.* errors if no shipping method is not selected
remove_ship_address_errors if @order.errors[:shipping_method].present?
# Reorder errors to make sure the most important ones are shown first
# and finally, return the error messages to sentence
reorder_errors.map(&:full_message).to_sentence
end
def remove_ship_address_errors
@@ -71,6 +74,28 @@ class SplitCheckoutController < ::BaseController
@order.errors.delete("ship_address.zipcode")
end
def reorder_errors
@order.errors.sort_by do |e|
case e.attribute
when /email/i then 0
when /phone/i then 1
when /bill_address/i then 2 + bill_address_error_order(e)
else 20
end
end
end
def bill_address_error_order(error)
case error.attribute
when /firstname/i then 0
when /lastname/i then 1
when /address1/i then 2
when /city/i then 3
when /zipcode/i then 4
else 5
end
end
def flash_error_when_no_shipping_method_available
flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
end