Adjusts bug in EC with service fees added

Also adjusts the line items in the DECP request
to account for potential Gift Wrap item and removes
it from the line items since DECP has a specific
parameter for that