Add more template blocks for basket and order templates

Originally reported in #859, and contributed in #863. Because there was
merge conflicts, it seemed easier to manually add the blocks than fixing
the conflicts.

Thanks to @itbabu for the work.

Fixes #863