Fix invalid state transition

The order in which some things happen can be a bit confusing.

This ensures that inventory units are not shipped when they have
already been shipped.

Change-Id: Ie3616b82bd7812e97e504ec4a7a24a35677c6285