revert Merge branch 'feature/payment' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into feature/payment