payment view added
merge resolved