rn annotate, added carrier shipping fields to order, removed shop_id from attr accessible for order