Fixes adding payment/delivery service that's not available for the basket
Splits import method to reduce complexity
Splits _importContent() to reduce complexity
Changes helper method to private function
Splits _initCriteria() to reduce complexity
Uses _createItem() method in insertItems()
Merge pull request #785 from nsendetzky/master

Fixes autofill plugin and splits methods to reduce complexity