4504 cancel order fix

Fix for #4504 

Still needs the following

[  ] fix state_machine_spec.rb failing spec on partial shipments. Mock / Stub payments there.
[  ] add spec with complete order and payment amounts