Payment receipt, payment reminder and correct payment-related statuses.
Fixed a conflict
Fixed conflicts