made some changes in OrderDAO. A sql error remains
can change pending orders
Merge branch 'cancelUnshippedOrders'