shipping-payment fix

shipping-payment fix