Payment process excluding custom cash
Fix some cash payment issues