Reverting this change
Explicitly updating payment ad shipment instead of calling order.update!
Never changing order status after it is marked shipped