Refactored the calculate delivery service price query so it adheres to the MySQL and SQLite standards. TRAD-37