refactor stack conditional
update to shipping cost
Merge branch 'develop' into staging
bring current user into the model to check transaction error