Bug 16477 - Improve staff client cart JavaScript and template