with pop up
with validation
approvals
 modal code in partial files
pdc controller.js
discounts
modal in partial files
conflict resolved with term definations
Merge remote-tracking branch 'origin/discounts'
payments initial merge
pay fee 2nd cur
conflit resolved with approval
Fee payment major changes
Merge remote-tracking branch 'origin/master' into staff_manthan