fix done for payment and AP status