added extra fees in transactions
merge and changed discount logic