Added total cart price
Fix merge conflict
OrderDaoImplTest.java: fix test for empty tables