Warnings generated when changing payment option

-- HikaShop version -- : 2.5.0
-- Joomla version -- : 3.4.3

I understand why the following happens but just need a way to tidy it up.

On checkout, if the user changes the payment method before completing all the compulsory additional information, they get a warning stating that these fields still need to be completed. Is it possible to switch off this check just for when the payment method is changed?

I have minimised the issue but changing the order in which things are displayed i.e. put payments at the end

I basically put the payment at the end and then edited the view for checkout|payment by wrapping all the code in

Hi,

You can potentially disable the option "Auto submit shipping and payment methods selection" in Configuration > Checkout

That did it

Thanks