Remove unnecessary function and replace with __return_false.
Fix invalid date error. Closes #1850
Fix merge conflict
Fix order details layout issue when quantities are disabled. #1684
Fix merge conflict