FIxed shipping code logic