bug fix for payment and shipment