Fixes problem that payment service item could be selected when payment and delivery provider uses the same code
Merge pull request #301 from nsendetzky/master

Fixes problem that payment service item could be selected when payment and delivery provider uses the same code