Fix order number URL pattern
Fix url call in order detail template
Merge remote-tracking branch 'upstream/master'