Fix product id and add creditProductId