fix wrong redirect after shift edit
user voucher feature
Merge branch 'feature-voucher'