added: coupon handling
updated: coupon cleanup on return back
Merge branch 'feature/coupons' into develop